Index: Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs
===================================================================
diff -u -r7cc5546f30927d1d48627daadeb739b71decdd9a -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs (.../ContextMenuBuilder.cs) (revision 7cc5546f30927d1d48627daadeb739b71decdd9a)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs (.../ContextMenuBuilder.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -128,18 +128,18 @@
return this;
}
- public IContextMenuBuilder AddUpdateItem()
+ public IContextMenuBuilder AddImportItem(string text, string toolTip, Image image)
{
- AddItem(guiItemsFactory.CreateUpdateItem());
+ AddItem(guiItemsFactory.CreateImportItem(text, toolTip, image));
return this;
}
- public IContextMenuBuilder AddCustomImportItem(string text, string toolTip, Image image)
+ public IContextMenuBuilder AddUpdateItem()
{
- AddItem(guiItemsFactory.CreateImportItem(text, toolTip, image));
+ AddItem(guiItemsFactory.CreateUpdateItem());
return this;
}
-
+
public IContextMenuBuilder AddPropertiesItem()
{
AddItem(guiItemsFactory.CreatePropertiesItem());
Index: Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs (.../IContextMenuBuilder.cs) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs (.../IContextMenuBuilder.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -79,21 +79,21 @@
IContextMenuBuilder AddImportItem();
///
- /// Adds an item to the , which updates the data of the .
- ///
- /// The itself.
- IContextMenuBuilder AddUpdateItem();
-
- ///
/// Adds an item to the , which imports to the data of the .
///
/// The text of the import item.
/// The tooltip of the import item.
/// The image of the import item.
/// The itself.
- IContextMenuBuilder AddCustomImportItem(string text, string toolTip, Image image);
+ IContextMenuBuilder AddImportItem(string text, string toolTip, Image image);
///
+ /// Adds an item to the , which updates the data of the .
+ ///
+ /// The itself.
+ IContextMenuBuilder AddUpdateItem();
+
+ ///
/// Adds an item to the , which shows properties of the data of the .
///
/// The itself.
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -591,7 +591,7 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void AddImportItem_WhenBuild_ItemAddedToContextMenu(bool hasImportersForNodeData)
+ public void AddImportItemWithoutParameters_WhenBuild_ItemAddedToContextMenu(bool hasImportersForNodeData)
{
// Setup
var nodeData = new object();
@@ -631,17 +631,21 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void AddUpdateItem_WhenBuild_ItemAddedToContextMenu(bool hasUpdatesForNodeData)
+ public void AddImportItemWithTextualParameters_WhenBuild_ItemAddedToContextMenu(bool hasImportersForNodeData)
{
// Setup
+ const string text = "import";
+ const string toolTip = "import tooltip";
+ Image image = Resources.ImportIcon;
+
var nodeData = new object();
var applicationFeatureCommands = mocks.StrictMock();
var importCommandHandler = mocks.StrictMock();
- var updateCommandHandler = mocks.StrictMock();
var exportCommandHandler = mocks.StrictMock();
+ var updateCommandHandler = mocks.StrictMock();
var viewCommands = mocks.StrictMock();
- updateCommandHandler.Expect(ch => ch.CanUpdateOn(nodeData)).Return(hasUpdatesForNodeData);
+ importCommandHandler.Expect(ch => ch.CanImportOn(nodeData)).Return(hasImportersForNodeData);
mocks.ReplayAll();
@@ -656,13 +660,13 @@
treeViewControl);
// Call
- ContextMenuStrip result = builder.AddUpdateItem().Build();
+ ContextMenuStrip result = builder.AddImportItem(text, toolTip, image).Build();
// Assert
Assert.IsInstanceOf(result);
Assert.AreEqual(1, result.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Update, Resources.Update_ToolTip, Resources.RefreshIcon, hasUpdatesForNodeData);
+ TestHelper.AssertContextMenuStripContainsItem(result, 0, text, toolTip, image, hasImportersForNodeData);
}
mocks.VerifyAll();
@@ -671,21 +675,17 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void AddCustomImportItem_WhenBuild_ItemAddedToContenxtMenu(bool hasImportersForNodeData)
+ public void AddUpdateItem_WhenBuild_ItemAddedToContextMenu(bool hasUpdatesForNodeData)
{
// Setup
- const string text = "import";
- const string toolTip = "import tooltip";
- Image image = Resources.ImportIcon;
-
var nodeData = new object();
var applicationFeatureCommands = mocks.StrictMock();
var importCommandHandler = mocks.StrictMock();
- var exportCommandHandler = mocks.StrictMock();
var updateCommandHandler = mocks.StrictMock();
+ var exportCommandHandler = mocks.StrictMock();
var viewCommands = mocks.StrictMock();
- importCommandHandler.Expect(ch => ch.CanImportOn(nodeData)).Return(hasImportersForNodeData);
+ updateCommandHandler.Expect(ch => ch.CanUpdateOn(nodeData)).Return(hasUpdatesForNodeData);
mocks.ReplayAll();
@@ -700,13 +700,13 @@
treeViewControl);
// Call
- ContextMenuStrip result = builder.AddCustomImportItem(text, toolTip, image).Build();
+ ContextMenuStrip result = builder.AddUpdateItem().Build();
// Assert
Assert.IsInstanceOf(result);
Assert.AreEqual(1, result.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(result, 0, text, toolTip, image, hasImportersForNodeData);
+ TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Update, Resources.Update_ToolTip, Resources.RefreshIcon, hasUpdatesForNodeData);
}
mocks.VerifyAll();
Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/ContextMenu/CustomItemsOnlyContextMenuBuilderTest.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/ContextMenu/CustomItemsOnlyContextMenuBuilderTest.cs (.../CustomItemsOnlyContextMenuBuilderTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/ContextMenu/CustomItemsOnlyContextMenuBuilderTest.cs (.../CustomItemsOnlyContextMenuBuilderTest.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -134,7 +134,7 @@
}
[Test]
- public void AddImportItem_WhenBuild_StubbedItemAddedToContextMenu()
+ public void AddImportItemWithoutParameters_WhenBuild_StubbedItemAddedToContextMenu()
{
// Setup
var builder = new CustomItemsOnlyContextMenuBuilder();
@@ -147,26 +147,26 @@
}
[Test]
- public void AddUpdateItem_WhenBuild_StubbedItemAddedToContextMenu()
+ public void AddImportItemWithTextualParameters_WhenBuild_StubbedItemAddedToContextMenu()
{
// Setup
var builder = new CustomItemsOnlyContextMenuBuilder();
// Call
- ContextMenuStrip result = builder.AddUpdateItem().Build();
+ ContextMenuStrip result = builder.AddImportItem(null, null, null).Build();
// Assert
AssertStubbedContextMenuItem(result);
}
[Test]
- public void AddCustomImportItem_WhenBuild_StubbedItemAddedToContextMenu()
+ public void AddUpdateItem_WhenBuild_StubbedItemAddedToContextMenu()
{
// Setup
var builder = new CustomItemsOnlyContextMenuBuilder();
// Call
- ContextMenuStrip result = builder.AddCustomImportItem(null, null, null).Build();
+ ContextMenuStrip result = builder.AddUpdateItem().Build();
// Assert
AssertStubbedContextMenuItem(result);
Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs
===================================================================
diff -u -rb84247efff64a06a9e79b86acb2a87f47aaeeb55 -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs (.../CustomItemsOnlyContextMenuBuilder.cs) (revision b84247efff64a06a9e79b86acb2a87f47aaeeb55)
+++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs (.../CustomItemsOnlyContextMenuBuilder.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -111,12 +111,16 @@
/// Adds a dummy to the .
///
/// The .
- public IContextMenuBuilder AddUpdateItem()
+ public IContextMenuBuilder AddImportItem(string text, string toolTip, Image image)
{
return AddStubItem();
}
- public IContextMenuBuilder AddCustomImportItem(string text, string toolTip, Image image)
+ ///
+ /// Adds a dummy to the .
+ ///
+ /// The .
+ public IContextMenuBuilder AddUpdateItem()
{
return AddStubItem();
}
Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs
===================================================================
diff -u -r54d2453c0bea232c1c507ef9996143e6af8e3a61 -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 54d2453c0bea232c1c507ef9996143e6af8e3a61)
+++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -421,7 +421,7 @@
private ContextMenuStrip MapDataCollectionContextMenuStrip(MapDataCollectionContext context, object parentData, TreeViewControl treeView)
{
return contextMenuBuilderProvider.Get(context, treeView)
- .AddCustomImportItem(
+ .AddImportItem(
MapResources.MapLegendView_MapDataCollectionContextMenuStrip_Add_MapLayer,
MapResources.MapLegendView_MapDataCollectionContextMenuStrip_Add_MapLayer_ToolTip,
MapResources.MapPlusIcon)
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs (.../MapDataCollectionContextTreeNodeInfoTest.cs) (revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs (.../MapDataCollectionContextTreeNodeInfoTest.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -499,7 +499,7 @@
var builder = mocks.StrictMock();
using (mocks.Ordered())
{
- builder.Expect(mb => mb.AddCustomImportItem(null, null, null)).IgnoreArguments().Return(builder);
+ builder.Expect(mb => mb.AddImportItem(null, null, null)).IgnoreArguments().Return(builder);
builder.Expect(mb => mb.AddSeparator()).Return(builder);
builder.Expect(mb => mb.AddCustomItem(Arg.Is.NotNull)).Return(builder);
builder.Expect(mb => mb.AddSeparator()).Return(builder);
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs
===================================================================
diff -u -ra54668f67eba8b3498b65e9117a2e0af0b9840c8 -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision a54668f67eba8b3498b65e9117a2e0af0b9840c8)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -463,9 +463,9 @@
/// The tooltip of the import item.
/// The image of the import item.
/// The itself.
- public RiskeerContextMenuBuilder AddCustomImportItem(string text, string toolTip, Image image)
+ public RiskeerContextMenuBuilder AddImportItem(string text, string toolTip, Image image)
{
- contextMenuBuilder.AddCustomImportItem(text, toolTip, image);
+ contextMenuBuilder.AddImportItem(text, toolTip, image);
return this;
}
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs
===================================================================
diff -u -rfd572b1d0d0be95b5218314d9022665514b68caf -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision fd572b1d0d0be95b5218314d9022665514b68caf)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -561,7 +561,7 @@
}
[Test]
- public void AddImportItem_ContextMenuBuilder_CorrectlyDecorated()
+ public void AddImportItemWithoutParameters_ContextMenuBuilder_CorrectlyDecorated()
{
// Setup
var mocks = new MockRepository();
@@ -580,86 +580,86 @@
}
[Test]
- public void AddPropertiesItem_ContextMenuBuilder_CorrectlyDecorated()
+ public void AddImportItemWithTextualParameters_ContextMenuBuilder_CorrectlyDecorated()
{
// Setup
+ const string text = "import";
+ const string toolTip = "import tooltip";
+ Bitmap image = RiskeerFormsResources.DatabaseIcon;
+
var mocks = new MockRepository();
var contextMenuBuilder = mocks.StrictMock();
- contextMenuBuilder.Expect(cmb => cmb.AddPropertiesItem());
+ contextMenuBuilder.Expect(cmb => cmb.AddImportItem(text, toolTip, image));
mocks.ReplayAll();
var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder);
// Call
- riskeerContextMenuBuilder.AddPropertiesItem();
+ riskeerContextMenuBuilder.AddImportItem(text, toolTip, image);
// Assert
mocks.VerifyAll();
}
[Test]
- public void AddSeparator_ContextMenuBuilder_CorrectlyDecorated()
+ public void AddPropertiesItem_ContextMenuBuilder_CorrectlyDecorated()
{
// Setup
var mocks = new MockRepository();
var contextMenuBuilder = mocks.StrictMock();
- contextMenuBuilder.Expect(cmb => cmb.AddSeparator());
+ contextMenuBuilder.Expect(cmb => cmb.AddPropertiesItem());
mocks.ReplayAll();
var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder);
// Call
- riskeerContextMenuBuilder.AddSeparator();
+ riskeerContextMenuBuilder.AddPropertiesItem();
// Assert
mocks.VerifyAll();
}
[Test]
- public void AddCustomItem_ContextMenuBuilder_CorrectlyDecorated()
+ public void AddSeparator_ContextMenuBuilder_CorrectlyDecorated()
{
// Setup
var mocks = new MockRepository();
- var contextMenuItem = mocks.StrictMock();
var contextMenuBuilder = mocks.StrictMock();
- contextMenuBuilder.Expect(cmb => cmb.AddCustomItem(contextMenuItem));
+ contextMenuBuilder.Expect(cmb => cmb.AddSeparator());
mocks.ReplayAll();
var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder);
// Call
- riskeerContextMenuBuilder.AddCustomItem(contextMenuItem);
+ riskeerContextMenuBuilder.AddSeparator();
// Assert
mocks.VerifyAll();
}
[Test]
- public void AddCustomImportItem_ContextMenuBuilder_CorrectlyDecorated()
+ public void AddCustomItem_ContextMenuBuilder_CorrectlyDecorated()
{
// Setup
- const string text = "import";
- const string toolTip = "import tooltip";
- Bitmap image = RiskeerFormsResources.DatabaseIcon;
-
var mocks = new MockRepository();
+ var contextMenuItem = mocks.StrictMock();
var contextMenuBuilder = mocks.StrictMock();
- contextMenuBuilder.Expect(cmb => cmb.AddCustomImportItem(text, toolTip, image));
+ contextMenuBuilder.Expect(cmb => cmb.AddCustomItem(contextMenuItem));
mocks.ReplayAll();
var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder);
// Call
- riskeerContextMenuBuilder.AddCustomImportItem(text, toolTip, image);
+ riskeerContextMenuBuilder.AddCustomItem(contextMenuItem);
// Assert
mocks.VerifyAll();
}
-
+
[Test]
public void Build_ContextMenuBuilder_CorrectlyDecorated()
{
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r1250f75d43f878e4ad35f226cea3c68f556964c2 -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 1250f75d43f878e4ad35f226cea3c68f556964c2)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -2290,9 +2290,9 @@
() => RiskeerDataSynchronizationService.ClearIllustrationPointResultsForDesignWaterLevelAndWaveHeightCalculations(nodeData.AssessmentSection));
AssessmentSection assessmentSection = nodeData.AssessmentSection;
- return builder.AddCustomImportItem(RiskeerFormsResources.HydraulicBoundaryDatabase_Connect,
- RiskeerFormsResources.HydraulicBoundaryDatabase_Connect_ToolTip,
- RiskeerCommonFormsResources.DatabaseIcon)
+ return builder.AddImportItem(RiskeerFormsResources.HydraulicBoundaryDatabase_Connect,
+ RiskeerFormsResources.HydraulicBoundaryDatabase_Connect_ToolTip,
+ RiskeerCommonFormsResources.DatabaseIcon)
.AddExportItem()
.AddSeparator()
.AddCustomItem(calculateAllItem)
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r42c92c2cbc22360a8b4da9b364e49479379f54fc -re5278cea919b2a8f364c834e93a39b94ceb092a0
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 42c92c2cbc22360a8b4da9b364e49479379f54fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision e5278cea919b2a8f364c834e93a39b94ceb092a0)
@@ -145,7 +145,7 @@
var menuBuilder = mocks.StrictMock();
using (mocks.Ordered())
{
- menuBuilder.Expect(mb => mb.AddCustomImportItem(null, null, null)).IgnoreArguments().Return(menuBuilder);
+ menuBuilder.Expect(mb => mb.AddImportItem(null, null, null)).IgnoreArguments().Return(menuBuilder);
menuBuilder.Expect(mb => mb.AddExportItem()).Return(menuBuilder);
menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);