Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r46e78a5da0e1f0bf37cbce099ad185e2b65fadc5 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 46e78a5da0e1f0bf37cbce099ad185e2b65fadc5)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -30,7 +30,7 @@
xmlns:properties="clr-namespace:Core.Common.Gui.Properties"
xmlns:viewHost="clr-namespace:Core.Common.Gui.Forms.ViewHost"
mc:Ignorable="d" x:Class="Core.Common.Gui.Forms.MainWindow.MainWindow"
- Title="MainWindow" Height="768" Width="1024" Background="White" Foreground="Black" x:Name="window"
+ Title="MainWindow" Height="768" Width="1024" Background="White" Foreground="Black" x:Name="Window"
Icon="/Core.Common.Gui;component\Resources/Ringtoets.ico"
ResizeMode="CanResizeWithGrip"
FlowDirection="LeftToRight"
@@ -151,7 +151,7 @@
-
+
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r0be8a14b7c545ae5a07d1da6a0fa70829323b0f2 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 0be8a14b7c545ae5a07d1da6a0fa70829323b0f2)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -113,7 +113,7 @@
{
get
{
- return avalonDockViewHost;
+ return AvalonDockViewHost;
}
}
Index: Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml
===================================================================
diff -u -re783c11dba00e2ade7edfa1d9f49d9319b1b94eb -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml (.../AvalonDockViewHost.xaml) (revision e783c11dba00e2ade7edfa1d9f49d9319b1b94eb)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml (.../AvalonDockViewHost.xaml) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -29,7 +29,7 @@
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
-
+
@@ -50,29 +50,29 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
Index: Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs
===================================================================
diff -u -r46e78a5da0e1f0bf37cbce099ad185e2b65fadc5 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs (.../AvalonDockViewHost.xaml.cs) (revision 46e78a5da0e1f0bf37cbce099ad185e2b65fadc5)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs (.../AvalonDockViewHost.xaml.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -58,14 +58,14 @@
public AvalonDockViewHost()
{
InitializeComponent();
- dummyPanelA.Hide();
- dummyPanelB.Hide();
+ DummyPanelA.Hide();
+ DummyPanelB.Hide();
toolViews = new List();
documentViews = new List();
hostControls = new List();
- dockingManager.ActiveContentChanged += OnActiveContentChanged;
+ DockingManager.ActiveContentChanged += OnActiveContentChanged;
LostFocus += OnLostFocus;
}
@@ -216,15 +216,15 @@
var layoutDocument = GetLayoutContent(view);
if (!layoutDocument.IsActive)
{
- dockingManager.Layout.ActiveContent = layoutDocument;
+ DockingManager.Layout.ActiveContent = layoutDocument;
}
}
else if (toolViews.Contains(view))
{
var layoutAnchorable = GetLayoutContent(view);
if (!layoutAnchorable.IsActive)
{
- dockingManager.Layout.ActiveContent = layoutAnchorable;
+ DockingManager.Layout.ActiveContent = layoutAnchorable;
}
}
@@ -258,16 +258,16 @@
// While doing so:
// - prevent unfocus actions when removing views programmatically (not necessary and might interfere with AvalonDock's active content change behavior);
// - prevent circular active content changes (which explains the code structure below).
- dockingManager.ActiveContentChanged -= OnActiveContentChanged;
- object activeContent = dockingManager.ActiveContent;
+ DockingManager.ActiveContentChanged -= OnActiveContentChanged;
+ object activeContent = DockingManager.ActiveContent;
userControl.ValidateChildren();
- if (!ReferenceEquals(activeContent, dockingManager.ActiveContent))
+ if (!ReferenceEquals(activeContent, DockingManager.ActiveContent))
{
- dockingManager.ActiveContent = activeContent;
+ DockingManager.ActiveContent = activeContent;
}
- dockingManager.ActiveContentChanged += OnActiveContentChanged;
+ DockingManager.ActiveContentChanged += OnActiveContentChanged;
}
}
@@ -291,7 +291,7 @@
{
if (ActiveViewChanged != null)
{
- ActiveViewChanged(this, new ViewChangeEventArgs(GetView(dockingManager.ActiveContent)));
+ ActiveViewChanged(this, new ViewChangeEventArgs(GetView(DockingManager.ActiveContent)));
}
}
@@ -320,14 +320,14 @@
// - prevent circular active content changes (which explains the code structure below).
if (focussedView != null && !removingProgrammatically)
{
- dockingManager.ActiveContentChanged -= OnActiveContentChanged;
- var activeContent = dockingManager.ActiveContent;
+ DockingManager.ActiveContentChanged -= OnActiveContentChanged;
+ var activeContent = DockingManager.ActiveContent;
NativeMethods.UnfocusActiveControl(focussedView as IContainerControl);
- dockingManager.ActiveContent = activeContent;
- dockingManager.ActiveContentChanged += OnActiveContentChanged;
+ DockingManager.ActiveContent = activeContent;
+ DockingManager.ActiveContentChanged += OnActiveContentChanged;
}
- focussedView = GetView(dockingManager.ActiveContent);
+ focussedView = GetView(DockingManager.ActiveContent);
if (documentViews.Contains(focussedView))
{
@@ -338,7 +338,7 @@
{
OnActiveViewChangedEvent();
}
- else if (dockingManager.ActiveContent == null)
+ else if (DockingManager.ActiveContent == null)
{
ActiveDocumentView = null;
}
@@ -411,7 +411,7 @@
///
private void UpdateDockingManager()
{
- dockingManager.UpdateLayout();
+ DockingManager.UpdateLayout();
}
private void CleanupHostControl(IView view)
@@ -426,14 +426,14 @@
private T GetLayoutContent(IView view) where T : LayoutContent
{
- return dockingManager.Layout.Descendents()
+ return DockingManager.Layout.Descendents()
.OfType()
.FirstOrDefault(d => GetView(d.Content) == view);
}
private void AddLayoutDocument(LayoutDocument layoutDocument)
{
- layoutDocumentPaneGroup.Descendents()
+ LayoutDocumentPaneGroup.Descendents()
.OfType()
.First()
.Children.Add(layoutDocument);
@@ -445,28 +445,28 @@
switch (toolViewLocation)
{
case ToolViewLocation.Left:
- if (leftLayoutAnchorablePaneGroup.Parent == null)
+ if (LeftLayoutAnchorablePaneGroup.Parent == null)
{
- leftLayoutAnchorablePaneGroup.Children.Add(new LayoutAnchorablePane());
- leftRightLayoutTarget.Children.Insert(0, leftLayoutAnchorablePaneGroup);
+ LeftLayoutAnchorablePaneGroup.Children.Add(new LayoutAnchorablePane());
+ LeftRightLayoutTarget.Children.Insert(0, LeftLayoutAnchorablePaneGroup);
}
- layoutAnchorablePaneGroup = leftLayoutAnchorablePaneGroup;
+ layoutAnchorablePaneGroup = LeftLayoutAnchorablePaneGroup;
break;
case ToolViewLocation.Bottom:
- if (bottomLayoutAnchorablePaneGroup.Parent == null)
+ if (BottomLayoutAnchorablePaneGroup.Parent == null)
{
- bottomLayoutAnchorablePaneGroup.Children.Add(new LayoutAnchorablePane());
- bottomLayoutTarget.Children.Add(bottomLayoutAnchorablePaneGroup);
+ BottomLayoutAnchorablePaneGroup.Children.Add(new LayoutAnchorablePane());
+ BottomLayoutTarget.Children.Add(BottomLayoutAnchorablePaneGroup);
}
- layoutAnchorablePaneGroup = bottomLayoutAnchorablePaneGroup;
+ layoutAnchorablePaneGroup = BottomLayoutAnchorablePaneGroup;
break;
case ToolViewLocation.Right:
- if (rightLayoutAnchorablePaneGroup.Parent == null)
+ if (RightLayoutAnchorablePaneGroup.Parent == null)
{
- rightLayoutAnchorablePaneGroup.Children.Add(new LayoutAnchorablePane());
- leftRightLayoutTarget.Children.Add(rightLayoutAnchorablePaneGroup);
+ RightLayoutAnchorablePaneGroup.Children.Add(new LayoutAnchorablePane());
+ LeftRightLayoutTarget.Children.Add(RightLayoutAnchorablePaneGroup);
}
- layoutAnchorablePaneGroup = rightLayoutAnchorablePaneGroup;
+ layoutAnchorablePaneGroup = RightLayoutAnchorablePaneGroup;
break;
default:
throw new InvalidEnumArgumentException("toolViewLocation", (int) toolViewLocation, typeof(ToolViewLocation));
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs
===================================================================
diff -u -re5d0f8b39906f1eaed363de066b8c9fac75d081e -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision e5d0f8b39906f1eaed363de066b8c9fac75d081e)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -921,7 +921,7 @@
private static bool IsDocumentViewPresent(AvalonDockViewHost avalonDockViewHost, IView documentView)
{
- var layoutDocumentPaneGroup = TypeUtils.GetField(avalonDockViewHost, "layoutDocumentPaneGroup");
+ var layoutDocumentPaneGroup = TypeUtils.GetField(avalonDockViewHost, "LayoutDocumentPaneGroup");
return layoutDocumentPaneGroup.Descendents()
.OfType()
@@ -937,13 +937,13 @@
switch (toolViewLocation)
{
case ToolViewLocation.Left:
- paneField = "leftLayoutAnchorablePaneGroup";
+ paneField = "LeftLayoutAnchorablePaneGroup";
break;
case ToolViewLocation.Right:
- paneField = "rightLayoutAnchorablePaneGroup";
+ paneField = "RightLayoutAnchorablePaneGroup";
break;
case ToolViewLocation.Bottom:
- paneField = "bottomLayoutAnchorablePaneGroup";
+ paneField = "BottomLayoutAnchorablePaneGroup";
break;
default:
paneField = "";
@@ -961,21 +961,21 @@
private static bool IsFocussedView(AvalonDockViewHost avalonDockViewHost, IView view)
{
- var dockingManager = TypeUtils.GetField(avalonDockViewHost, "dockingManager");
+ var dockingManager = TypeUtils.GetField(avalonDockViewHost, "DockingManager");
return ((WindowsFormsHost) dockingManager.ActiveContent).Child == view;
}
private static bool IsAnyViewFocussed(AvalonDockViewHost avalonDockViewHost)
{
- var dockingManager = TypeUtils.GetField(avalonDockViewHost, "dockingManager");
+ var dockingManager = TypeUtils.GetField(avalonDockViewHost, "DockingManager");
return dockingManager.ActiveContent != null;
}
private static bool IsImageSet(AvalonDockViewHost avalonDockViewHost, IView view)
{
- var dockingManager = TypeUtils.GetField(avalonDockViewHost, "dockingManager");
+ var dockingManager = TypeUtils.GetField(avalonDockViewHost, "DockingManager");
return dockingManager.Layout.Descendents()
.OfType()
Index: Core/Common/test/Core.Common.Utils.Test/Drawing/GraphicsExtensionsTest.cs
===================================================================
diff -u -rf08fd5cc1482a6c706bdb04d46b6482d489b7c5b -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/test/Core.Common.Utils.Test/Drawing/GraphicsExtensionsTest.cs (.../GraphicsExtensionsTest.cs) (revision f08fd5cc1482a6c706bdb04d46b6482d489b7c5b)
+++ Core/Common/test/Core.Common.Utils.Test/Drawing/GraphicsExtensionsTest.cs (.../GraphicsExtensionsTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -50,10 +50,10 @@
public void DrawImageTransparent_ImageNull_ThrowArgumentNullException()
{
// Setup
- var rect2x2 = new RectangleF(0f, 0f, 2f, 2f);
+ var rect2By2 = new RectangleF(0f, 0f, 2f, 2f);
var imageFormat = PixelFormat.Format32bppArgb;
- using (var target = Resources.Black2x2.Clone(rect2x2, imageFormat))
+ using (var target = Resources.Black2x2.Clone(rect2By2, imageFormat))
{
// Call
TestDelegate call = () => Graphics.FromImage(target).DrawImageTransparent(null, 0, 0, 0.4f);
@@ -70,11 +70,11 @@
public void DrawImageTransparent_DrawWithOpacity1OrGreater_TargetShouldBeIdenticalToSource(float opacity)
{
// Setup
- var rect2x2 = new RectangleF(0f, 0f, 2f, 2f);
+ var rect2By2 = new RectangleF(0f, 0f, 2f, 2f);
var imageFormat = PixelFormat.Format32bppArgb;
- using (var image = Resources.TestImage2x2.Clone(rect2x2, imageFormat))
- using (var target = Resources.Black2x2.Clone(rect2x2, imageFormat))
+ using (var image = Resources.TestImage2x2.Clone(rect2By2, imageFormat))
+ using (var target = Resources.Black2x2.Clone(rect2By2, imageFormat))
{
// Call
Graphics.FromImage(target).DrawImageTransparent(image, 0, 0, opacity);
Index: Core/Common/test/Core.Common.Utils.Test/Drawing/ImageExtensionsTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Core/Common/test/Core.Common.Utils.Test/Drawing/ImageExtensionsTest.cs (.../ImageExtensionsTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Core/Common/test/Core.Common.Utils.Test/Drawing/ImageExtensionsTest.cs (.../ImageExtensionsTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -37,11 +37,11 @@
public void AddOverlayImage_SourceDrawnCompletelyOverTarget_TargetShouldBeTheSameAsSource()
{
// Setup
- var rect2x2 = new RectangleF(0f, 0f, 2f, 2f);
+ var rect2By2 = new RectangleF(0f, 0f, 2f, 2f);
var imageFormat = PixelFormat.Format32bppArgb;
- using (var image = Resources.TestImage2x2.Clone(rect2x2, imageFormat))
- using (var target = Resources.Black2x2.Clone(rect2x2, imageFormat))
+ using (var image = Resources.TestImage2x2.Clone(rect2By2, imageFormat))
+ using (var target = Resources.Black2x2.Clone(rect2By2, imageFormat))
{
// Call
using (var result = target.AddOverlayImage(image, 0, 0, 2, 2))
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureFailureMechanismProperties.cs
===================================================================
diff -u -re570ba372fafe1802a4caae2ef9410b64457198b -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureFailureMechanismProperties.cs (.../ClosingStructureFailureMechanismProperties.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureFailureMechanismProperties.cs (.../ClosingStructureFailureMechanismProperties.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -41,7 +41,7 @@
private const int gravitationalAccelerationPropertyIndex = 3;
private const int cPropertyIndex = 4;
- private const int n2aPropertyIndex = 5;
+ private const int n2APropertyIndex = 5;
private const int lengthEffectPropertyIndex = 6;
private const int modelFactorOvertoppingFlowPropertyIndex = 7;
@@ -63,7 +63,7 @@
}
}
- [PropertyOrder(n2aPropertyIndex)]
+ [PropertyOrder(n2APropertyIndex)]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_LengthEffect")]
[ResourcesDisplayName(typeof(Resources), "ClosingStructureFailureMechanismContextProperties_N2A_DisplayName")]
[ResourcesDescription(typeof(Resources), "ClosingStructureFailureMechanismContextProperties_N2A_Description")]
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructureFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructureFailureMechanismPropertiesTest.cs (.../ClosingStructureFailureMechanismPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructureFailureMechanismPropertiesTest.cs (.../ClosingStructureFailureMechanismPropertiesTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -153,8 +153,8 @@
"De parameter 'C' die gebruikt wordt om het lengte-effect te berekenen.",
true);
- PropertyDescriptor n2aProperty = dynamicProperties[4];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(n2aProperty,
+ PropertyDescriptor n2AProperty = dynamicProperties[4];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(n2AProperty,
lengthEffectCategory,
"2NA [-]",
"De parameter '2NA' die gebruikt wordt om het lengte-effect te berekenen.");
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs
===================================================================
diff -u -r2f6400116d57c2b49f7089dbc9c8cd935c185a36 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs (.../DikeProfilesImporter.cs) (revision 2f6400116d57c2b49f7089dbc9c8cd935c185a36)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs (.../DikeProfilesImporter.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -62,7 +62,7 @@
protected override void HandleUserCancellingImport()
{
- log.Info(Resources.DikeProfilesImporter_HandleUserCancellingImport_dikeprofile_import_aborted);
+ Log.Info(Resources.DikeProfilesImporter_HandleUserCancellingImport_dikeprofile_import_aborted);
base.HandleUserCancellingImport();
}
@@ -72,7 +72,7 @@
{
return true;
}
- log.WarnFormat(Resources.DikeProfilesImporter_No_dike_geometry_file_0_skipped, prflFilePath);
+ Log.WarnFormat(Resources.DikeProfilesImporter_No_dike_geometry_file_0_skipped, prflFilePath);
return false;
}
@@ -87,7 +87,7 @@
var dikeProfileData = GetMatchingDikeProfileData(dikeProfileDataCollection, id);
if (dikeProfileData == null)
{
- log.ErrorFormat(Resources.DikeProfilesImporter_GetMatchingDikeProfileData_no_dikeprofiledata_for_location_0_, id);
+ Log.ErrorFormat(Resources.DikeProfilesImporter_GetMatchingDikeProfileData_no_dikeprofiledata_for_location_0_, id);
}
else
{
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs
===================================================================
diff -u -r2f6400116d57c2b49f7089dbc9c8cd935c185a36 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs (.../ForeshoreProfilesImporter.cs) (revision 2f6400116d57c2b49f7089dbc9c8cd935c185a36)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs (.../ForeshoreProfilesImporter.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -62,7 +62,7 @@
protected override void HandleUserCancellingImport()
{
- log.Info(Resources.ForeshoreProfilesImporter_HandleUserCancellingImport_foreshoreprofile_import_aborted);
+ Log.Info(Resources.ForeshoreProfilesImporter_HandleUserCancellingImport_foreshoreprofile_import_aborted);
base.HandleUserCancellingImport();
}
@@ -72,7 +72,7 @@
{
return true;
}
- log.WarnFormat(Resources.ForeshoreProfilesImporter_No_dam_no_foreshore_geometry_file_0_skipped, prflFilePath);
+ Log.WarnFormat(Resources.ForeshoreProfilesImporter_No_dam_no_foreshore_geometry_file_0_skipped, prflFilePath);
return false;
}
@@ -87,7 +87,7 @@
var dikeProfileData = GetMatchingDikeProfileData(dikeProfileDataCollection, id);
if (dikeProfileData == null)
{
- log.ErrorFormat(Resources.ForeshoreProfilesImporter_GetMatchingForeshoreProfileData_no_foreshoreprofiledata_for_location_0_, id);
+ Log.ErrorFormat(Resources.ForeshoreProfilesImporter_GetMatchingForeshoreProfileData_no_foreshoreprofiledata_for_location_0_, id);
}
else
{
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs
===================================================================
diff -u -r18a3f0bab0ce260604820928c136e66abca7daab -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision 18a3f0bab0ce260604820928c136e66abca7daab)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -43,7 +43,7 @@
///
public abstract class ProfilesImporter : FileImporterBase
{
- protected readonly ILog log = LogManager.GetLogger(typeof(ProfilesImporter));
+ protected readonly ILog Log = LogManager.GetLogger(typeof(ProfilesImporter));
private readonly ReferenceLine referenceLine;
///
@@ -162,11 +162,11 @@
}
catch (CriticalFileReadException exception)
{
- log.Error(exception.Message);
+ Log.Error(exception.Message);
}
catch (ArgumentException exception)
{
- log.Error(exception.Message);
+ Log.Error(exception.Message);
}
return new ReadResult(true);
}
@@ -194,11 +194,11 @@
Resources.ProfilesImporter_GetProfileLocationReadResult_Error_reading_Profile_LineNumber_0_Error_1_The_Profile_is_skipped,
i + 1,
exception.Message);
- log.Warn(message);
+ Log.Warn(message);
}
catch (CriticalFileReadException exception)
{
- log.Error(exception.Message);
+ Log.Error(exception.Message);
return new ReadResult(true);
}
}
@@ -225,12 +225,12 @@
double distanceToReferenceLine = GetDistanceToReferenceLine(profileLocation.Point);
if (distanceToReferenceLine > 1.0)
{
- log.ErrorFormat(Resources.ProfilesImporter_AddNextProfileLocation_0_skipping_location_outside_referenceline, profileLocation.Id);
+ Log.ErrorFormat(Resources.ProfilesImporter_AddNextProfileLocation_0_skipping_location_outside_referenceline, profileLocation.Id);
return;
}
if (profileLocations.Any(dpl => dpl.Id.Equals(profileLocation.Id)))
{
- log.WarnFormat(Resources.ProfilesImporter_AddNextProfileLocation_Location_with_id_0_already_read, profileLocation.Id);
+ Log.WarnFormat(Resources.ProfilesImporter_AddNextProfileLocation_Location_with_id_0_already_read, profileLocation.Id);
}
profileLocations.Add(profileLocation);
}
@@ -269,7 +269,7 @@
if (data.SheetPileType != SheetPileType.Coordinates)
{
- log.Error(String.Format(Resources.ProfilesImporter_ReadDikeProfileData_sheet_piling_not_zero_skipping_0_, prflFilePath));
+ Log.Error(String.Format(Resources.ProfilesImporter_ReadDikeProfileData_sheet_piling_not_zero_skipping_0_, prflFilePath));
continue;
}
@@ -285,7 +285,7 @@
// No need to catch ArgumentException, as prflFilePaths are valid by construction.
catch (CriticalFileReadException exception)
{
- log.Error(exception.Message);
+ Log.Error(exception.Message);
return new ReadResult(true);
}
}
@@ -302,7 +302,7 @@
Resources.ProfilesImporter_LogDuplicateDikeProfileData_Multiple_DikeProfileData_found_for_DikeProfile_0_File_1_skipped,
data.Id,
prflFilePath);
- log.Error(message);
+ Log.Error(message);
}
private double GetDistanceToReferenceLine(Point2D point)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs
===================================================================
diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision d73c509c93f18a87da76086c871eca2a2c903e12)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -291,7 +291,7 @@
private bool ContainsRequiredTables(List> definitions)
{
- return GetValidSchema().All(tableDefinition => definitions.Contains(tableDefinition));
+ return GetValidSchema().All(definitions.Contains);
}
private IDataReader CreateDesignTablesDataReader(long locationId, HydraRingFailureMechanismType calculationType)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs
===================================================================
diff -u -r901339a7022b3be93778d9691b001ba085c53d43 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 901339a7022b3be93778d9691b001ba085c53d43)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -543,9 +543,9 @@
FailureMechanismContribution =
{
Norm = 1.0/300
- }
+ },
+ ReferenceLine = new ReferenceLine()
};
- assessmentSection.ReferenceLine = new ReferenceLine();
assessmentSection.ReferenceLine.SetGeometry(new[]
{
new Point2D(147367.32190, 476902.91571),
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs
===================================================================
diff -u -rc6bf61523189445e832f384d7a9fe25a1a1dbaf8 -r25695fa024db28f8926ed7e361d19bec16d3c112
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision c6bf61523189445e832f384d7a9fe25a1a1dbaf8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112)
@@ -332,8 +332,10 @@
public void Validate_SurfaceLineMissingDitchPoint_ValidationMessageForIncompleteDitch(int missingType)
{
// Setup
- TestPipingInput tempInput = new TestPipingInput();
- tempInput.SurfaceLine = new RingtoetsPipingSurfaceLine();
+ TestPipingInput tempInput = new TestPipingInput
+ {
+ SurfaceLine = new RingtoetsPipingSurfaceLine()
+ };
tempInput.SurfaceLine.SetGeometry(new[]
{
new Point3D(0, 0, 2),
@@ -380,8 +382,10 @@
int ditchPolderSidePosition)
{
// Setup
- TestPipingInput tempInput = new TestPipingInput();
- tempInput.SurfaceLine = new RingtoetsPipingSurfaceLine();
+ TestPipingInput tempInput = new TestPipingInput
+ {
+ SurfaceLine = new RingtoetsPipingSurfaceLine()
+ };
tempInput.SurfaceLine.SetGeometry(new[]
{
new Point3D(0, 0, 2),