Fisheye: Tag 31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/ClonableToolStripMenuItem.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -r7839bcdb81979e816af0f5848cbb4ccb146e96a6 -r31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj (.../Core.Common.Controls.Swf.csproj) (revision 7839bcdb81979e816af0f5848cbb4ccb146e96a6)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj (.../Core.Common.Controls.Swf.csproj) (revision 31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd)
@@ -167,9 +167,6 @@
Component
-
- Component
-
Component
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -r31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd)
@@ -8,11 +8,9 @@
using System.Linq;
using System.Reflection;
using System.Windows.Forms;
-using Core.Common.Base;
using Core.Common.Base.Data;
using Core.Common.Base.Plugin;
using Core.Common.Controls;
-using Core.Common.Controls.Swf;
using Core.Common.Controls.Swf.TreeViewControls;
using Core.Common.Gui.ContextMenu;
using Core.Common.Gui.Forms.MainWindow;
@@ -90,7 +88,6 @@
Application.EnableVisualStyles();
- ProjectClosing += ApplicationProjectClosing;
ProjectOpened += ApplicationProjectOpened;
}
@@ -562,11 +559,6 @@
ResumeUI();
}
- private void ApplicationProjectClosing(Project project)
- {
- ClonableToolStripMenuItem.ClearCache();
- }
-
// Sets the tooltip for given view, assuming that ProjectExplorer is not null.
private void SetToolTipForView(IView view)
{
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.Designer.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -r31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.Designer.cs (.../MapLegendView.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.Designer.cs (.../MapLegendView.Designer.cs) (revision 31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd)
@@ -1,5 +1,6 @@
using Core.Common.Controls.Swf;
using Core.Common.Controls.Swf.TreeViewControls;
+using ToolStripMenuItem = System.Windows.Forms.ToolStripMenuItem;
namespace Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView
{
@@ -38,32 +39,32 @@
this.buttonAddLayer = new System.Windows.Forms.ToolStripButton();
this.buttonRemoveLayer = new System.Windows.Forms.ToolStripButton();
this.contextMenuLayer = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.contextMenuLayerOpenAttributeTable = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.contextMenuLayerOpenAttributeTable = new ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
- this.contextMenuLayerDelete = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
- this.contextMenuLayerRename = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.contextMenuLayerDelete = new ToolStripMenuItem();
+ this.contextMenuLayerRename = new ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.orderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bringToFrontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sendToBackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.bringForwardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sendBackwardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.zoomToLayerToolStripMenuItem1 = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
- this.zoomToMapExtentsToolStripMenuItem1 = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.zoomToLayerToolStripMenuItem1 = new ToolStripMenuItem();
+ this.zoomToMapExtentsToolStripMenuItem1 = new ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.showLabelsToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
- this.showInLegendToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
- this.hideAllButThisOneToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.showLabelsToolStripMenuItem = new ToolStripMenuItem();
+ this.showInLegendToolStripMenuItem = new ToolStripMenuItem();
+ this.hideAllButThisOneToolStripMenuItem = new ToolStripMenuItem();
this.TreeView = new Core.Common.Controls.Swf.TreeViewControls.TreeView();
this.contextMenuWmsLayer = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.zoomToLayerToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.zoomToLayerToolStripMenuItem = new ToolStripMenuItem();
this.contextMenuMap = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.addLayerToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
- this.addLayergroupToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.addLayerToolStripMenuItem = new ToolStripMenuItem();
+ this.addLayergroupToolStripMenuItem = new ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.zoomToExtentsToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
- this.zoomToMapExtentsToolStripMenuItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.zoomToExtentsToolStripMenuItem = new ToolStripMenuItem();
+ this.zoomToMapExtentsToolStripMenuItem = new ToolStripMenuItem();
this.changeCoordinateSystemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1.SuspendLayout();
this.contextMenuLayer.SuspendLayout();
@@ -335,24 +336,24 @@
private System.Windows.Forms.ToolStripButton buttonAddLayer;
private System.Windows.Forms.ToolStripButton buttonRemoveLayer;
private System.Windows.Forms.ContextMenuStrip contextMenuLayer;
- private ClonableToolStripMenuItem contextMenuLayerDelete;
- private ClonableToolStripMenuItem contextMenuLayerRename;
+ private ToolStripMenuItem contextMenuLayerDelete;
+ private ToolStripMenuItem contextMenuLayerRename;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
- private ClonableToolStripMenuItem contextMenuLayerOpenAttributeTable;
+ private ToolStripMenuItem contextMenuLayerOpenAttributeTable;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripButton buttonAddWmsLayer;
private System.Windows.Forms.ContextMenuStrip contextMenuWmsLayer;
- private ClonableToolStripMenuItem zoomToLayerToolStripMenuItem;
+ private ToolStripMenuItem zoomToLayerToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip contextMenuMap;
- private ClonableToolStripMenuItem addLayerToolStripMenuItem;
- private ClonableToolStripMenuItem zoomToLayerToolStripMenuItem1;
- private ClonableToolStripMenuItem zoomToExtentsToolStripMenuItem;
- private ClonableToolStripMenuItem showLabelsToolStripMenuItem;
- private ClonableToolStripMenuItem showInLegendToolStripMenuItem;
- private ClonableToolStripMenuItem hideAllButThisOneToolStripMenuItem;
- private ClonableToolStripMenuItem addLayergroupToolStripMenuItem;
- private ClonableToolStripMenuItem zoomToMapExtentsToolStripMenuItem;
- private ClonableToolStripMenuItem zoomToMapExtentsToolStripMenuItem1;
+ private ToolStripMenuItem addLayerToolStripMenuItem;
+ private ToolStripMenuItem zoomToLayerToolStripMenuItem1;
+ private ToolStripMenuItem zoomToExtentsToolStripMenuItem;
+ private ToolStripMenuItem showLabelsToolStripMenuItem;
+ private ToolStripMenuItem showInLegendToolStripMenuItem;
+ private ToolStripMenuItem hideAllButThisOneToolStripMenuItem;
+ private ToolStripMenuItem addLayergroupToolStripMenuItem;
+ private ToolStripMenuItem zoomToMapExtentsToolStripMenuItem;
+ private ToolStripMenuItem zoomToMapExtentsToolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem orderToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem bringToFrontToolStripMenuItem;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -r2e855cfd58cca717db843b13e1e24f1fc9c4f451 -r31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 31595e2aa87c2cb7e23fb07cd3f04d219bfd15fd)
@@ -11,13 +11,13 @@
namespace Ringtoets.Integration.Forms.Test.Views
{
[TestFixture]
- public class FailureMechanismContributionViewTest : NUnitFormTest
+ public class FailureMechanismContributionViewTest
{
private MockRepository mockRepository;
- public override void Setup()
+ [SetUp]
+ public void Setup()
{
- base.Setup();
mockRepository = new MockRepository();
}