Index: Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs =================================================================== diff -u -rfbb37872d09f1ded75ce2209e8e48a6b64d8a78f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs (.../IProjectExplorer.cs) (revision fbb37872d09f1ded75ce2209e8e48a6b64d8a78f) +++ Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs (.../IProjectExplorer.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -27,7 +27,5 @@ public interface IProjectExplorer : IView { TreeView TreeView { get; } - - void ScrollTo(object o); } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj =================================================================== diff -u -rc8848af0c6f8780634dcce2013e606f090da6577 -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj (.../Core.Plugins.ProjectExplorer.csproj) (revision c8848af0c6f8780634dcce2013e606f090da6577) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj (.../Core.Plugins.ProjectExplorer.csproj) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -67,10 +67,6 @@ False ..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll - - ..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll - True - @@ -104,7 +100,7 @@ - UserControl + Component @@ -152,106 +148,15 @@ Copying.Lesser.licenseheader - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ProjectExplorer.cs Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs =================================================================== diff -u -rc69baf986e7cc7a0158ef8c51ddf4e62dd05038f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs (.../ProjectExplorer.Designer.cs) (revision c69baf986e7cc7a0158ef8c51ddf4e62dd05038f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs (.../ProjectExplorer.Designer.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -17,10 +17,6 @@ { components.Dispose(); } - if (documentViewController != null && documentViewController.DocumentViews != null) - { - documentViewController.DocumentViews.ActiveViewChanged -= DocumentViewsActiveViewChanged; - } base.Dispose(disposing); } @@ -33,29 +29,9 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectExplorer)); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.buttonScrollToItemInActiveView = new System.Windows.Forms.ToolStripButton(); this.treeViewPanel = new System.Windows.Forms.Panel(); - this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // - // toolStrip1 - // - resources.ApplyResources(this.toolStrip1, "toolStrip1"); - this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.buttonScrollToItemInActiveView}); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - // - // buttonScrollToItemInActiveView - // - resources.ApplyResources(this.buttonScrollToItemInActiveView, "buttonScrollToItemInActiveView"); - this.buttonScrollToItemInActiveView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonScrollToItemInActiveView.Name = "buttonScrollToItemInActiveView"; - this.buttonScrollToItemInActiveView.Tag = "LocateActiveViewItem"; - this.buttonScrollToItemInActiveView.Click += new System.EventHandler(this.ButtonScrollToItemInActiveViewClick); - // // treeViewPanel // resources.ApplyResources(this.treeViewPanel, "treeViewPanel"); @@ -66,19 +42,13 @@ resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.treeViewPanel); - this.Controls.Add(this.toolStrip1); this.Name = "ProjectExplorer"; - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton buttonScrollToItemInActiveView; private System.Windows.Forms.Panel treeViewPanel; } } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs =================================================================== diff -u -rc69baf986e7cc7a0158ef8c51ddf4e62dd05038f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs (.../ProjectExplorer.cs) (revision c69baf986e7cc7a0158ef8c51ddf4e62dd05038f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs (.../ProjectExplorer.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -18,39 +18,23 @@ // All names, logos, and references to "Deltares" are registered trademarks of // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. - -using System; using System.Windows.Forms; using Core.Common.Gui; using Core.Common.Gui.Commands; using Core.Common.Gui.Forms; -using Core.Common.Gui.Forms.ViewManager; using Core.Common.Gui.Selection; -using Core.Plugins.ProjectExplorer.Properties; -using log4net; using TreeView = Core.Common.Controls.TreeView.TreeView; namespace Core.Plugins.ProjectExplorer { public partial class ProjectExplorer : UserControl, IProjectExplorer { - private static readonly ILog log = LogManager.GetLogger(typeof(ProjectExplorer)); - private readonly IDocumentViewController documentViewController; - private readonly IViewCommands viewCommands; - public ProjectExplorer(IApplicationSelection applicationSelection, IViewCommands viewCommands, - IProjectOwner projectOwner, IDocumentViewController documentViewController) + IProjectOwner projectOwner) { InitializeComponent(); - ProjectTreeView = new ProjectTreeView(applicationSelection, viewCommands, projectOwner, documentViewController) - { - Dock = DockStyle.Fill - }; + ProjectTreeView = new ProjectTreeView(applicationSelection, viewCommands, projectOwner); treeViewPanel.Controls.Add(ProjectTreeView); - - this.viewCommands = viewCommands; - this.documentViewController = documentViewController; - this.documentViewController.DocumentViews.ActiveViewChanged += DocumentViewsActiveViewChanged; } public ProjectTreeView ProjectTreeView { get; private set; } @@ -71,40 +55,8 @@ { get { - return ProjectTreeView.TreeView; + return ProjectTreeView; } } - - public void ScrollTo(object o) - { - var nodeToSelect = TreeView.TreeViewController.GetNodeByTag(o); - - if (nodeToSelect == null) - { - log.DebugFormat(Resources.ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item_0_, o); - return; - } - - TreeView.SelectedNode = nodeToSelect; - } - - private void DocumentViewsActiveViewChanged(object sender, ActiveViewChangeEventArgs e) - { - buttonScrollToItemInActiveView.Enabled = documentViewController.DocumentViews.ActiveView != null && - viewCommands.GetDataOfActiveView() != null; - } - - private void ButtonScrollToItemInActiveViewClick(object sender, EventArgs e) - { - var dataOfActiveView = viewCommands.GetDataOfActiveView(); - if (dataOfActiveView != null) - { - ScrollTo(dataOfActiveView); - - return; - } - - log.WarnFormat(Resources.ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data_0_, documentViewController.DocumentViews.ActiveView.Data); - } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.resx =================================================================== diff -u -r236b01ba2789080e10880a9df688dfe715fbe10c -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.resx (.../ProjectExplorer.resx) (revision 236b01ba2789080e10880a9df688dfe715fbe10c) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.resx (.../ProjectExplorer.resx) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -117,112 +117,46 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill - - 6, 13 + + 0, 0 - - Zoek - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - None - - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 375, 327 + 375, 352 - - ProjectExplorer - - - $this - - - Magenta - - - 4 + + 5 - - 1 - - - 375, 25 - - - Fill - - - 23, 22 - treeViewPanel - - 0 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Zoek in de projectverkenner het element behorende bij het actieve venster. - - - toolStrip1 - $this - - toolStrip1 + + 0 - - False + + True + + + 6, 13 - - 0, 0 - - - 5 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAHySURBVDhPxdLfS1phGAdw/5EggthNl0EQ/QtdSK7cWsdt - WdS0H+YU1HBESIOYDDFj0UaWKSdPUZJtls1BP6gVi7mlZq4u0soWRT+u/MG3874nDMpdtF3sge/FuXg+ - 7/M+5xX9c4nbWcWb8dilwRWD3snHEYVuOALt0CY0H35C/T6IjoENtL/7hjbbGpTWVehti5ekjwImLpK1 - +A5x37x4G8hSgJz8N2ns/QIK6B3biGIT2zQhxBDGDrbAuCXwRz/h6CKJdDaN21XfMy8AupGtHBDJ/kD3 - soECD+2V8IW8SJ4f5gWemmavAX5hBCBR+ZrBsBIEjmZR76iFN+hB8owHMncBpuujAJBtk2bNnBIvZxQw - +rWoHaqCwiWHd8ODg9MDpDKp67abemL0CgD5Vc85KVTTzbCtm2FZ64V5pQcNdhkmVjnsnyTyTvC40yMA - 6sHvdIJGVga5sw4yuxTlxlLUDdTAvcQifhzPC0j1kwLQ1r+e24GkrxIVr8qwy3+VtDwAtziGxHECqfTd - K0g0nAC0Wr/mgHAmCKb/EQWKG4rgDIwi/nsv7wRV6jEBUFpWcgB5B78QoUAhUwCHf+SPgLiDFQCxysU2 - mRfoy5K//oxnpjnIun38lqfpoqSGKdToJlCtHefHdvMnsxCrSFwsBf5ziURXMOptncLGWiUAAAAASUVO - RK5CYII= - - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0, 25 - - - buttonScrollToItemInActiveView - 375, 352 - - True - - - 0, 0 - + + ProjectExplorer + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs =================================================================== diff -u -rc69baf986e7cc7a0158ef8c51ddf4e62dd05038f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision c69baf986e7cc7a0158ef8c51ddf4e62dd05038f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -142,14 +142,14 @@ { if (ProjectExplorer == null || ProjectExplorer.IsDisposed) { - ProjectExplorer = new ProjectExplorer(applicationSelection, viewCommands, projectOwner, documentViewController); + ProjectExplorer = new ProjectExplorer(applicationSelection, viewCommands, projectOwner); Gui.Plugins .SelectMany(pluginGui => pluginGui.GetTreeNodeInfos()) - .ForEachElementDo(tni => ProjectExplorer.ProjectTreeView.TreeView.TreeViewController.RegisterTreeNodeInfo(tni)); + .ForEachElementDo(tni => ProjectExplorer.ProjectTreeView.TreeViewController.RegisterTreeNodeInfo(tni)); ProjectExplorer.ProjectTreeView.Project = projectOwner.Project; - ProjectExplorer.ProjectTreeView.TreeView.TreeViewController.NodeUpdated += (s, e) => documentViewController.UpdateToolTips(); + ProjectExplorer.ProjectTreeView.TreeViewController.NodeUpdated += (s, e) => documentViewController.UpdateToolTips(); ProjectExplorer.Text = Properties.Resources.ProjectExplorerPluginGui_InitializeProjectTreeView_Project_Explorer; } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs =================================================================== diff -u -rc69baf986e7cc7a0158ef8c51ddf4e62dd05038f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs (.../ProjectTreeView.cs) (revision c69baf986e7cc7a0158ef8c51ddf4e62dd05038f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs (.../ProjectTreeView.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -32,22 +32,17 @@ namespace Core.Plugins.ProjectExplorer { - /// - /// TODO: extract Clipboard-related methods into Ringtoets Clipboard class - /// - public class ProjectTreeView : UserControl, IView + public sealed class ProjectTreeView : TreeView, IView { - private readonly TreeView treeView; private readonly IApplicationSelection applicationSelection; private readonly IViewCommands viewCommands; private readonly IProjectOwner projectOwner; - private readonly IDocumentViewController documentViewController; private Project project; private bool selectingNode; public ProjectTreeView(IApplicationSelection applicationSelection, IViewCommands viewCommands, - IProjectOwner projectOwner, IDocumentViewController documentViewController) + IProjectOwner projectOwner) : this() { this.applicationSelection = applicationSelection; @@ -56,35 +51,17 @@ this.viewCommands = viewCommands; this.projectOwner = projectOwner; - - this.documentViewController = documentViewController; } private ProjectTreeView() { - treeView = new TreeView - { - AllowDrop = true - }; + Dock = DockStyle.Fill; - treeView.TreeViewController.TreeNodeDoubleClick += TreeViewDoubleClick; - - treeView.TreeViewController.NodeDataDeleted += ProjectDataDeleted; - treeView.AfterSelect += TreeViewSelectedNodeChanged; - - treeView.Dock = DockStyle.Fill; - - Controls.Add(treeView); + TreeViewController.TreeNodeDoubleClick += TreeViewDoubleClick; + TreeViewController.NodeDataDeleted += ProjectDataDeleted; + AfterSelect += TreeViewSelectedNodeChanged; } - public TreeView TreeView - { - get - { - return treeView; - } - } - public Project Project { set @@ -112,7 +89,7 @@ } project = value as Project; - treeView.TreeViewController.Data = project; + TreeViewController.Data = project; if (project != null) { @@ -130,8 +107,7 @@ UnsubscribeProjectEvents(); } - treeView.TreeViewController.Data = null; - treeView.Dispose(); + TreeViewController.Data = null; base.Dispose(disposing); } @@ -141,26 +117,26 @@ /// /// /// - protected virtual void GuiSelectionChanged(object sender, EventArgs e) + private void GuiSelectionChanged(object sender, EventArgs e) { if (selectingNode || applicationSelection.Selection == null - || (treeView.SelectedNode != null && treeView.SelectedNode.Tag == applicationSelection.Selection)) + || (SelectedNode != null && SelectedNode.Tag == applicationSelection.Selection)) { return; } - TreeNode node = treeView.TreeViewController.GetNodeByTag(applicationSelection.Selection); + TreeNode node = TreeViewController.GetNodeByTag(applicationSelection.Selection); if (node != null) { - treeView.SelectedNode = node; + SelectedNode = node; } } private void TreeViewSelectedNodeChanged(object sender, EventArgs e) { selectingNode = true; - var tag = treeView.SelectedNode != null ? treeView.SelectedNode.Tag : null; + var tag = SelectedNode != null ? SelectedNode.Tag : null; applicationSelection.Selection = tag; @@ -184,11 +160,6 @@ private void TreeViewDoubleClick(object sender, EventArgs e) { - if (!Equals(applicationSelection.Selection, TreeView.SelectedNode.Tag)) - { - // Necessary if WinForms skips single click event - applicationSelection.Selection = TreeView.SelectedNode.Tag; - } viewCommands.OpenViewForSelection(); } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs =================================================================== diff -u -rc69baf986e7cc7a0158ef8c51ddf4e62dd05038f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c69baf986e7cc7a0158ef8c51ddf4e62dd05038f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -89,25 +89,6 @@ } /// - /// Looks up a localized string similar to Kan geen projectitem vinden voor de data van dit scherm: {0}. - /// - public static string ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data_0_ { - get { - return ResourceManager.GetString("ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_v" + - "iew_data_0_", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan geen bijbehorende knoop vinden in de projectverkenner voor element: {0}. - /// - public static string ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item_0_ { - get { - return ResourceManager.GetString("ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item_0_", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap ProjectExplorerIcon { Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx =================================================================== diff -u -rc69baf986e7cc7a0158ef8c51ddf4e62dd05038f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx (.../Resources.resx) (revision c69baf986e7cc7a0158ef8c51ddf4e62dd05038f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx (.../Resources.resx) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -124,12 +124,6 @@ Projectverkenner - - Kan geen projectitem vinden voor de data van dit scherm: {0} - - - Kan geen bijbehorende knoop vinden in de projectverkenner voor element: {0} - ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/CopyHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/CutHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/DeleteHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/DocumentHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/Edit_RedoHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/Edit_UndoHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/OptionsHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/OrgChartHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/PasteHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/PlayHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/PropertiesHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/RelationshipsHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/SaveAllHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/StopHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/WebInsertHyperlinkHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/application_form.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/application_view_list.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/arrow-stop-090.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/arrow-stop-270.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/bg.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick1.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick_active.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick_add.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick_delete.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick_edit.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick_error.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/brick_link.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/bricks.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/broom.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/bug.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/calendar.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/calendar_view_day.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/chart_bar.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/chart_curve.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/chart_line.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/chart_organisation.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/chart_pie.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cog.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cog1.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cog_active.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cog_add.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cog_delete.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/control_play.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/control_stop.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cut.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/cut_red.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/data_item.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/data_item_error.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/delete.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/edit-redo.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/edit-undo.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/edit.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/error.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/exclamation-small.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/exclamation.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/feed.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_add.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_brick.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_database.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_delete.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_edit.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_error.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_feed.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_input.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/folder_output.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/fullscreen.PNG =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/graphhs.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/information.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/invalidOverlay.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/link.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/linkOverlay.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/link_break.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/magnifier.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/map.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/new.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/newspaper.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/note.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/openfolderHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/playall.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/plugin.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/plugin_disabled.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/resultset_next.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/saveHS.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/script.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/shape_square.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/table-export.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/table-import.png =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/packages.config =================================================================== diff -u -rfbb37872d09f1ded75ce2209e8e48a6b64d8a78f -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/packages.config (.../packages.config) (revision fbb37872d09f1ded75ce2209e8e48a6b64d8a78f) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/packages.config (.../packages.config) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -24,5 +24,4 @@ --> - Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectTreeViewTest.cs =================================================================== diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -r7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1 --- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectTreeViewTest.cs (.../ProjectTreeViewTest.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455) +++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectTreeViewTest.cs (.../ProjectTreeViewTest.cs) (revision 7f1e4c8c634d60e05912f3fbbc72b21cd3404dc1) @@ -26,7 +26,7 @@ var documentViewController = mocks.Stub(); mocks.ReplayAll(); - using (var projectTreeView = new ProjectTreeView(selectionStub, viewCommandsStub, projectOwner, documentViewController)) + using (var projectTreeView = new ProjectTreeView(selectionStub, viewCommandsStub, projectOwner)) { Assert.IsNotNull(projectTreeView); } @@ -70,20 +70,18 @@ var selectionStub = mocks.Stub(); selectionStub.Stub(g => g.SelectionChanged += Arg>.Is.Anything); selectionStub.Stub(g => g.SelectionChanged -= Arg>.Is.Anything); - - var documentViewController = mocks.Stub(); - + mocks.ReplayAll(); - using (var projectTree = new ProjectTreeView(selectionStub, commandHandler, projectOwner, documentViewController)) + using (var projectTree = new ProjectTreeView(selectionStub, commandHandler, projectOwner)) { - projectTree.TreeView.TreeViewController.RegisterTreeNodeInfo(projectTreeNodeInfo); - projectTree.TreeView.TreeViewController.RegisterTreeNodeInfo(integerTreeNodeInfo); + projectTree.TreeViewController.RegisterTreeNodeInfo(projectTreeNodeInfo); + projectTree.TreeViewController.RegisterTreeNodeInfo(integerTreeNodeInfo); projectTree.Project = project; // Call - var nodeToDelete = projectTree.TreeView.Nodes[0].Nodes.OfType().First(); - projectTree.TreeView.TreeViewController.DeleteNode(nodeToDelete, integerTreeNodeInfo); + var nodeToDelete = projectTree.Nodes[0].Nodes.OfType().First(); + projectTree.TreeViewController.DeleteNode(nodeToDelete, integerTreeNodeInfo); } // Assert