Index: src/Common/DelftTools.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs =================================================================== diff -u -rfa9b36343401d44cb6813d7871903782d0dedec9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/Common/DelftTools.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs (.../TreeViewNodePresenterBase.cs) (revision fa9b36343401d44cb6813d7871903782d0dedec9) +++ src/Common/DelftTools.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs (.../TreeViewNodePresenterBase.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -289,8 +289,7 @@ } // create and add a new tree node - var newNode = TreeView.AddNewNode(parentNode, e.Item, newNodeIndex); - newNode.ContextMenuStrip = GetContextMenu(null, e.Item); + TreeView.AddNewNode(parentNode, e.Item, newNodeIndex); } else { Index: src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.Designer.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.Designer.cs (.../ProjectTreeView.Designer.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.Designer.cs (.../ProjectTreeView.Designer.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -32,7 +32,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectTreeView)); - this.contextMenuFolder = new System.Windows.Forms.ContextMenuStrip(this.components); + this.contextMenuProject = new System.Windows.Forms.ContextMenuStrip(this.components); this.buttonFolderAdd = new DelftTools.Controls.Swf.ClonableToolStripMenuItem(); this.buttonFolderAddNewItem = new DelftTools.Controls.Swf.ClonableToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); @@ -46,12 +46,12 @@ this.buttonFolderCollapseAll = new DelftTools.Controls.Swf.ClonableToolStripMenuItem(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.buttonFolderProperties = new DelftTools.Controls.Swf.ClonableToolStripMenuItem(); - this.contextMenuFolder.SuspendLayout(); + this.contextMenuProject.SuspendLayout(); this.SuspendLayout(); // - // contextMenuFolder + // contextMenuProject // - this.contextMenuFolder.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.contextMenuProject.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buttonFolderAdd, this.toolStripSeparator4, this.buttonFolderImportFolder, @@ -64,8 +64,8 @@ this.buttonFolderCollapseAll, this.toolStripSeparator7, this.buttonFolderProperties}); - this.contextMenuFolder.Name = "contextMenuFolder"; - resources.ApplyResources(this.contextMenuFolder, "contextMenuFolder"); + this.contextMenuProject.Name = "contextMenuProject"; + resources.ApplyResources(this.contextMenuProject, "contextMenuProject"); // // buttonFolderAdd // @@ -156,14 +156,14 @@ resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Name = "ProjectTreeView"; - this.contextMenuFolder.ResumeLayout(false); + this.contextMenuProject.ResumeLayout(false); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.ContextMenuStrip contextMenuFolder; + private System.Windows.Forms.ContextMenuStrip contextMenuProject; private ClonableToolStripMenuItem buttonFolderAdd; private ClonableToolStripMenuItem buttonFolderAddNewItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; Index: src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.cs =================================================================== diff -u -rfa9b36343401d44cb6813d7871903782d0dedec9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.cs (.../ProjectTreeView.cs) (revision fa9b36343401d44cb6813d7871903782d0dedec9) +++ src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.cs (.../ProjectTreeView.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -138,7 +138,7 @@ buttonFolderImportFolder.Enabled = gui.CommandHandler.CanImportToGuiSelection(); - return contextMenuFolder; + return contextMenuProject; } return null; Index: src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.resx =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.resx (.../ProjectTreeView.resx) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Plugins.ProjectExplorer/ProjectTreeView.resx (.../ProjectTreeView.resx) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -117,45 +117,45 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 296, 17 - 152, 22 + 98, 22 Item - 136, 22 + 152, 22 New - 133, 6 + 149, 6 - 136, 22 + 152, 22 Import - 136, 22 + 152, 22 &Export ... - 133, 6 + 149, 6 - 136, 22 + 152, 22 &Delete @@ -164,42 +164,42 @@ - 136, 22 + 152, 22 Re&name - 133, 6 + 149, 6 - 136, 22 + 152, 22 Expand All - 136, 22 + 152, 22 Collapse All - 133, 6 + 149, 6 - 136, 22 + 152, 22 Properties - - 137, 204 + + 153, 226 - - contextMenuFolder + + contextMenuProject - + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -218,13 +218,13 @@ buttonFolderAdd - DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=1.0.4.31767, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d + DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null buttonFolderAddNewItem - DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=1.0.4.31767, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d + DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null toolStripSeparator4 @@ -236,7 +236,7 @@ buttonFolderImportFolder - DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=1.0.4.31767, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d + DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null buttonFolderExportFolder @@ -272,13 +272,13 @@ buttonFolderExpandAll - DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=1.0.4.31767, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d + DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null buttonFolderCollapseAll - DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=1.0.4.31767, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d + DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null toolStripSeparator7 @@ -290,7 +290,7 @@ buttonFolderProperties - DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=1.0.4.31767, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d + DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null ProjectTreeView Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLayerTreeViewNodePresenter.cs =================================================================== diff -u -rfa9b36343401d44cb6813d7871903782d0dedec9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLayerTreeViewNodePresenter.cs (.../MapLayerTreeViewNodePresenter.cs) (revision fa9b36343401d44cb6813d7871903782d0dedec9) +++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLayerTreeViewNodePresenter.cs (.../MapLayerTreeViewNodePresenter.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -36,7 +36,6 @@ node.Text = layer.Name; node.Checked = layer.Visible; node.ShowCheckBox = true; - node.ContextMenuStrip = GetContextMenu(null, layer); node.IsVisible = layer.ShowInTreeView; } Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapTreeViewNodePresenter.cs =================================================================== diff -u -r98a7464aa2f9a8163979b8a9d5ac617e412ba3a0 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapTreeViewNodePresenter.cs (.../MapTreeViewNodePresenter.cs) (revision 98a7464aa2f9a8163979b8a9d5ac617e412ba3a0) +++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapTreeViewNodePresenter.cs (.../MapTreeViewNodePresenter.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -84,8 +84,7 @@ var sourceLayerGroup = sourceParentNodeData as GroupLayer; var layer = (ILayer) item; - bool removed; - removed = sourceLayerGroup != null ? sourceLayerGroup.Layers.Remove(layer) : target.Layers.Remove(layer); + var removed = sourceLayerGroup != null ? sourceLayerGroup.Layers.Remove(layer) : target.Layers.Remove(layer); if (removed) { Index: src/Plugins/Wti/Wti.Forms/NodePresenters/PipingNodePresenterBase.cs =================================================================== diff -u -rfa9b36343401d44cb6813d7871903782d0dedec9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- src/Plugins/Wti/Wti.Forms/NodePresenters/PipingNodePresenterBase.cs (.../PipingNodePresenterBase.cs) (revision fa9b36343401d44cb6813d7871903782d0dedec9) +++ src/Plugins/Wti/Wti.Forms/NodePresenters/PipingNodePresenterBase.cs (.../PipingNodePresenterBase.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -107,114 +107,114 @@ } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected abstract void UpdateNode(ITreeNode parentNode, ITreeNode node, T nodeData); /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual IEnumerable GetChildNodeObjects(T nodeData, ITreeNode node) { return Enumerable.Empty(); } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual void OnNodeRenamed(T nodeData, string newName) { throw new InvalidOperationException(string.Format("Cannot rename tree node of type {0}.", GetType().Name)); } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual DragOperations CanDrag(T nodeData) { return DragOperations.None; } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual DragOperations CanDrop(T item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations) { return DragOperations.None; } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual bool CanInsert(T item, ITreeNode sourceNode, ITreeNode targetNode) { return false; } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual void OnDragDrop(T item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position) { // Do nothing } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual void OnNodeSelected(T nodeData) { // Do nothing } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual ContextMenuStrip GetContextMenu(ITreeNode sender, T nodeData) { return null; } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual void OnPropertyChanged(T sender, ITreeNode node, PropertyChangedEventArgs e) { // Do nothing } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual void OnCollectionChanged(T sender, NotifyCollectionChangingEventArgs e) { // Do nothing } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual bool CanRemove(object parentNodeData, T nodeData) { return false; } /// - /// Typed implementation method of . + /// Typed implementation of method . /// - /// + /// protected virtual bool RemoveNodeData(object parentNodeData, T nodeData) { throw new InvalidOperationException(String.Format("Cannot delete node of type {0}.", GetType().Name)); Index: test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj =================================================================== diff -u -r471364bcc1e991a440787d5a574ae1b1e53e6f1d -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj (.../DeltaShell.Tests.csproj) (revision 471364bcc1e991a440787d5a574ae1b1e53e6f1d) +++ test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj (.../DeltaShell.Tests.csproj) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -92,8 +92,6 @@ - - True True Fisheye: Tag 9e0b372066f8d8be8c231b3be8922d29a1c61e1f refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Gui/MenuManagerTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: test/Plugins/Wti/Wti.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs =================================================================== diff -u -rfa9b36343401d44cb6813d7871903782d0dedec9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- test/Plugins/Wti/Wti.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs (.../PipingSoilProfileCollectionNodePresenterTest.cs) (revision fa9b36343401d44cb6813d7871903782d0dedec9) +++ test/Plugins/Wti/Wti.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs (.../PipingSoilProfileCollectionNodePresenterTest.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -358,9 +358,8 @@ var returnedContextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock); // Assert - var contextMenu = returnedContextMenu; - Assert.AreEqual(1, contextMenu.Items.Count); - var importItem = contextMenu.Items[0]; + Assert.AreEqual(1, returnedContextMenu.Items.Count); + var importItem = returnedContextMenu.Items[0]; Assert.AreEqual("Importeer ondergrondprofielen", importItem.Text); Assert.AreEqual("Importeer nieuwe ondergrondprofielen van een *.soil bestand.", importItem.ToolTipText); Assert.AreEqual(16, importItem.Image.Width); Index: test/Plugins/Wti/Wti.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs =================================================================== diff -u -rfa9b36343401d44cb6813d7871903782d0dedec9 -r9e0b372066f8d8be8c231b3be8922d29a1c61e1f --- test/Plugins/Wti/Wti.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs (.../PipingSurfaceLineCollectionNodePresenterTest.cs) (revision fa9b36343401d44cb6813d7871903782d0dedec9) +++ test/Plugins/Wti/Wti.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs (.../PipingSurfaceLineCollectionNodePresenterTest.cs) (revision 9e0b372066f8d8be8c231b3be8922d29a1c61e1f) @@ -305,9 +305,8 @@ var returnedContextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock); // Assert - var contextMenu = returnedContextMenu; - Assert.AreEqual(1, contextMenu.Items.Count); - var importItem = contextMenu.Items[0]; + Assert.AreEqual(1, returnedContextMenu.Items.Count); + var importItem = returnedContextMenu.Items[0]; Assert.AreEqual("Importeer dwarsdoorsnedes", importItem.Text); Assert.AreEqual("Importeer nieuwe dwarsdoorsnedes van een *.csv bestand.", importItem.ToolTipText); Assert.AreEqual(16, importItem.Image.Width);