Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r5720d0df0fc620ad53df2a68058a2e8fb6b7c473 -r7b3fc9673141a690c85fddfad4a22ee3d0225bf5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5720d0df0fc620ad53df2a68058a2e8fb6b7c473)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7b3fc9673141a690c85fddfad4a22ee3d0225bf5)
@@ -437,15 +437,6 @@
}
///
- /// Looks up a localized string similar to Categoriegrenzen per vak.
- ///
- public static string FailureMechanismSectionAssemblyCategories_DisplayName {
- get {
- return ResourceManager.GetString("FailureMechanismSectionAssemblyCategories_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Naam van het faalpad..
///
public static string FailurePath_Name_Description {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r5720d0df0fc620ad53df2a68058a2e8fb6b7c473 -r7b3fc9673141a690c85fddfad4a22ee3d0225bf5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5720d0df0fc620ad53df2a68058a2e8fb6b7c473)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 7b3fc9673141a690c85fddfad4a22ee3d0225bf5)
@@ -277,9 +277,6 @@
Toetsoordeel is verouderd. Druk op de "Toetsoordeel verversen" knop om opnieuw te berekenen.
-
- Categoriegrenzen per vak
-
Heeft vakindeling
Fisheye: Tag 7b3fc9673141a690c85fddfad4a22ee3d0225bf5 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7b3fc9673141a690c85fddfad4a22ee3d0225bf5 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7b3fc9673141a690c85fddfad4a22ee3d0225bf5 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rcd4cd602834d181a84a4db356b005d0cedb11679 -r7b3fc9673141a690c85fddfad4a22ee3d0225bf5
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision cd4cd602834d181a84a4db356b005d0cedb11679)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 7b3fc9673141a690c85fddfad4a22ee3d0225bf5)
@@ -592,21 +592,14 @@
CreateInstance = context => new AssemblyResultPerSectionView(context.WrappedData)
};
- yield return new RiskeerViewInfo(() => Gui)
- {
- GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName,
- CloseForData = RiskeerPluginHelper.ShouldCloseForFailureMechanismView,
- CreateInstance = context => new MacroStabilityOutwardsAssemblyCategoriesView((MacroStabilityOutwardsFailureMechanism) context.WrappedData,
- context.AssessmentSection,
- context.GetFailureMechanismSectionAssemblyCategoriesFunc)
- };
yield return new RiskeerViewInfo(() => Gui)
{
GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName,
CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor),
CreateInstance = context => new AssemblyResultCategoriesView(context.WrappedData,
context.GetAssemblyCategoriesFunc)
};
+
yield return new RiskeerViewInfo(() => Gui)
{
GetViewName = (view, context) => RiskeerFormsResources.AssemblyResultPerSectionMapView_DisplayName,
@@ -2637,7 +2630,7 @@
{
IAssessmentSection assessmentSection = nodeData.Parent;
WaterPressureAsphaltCoverFailureMechanism failureMechanism = nodeData.WrappedData;
-
+
return new object[]
{
new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
Fisheye: Tag 7b3fc9673141a690c85fddfad4a22ee3d0225bf5 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/MacroStabilityOutwardsAssemblyCategoriesViewTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r48378216ef0cf17903aa044159d27958282967fa -r7b3fc9673141a690c85fddfad4a22ee3d0225bf5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 48378216ef0cf17903aa044159d27958282967fa)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 7b3fc9673141a690c85fddfad4a22ee3d0225bf5)
@@ -394,7 +394,7 @@
ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray();
// Assert
- Assert.AreEqual(33, viewInfos.Length);
+ Assert.AreEqual(32, viewInfos.Length);
PluginTestHelper.AssertViewInfoDefined(
viewInfos,
@@ -525,12 +525,6 @@
PluginTestHelper.AssertViewInfoDefined(
viewInfos,
- typeof(MacroStabilityOutwardsAssemblyCategoriesContext),
- typeof(MacroStabilityOutwardsFailureMechanism),
- typeof(MacroStabilityOutwardsAssemblyCategoriesView));
-
- PluginTestHelper.AssertViewInfoDefined(
- viewInfos,
typeof(AssemblyResultCategoriesContext),
typeof(AssessmentSection),
typeof(AssemblyResultCategoriesView));
Fisheye: Tag 7b3fc9673141a690c85fddfad4a22ee3d0225bf5 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsAssemblyCategoriesViewInfoTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?