Index: Core/Common/src/Core.Common.Controls.TreeView/Properties/Resources.Designer.cs =================================================================== diff -u -rc8848af0c6f8780634dcce2013e606f090da6577 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Core/Common/src/Core.Common.Controls.TreeView/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c8848af0c6f8780634dcce2013e606f090da6577) +++ Core/Common/src/Core.Common.Controls.TreeView/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -586,25 +586,6 @@ } /// - /// Looks up a localized string similar to Structuurweergave mag niet leeg zijn.. - /// - internal static string TreeViewController_TreeViewController_Tree_view_can_t_be_null { - get { - return ResourceManager.GetString("TreeViewController_TreeViewController_Tree_view_can_t_be_null", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan INodePresenter voor {0} niet vinden. Zorg ervoor dat u de ontbrekende INodePresenter aan de NodePresenters eigenschap van een TreeView heeft toegevoegd.. - /// - internal static string TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added_it_to_Presenters_collection_of_a_TreeView { - get { - return ResourceManager.GetString("TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added" + - "_it_to_Presenters_collection_of_a_TreeView", resourceCulture); - } - } - - /// /// Looks up a localized string similar to OnNodeRenamed moet zijn geïmplementeerd in de afgeleide klasse.. /// internal static string TreeViewNodePresenterBase_OnNodeRenamed_OnNodeRenamed_must_be_implemented_in_derived_class { Index: Core/Common/src/Core.Common.Controls.TreeView/Properties/Resources.resx =================================================================== diff -u -rfa1fb8469acb9193d09d74ba305c19d448c0fd4f -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Core/Common/src/Core.Common.Controls.TreeView/Properties/Resources.resx (.../Resources.resx) (revision fa1fb8469acb9193d09d74ba305c19d448c0fd4f) +++ Core/Common/src/Core.Common.Controls.TreeView/Properties/Resources.resx (.../Resources.resx) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -155,9 +155,6 @@ Weet u zeker dat u het volgende element wilt verwijderen: {0} - - Kan INodePresenter voor {0} niet vinden. Zorg ervoor dat u de ontbrekende INodePresenter aan de NodePresenters eigenschap van een TreeView heeft toegevoegd. - Aantal X-waarden moet gelijk zijn aan het aantal Y-waarden. @@ -194,9 +191,6 @@ OnNodeRenamed moet zijn geïmplementeerd in de afgeleide klasse. - - Structuurweergave mag niet leeg zijn. - Fout tijdens slepen/neerzetten: {0}. Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -1640,24 +1640,6 @@ } /// - /// Looks up a localized string similar to Voor het aanmaken van knopen in de boom is een 'CommandHandler' nodig.. - /// - public static string NodePresenter_CommandHandler_required { - get { - return ResourceManager.GetString("NodePresenter_CommandHandler_required", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Voor het aanmaken van knopen in de boom is een 'ContextMenuBuilderProvider' nodig.. - /// - public static string NodePresenter_ContextMenuBuilderProvider_required { - get { - return ResourceManager.GetString("NodePresenter_ContextMenuBuilderProvider_required", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap note { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -832,12 +832,6 @@ Verwijder dit element uit de boom. - - Voor het aanmaken van knopen in de boom is een 'CommandHandler' nodig. - - - Voor het aanmaken van knopen in de boom is een 'ContextMenuBuilderProvider' nodig. - Alfabetisch Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -120,7 +120,7 @@ } [Test] - public void Constructor_NoTreeViewController_ThrowsContextMenuBuilderException() + public void Constructor_NoTreeViewControl_ThrowsContextMenuBuilderException() { // Setup var applicationFeatureCommandsMock = mocks.StrictMock(); Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs =================================================================== diff -u -rd52ae535aea52b4e43aa6837305502e6cd911a92 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs (.../ProjectExplorer.Designer.cs) (revision d52ae535aea52b4e43aa6837305502e6cd911a92) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs (.../ProjectExplorer.Designer.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -35,7 +35,6 @@ // // ProjectExplorer // - this.AllowDrop = true; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.treeViewPanel); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs =================================================================== diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -54,7 +54,7 @@ } [Test] - public void GetProjectTreeViewNodePresenters_ReturnsSupportedNodePresenters() + public void GetTreeNodeInfos_ReturnsSupportedTreeNodeInfos() { // setup var mocks = new MockRepository(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r282ccae4bd7b32c8c208b7027829674e6e8bba65 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 282ccae4bd7b32c8c208b7027829674e6e8bba65) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -291,9 +291,9 @@ /// /// Looks up a localized string similar to Weet u zeker dat u de uitvoer van deze berekening wilt wissen?. /// - public static string PipingCalculationContextNodePresenter_GetContextMenu_Are_you_sure_clear_output { + public static string PipingCalculationContext_GetContextMenu_Are_you_sure_clear_output { get { - return ResourceManager.GetString("PipingCalculationContextNodePresenter_GetContextMenu_Are_you_sure_clear_output", resourceCulture); + return ResourceManager.GetString("PipingCalculationContext_GetContextMenu_Are_you_sure_clear_output", resourceCulture); } } @@ -399,10 +399,9 @@ /// /// Looks up a localized string similar to Weet u zeker dat u alle uitvoer wilt wissen?. /// - public static string PipingCalculationGroupContextNodePresenter_GetContextMenu_Are_you_sure_clear_all_output { + public static string PipingCalculationGroupContext_GetContextMenu_Are_you_sure_clear_all_output { get { - return ResourceManager.GetString("PipingCalculationGroupContextNodePresenter_GetContextMenu_Are_you_sure_clear_all_" + - "output", resourceCulture); + return ResourceManager.GetString("PipingCalculationGroupContext_GetContextMenu_Are_you_sure_clear_all_output", resourceCulture); } } @@ -482,20 +481,18 @@ /// /// Looks up a localized string similar to Er zijn geen berekeningen om uit te voeren.. /// - public static string PipingFailureMechanismNodePresenter_CreateCalculateAllItem_No_calculations_to_run { + public static string PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run { get { - return ResourceManager.GetString("PipingFailureMechanismNodePresenter_CreateCalculateAllItem_No_calculations_to_run" + - "", resourceCulture); + return ResourceManager.GetString("PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run", resourceCulture); } } /// /// Looks up a localized string similar to Er zijn geen berekeningen om te valideren.. /// - public static string PipingFailureMechanismNodePresenter_CreateValidateAllItem_No_calculations_to_validate { + public static string PipingFailureMechanism_CreateValidateAllItem_No_calculations_to_validate { get { - return ResourceManager.GetString("PipingFailureMechanismNodePresenter_CreateValidateAllItem_No_calculations_to_vali" + - "date", resourceCulture); + return ResourceManager.GetString("PipingFailureMechanism_CreateValidateAllItem_No_calculations_to_validate", resourceCulture); } } @@ -944,9 +941,9 @@ /// /// Looks up a localized string similar to Invoer. /// - public static string PipingInputContextNodePresenter_NodeDisplayName { + public static string PipingInputContext_NodeDisplayName { get { - return ResourceManager.GetString("PipingInputContextNodePresenter_NodeDisplayName", resourceCulture); + return ResourceManager.GetString("PipingInputContext_NodeDisplayName", resourceCulture); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r282ccae4bd7b32c8c208b7027829674e6e8bba65 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 282ccae4bd7b32c8c208b7027829674e6e8bba65) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -487,7 +487,7 @@ De verzameling van ondergrondschematiseringen - + Invoer @@ -514,22 +514,22 @@ Wis de uitvoer van alle berekeningen binnen deze berekeningsmap. - + Weet u zeker dat u alle uitvoer wilt wissen? Valideer alle berekeningen binnen deze berekeningsmap. - + Weet u zeker dat u de uitvoer van deze berekening wilt wissen? Wis de uitvoer van deze berekening. - + Er zijn geen berekeningen om te valideren. - + Er zijn geen berekeningen om uit te voeren. \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -rfd18531c4e5f5c1effb5d8dc2797c5cd57dd2aed -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision fd18531c4e5f5c1effb5d8dc2797c5cd57dd2aed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -105,7 +105,7 @@ yield return new TreeNodeInfo { - Text = pipingInputContext => PipingFormsResources.PipingInputContextNodePresenter_NodeDisplayName, + Text = pipingInputContext => PipingFormsResources.PipingInputContext_NodeDisplayName, Image = pipingInputContext => PipingFormsResources.PipingInputIcon, ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) .AddImportItem() @@ -264,7 +264,7 @@ if (!GetAllPipingCalculationsResursively(failureMechanism).Any()) { menuItem.Enabled = false; - menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanismNodePresenter_CreateCalculateAllItem_No_calculations_to_run; + menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run; } return menuItem; @@ -282,15 +282,15 @@ if (!GetAllPipingCalculationsResursively(failureMechanism).Any()) { menuItem.Enabled = false; - menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanismNodePresenter_CreateValidateAllItem_No_calculations_to_validate; + menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanism_CreateValidateAllItem_No_calculations_to_validate; } return menuItem; } private static void ClearAll(PipingFailureMechanism failureMechanism) { - if (MessageBox.Show(PipingFormsResources.PipingCalculationGroupContextNodePresenter_GetContextMenu_Are_you_sure_clear_all_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) + if (MessageBox.Show(PipingFormsResources.PipingCalculationGroupContext_GetContextMenu_Are_you_sure_clear_all_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) { return; } @@ -493,7 +493,7 @@ private static void ClearOutput(PipingCalculation calculation) { - if (MessageBox.Show(PipingFormsResources.PipingCalculationContextNodePresenter_GetContextMenu_Are_you_sure_clear_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) + if (MessageBox.Show(PipingFormsResources.PipingCalculationContext_GetContextMenu_Are_you_sure_clear_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) { return; } @@ -504,7 +504,7 @@ # endregion - # region PipingCalculationGroupContextNodePresenter TreeNodeInfo + # region PipingCalculationGroupContext TreeNodeInfo private object[] PipingCalculationGroupContextChildNodeObjects(PipingCalculationGroupContext nodeData) { @@ -580,7 +580,7 @@ PipingFormsResources.PipingCalculationGroup_ClearOutput_ToolTip, RingtoetsFormsResources.ClearIcon, (o, args) => { - if (MessageBox.Show(PipingFormsResources.PipingCalculationGroupContextNodePresenter_GetContextMenu_Are_you_sure_clear_all_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) + if (MessageBox.Show(PipingFormsResources.PipingCalculationGroupContext_GetContextMenu_Are_you_sure_clear_all_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) { return; } @@ -646,7 +646,7 @@ if (!group.GetPipingCalculations().Any()) { menuItem.Enabled = false; - menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanismNodePresenter_CreateCalculateAllItem_No_calculations_to_run; + menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run; } return menuItem; @@ -665,7 +665,7 @@ if (!group.GetPipingCalculations().Any()) { menuItem.Enabled = false; - menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanismNodePresenter_CreateValidateAllItem_No_calculations_to_validate; + menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanism_CreateValidateAllItem_No_calculations_to_validate; } return menuItem; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rfd18531c4e5f5c1effb5d8dc2797c5cd57dd2aed -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision fd18531c4e5f5c1effb5d8dc2797c5cd57dd2aed) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -1079,8 +1079,8 @@ ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndex]; Assert.IsFalse(validateItem.Enabled); Assert.IsFalse(calculateItem.Enabled); - Assert.AreEqual(PipingFormsResources.PipingFailureMechanismNodePresenter_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); - Assert.AreEqual(PipingFormsResources.PipingFailureMechanismNodePresenter_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + Assert.AreEqual(PipingFormsResources.PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); + Assert.AreEqual(PipingFormsResources.PipingFailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); mocks.VerifyAll(); // Expect no calls on arguments } @@ -1596,7 +1596,7 @@ } /// - /// Type indicator for testing methods on . + /// Type indicator for testing methods on . /// public enum DragDropTestMethod { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -328,8 +328,8 @@ ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndex]; Assert.IsFalse(validateItem.Enabled); Assert.IsFalse(calculateItem.Enabled); - Assert.AreEqual(PipingFormsResources.PipingFailureMechanismNodePresenter_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); - Assert.AreEqual(PipingFormsResources.PipingFailureMechanismNodePresenter_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + Assert.AreEqual(PipingFormsResources.PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); + Assert.AreEqual(PipingFormsResources.PipingFailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); mocks.VerifyAll(); // Expect no calls on arguments } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -r5f53f2f23d0c4145d79823c5443966ff4a5a830f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) @@ -60,7 +60,7 @@ var text = info.Text(pipingInputContext); // Assert - Assert.AreEqual(Resources.PipingInputContextNodePresenter_NodeDisplayName, text); + Assert.AreEqual(Resources.PipingInputContext_NodeDisplayName, text); mocks.VerifyAll(); }