Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs
===================================================================
diff -u -ra760d63747f5c44e99f4e747ace1b4e51c040362 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs (.../CalculationGroup.cs) (revision a760d63747f5c44e99f4e747ace1b4e51c040362)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs (.../CalculationGroup.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -21,10 +21,8 @@
using System;
using System.Collections.Generic;
-
using Core.Common.Base;
using Core.Common.Base.Storage;
-
using Ringtoets.Common.Data.Properties;
namespace Ringtoets.Common.Data.Calculation
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationOutput.cs
===================================================================
diff -u -r0a94ed42cb943659d68be2ce6fb430f8f29fc3f3 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationOutput.cs (.../ICalculationOutput.cs) (revision 0a94ed42cb943659d68be2ce6fb430f8f29fc3f3)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationOutput.cs (.../ICalculationOutput.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -26,5 +26,5 @@
///
/// Interface describing an object that is the output to a .
///
- public interface ICalculationOutput : IObservable { }
+ public interface ICalculationOutput : IObservable {}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContributionItem.cs
===================================================================
diff -u -r13fcf9943a26918929a3ada0363c2414480db077 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContributionItem.cs (.../FailureMechanismContributionItem.cs) (revision 13fcf9943a26918929a3ada0363c2414480db077)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContributionItem.cs (.../FailureMechanismContributionItem.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -20,9 +20,7 @@
// All rights reserved.
using System;
-
using Ringtoets.Common.Data.FailureMechanism;
-
using CommonResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.Common.Data.Contribution
@@ -102,7 +100,7 @@
{
get
{
- return (Norm / Contribution) * 100;
+ return (Norm/Contribution)*100;
}
}
@@ -130,7 +128,7 @@
/// relevant. When true, then cannot be set to false.
///
public bool IsAlwaysRelevant { get; private set; }
-
+
///
/// Notifies the observers for the wrapped .
///
Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs
===================================================================
diff -u -r4c3daa6c52d8de89a58df080ea82b72b1855e534 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 4c3daa6c52d8de89a58df080ea82b72b1855e534)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -111,7 +111,7 @@
InsertSectionWhileMaintainingConnectivityOrder(section);
}
}
-
+
public virtual void ClearAllSections()
{
sections.Clear();
Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs
===================================================================
diff -u -r6f20aae03e9fecf0d90cf930d06ed72bc4633749 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs (.../ICalculatableFailureMechanism.cs) (revision 6f20aae03e9fecf0d90cf930d06ed72bc4633749)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs (.../ICalculatableFailureMechanism.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -26,7 +26,7 @@
///
/// Interface describing a failure mechanism that contains calculation groups that contains calculations.
///
- public interface ICalculatableFailureMechanism
+ public interface ICalculatableFailureMechanism
{
///
/// Gets all available calculation groups.
Index: Ringtoets/Common/src/Ringtoets.Common.Data/ICommentable.cs
===================================================================
diff -u -rfff12e249602fb700b2854c14a3b7cdd0b73c023 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/ICommentable.cs (.../ICommentable.cs) (revision fff12e249602fb700b2854c14a3b7cdd0b73c023)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/ICommentable.cs (.../ICommentable.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -29,6 +29,6 @@
///
/// Gets or sets the comments associated with the data object.
///
- string Comments { get; set; }
+ string Comments { get; set; }
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs
===================================================================
diff -u -r165068d9499f2282a744a79877d0af4461106d9d -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs (.../NormalDistributionDesignVariable.cs) (revision 165068d9499f2282a744a79877d0af4461106d9d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs (.../NormalDistributionDesignVariable.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -30,7 +30,7 @@
public override RoundedDouble GetDesignValue()
{
return new RoundedDouble(Distribution.Mean.NumberOfDecimalPlaces,
- DetermineDesignValue(Distribution.Mean, Distribution.StandardDeviation));
+ DetermineDesignValue(Distribution.Mean, Distribution.StandardDeviation));
}
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs
===================================================================
diff -u -r3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs (.../ProbabilityAssessmentOutput.cs) (revision 3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs (.../ProbabilityAssessmentOutput.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -20,13 +20,10 @@
// All rights reserved.
using System;
-
using Core.Common.Base;
using Core.Common.Base.Data;
using Core.Common.Base.Storage;
-
using Ringtoets.Common.Data.Calculation;
-
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.Common.Data.Probability
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/ProbabilityFormattingHelper.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/ProbabilityFormattingHelper.cs (.../ProbabilityFormattingHelper.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/ProbabilityFormattingHelper.cs (.../ProbabilityFormattingHelper.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -20,7 +20,6 @@
// All rights reserved.
using Ringtoets.Common.Forms.Properties;
-
using CommonBaseResources = Core.Common.Base.Properties.Resources;
namespace Ringtoets.Common.Forms.Helpers
@@ -43,7 +42,7 @@
CommonBaseResources.RoundedDouble_ToString_PositiveInfinity);
}
return string.Format(Resources.ProbabilityPerYearFormat,
- 1.0 / probability);
+ 1.0/probability);
}
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/TreeFolderCategory.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/TreeFolderCategory.cs (.../TreeFolderCategory.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/TreeFolderCategory.cs (.../TreeFolderCategory.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -30,10 +30,12 @@
/// Folder contents to not have a particular meaning.
///
General,
+
///
/// Marks the folder contents as inputs.
///
Input,
+
///
/// Marks the folder contents as outputs.
///
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rd1c832128168938c7cb5ed4b1ac54382e0fc96fe -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision d1c832128168938c7cb5ed4b1ac54382e0fc96fe)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -131,11 +131,6 @@
Core.Common.Utils
False
-
- {516EBC95-B8F2-428C-B7F6-733F01BF8FDD}
- Core.Components.Charting
- False
-
{318BA582-88C9-4816-A54A-A7E431461DE3}
Core.Components.Gis
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs
===================================================================
diff -u -rf00ef5699ccc950bf9d347e8e935c77a4f5f5833 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs (.../RingtoetsContextMenuBuilder.cs) (revision f00ef5699ccc950bf9d347e8e935c77a4f5f5833)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs (.../RingtoetsContextMenuBuilder.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -115,8 +115,8 @@
/// If the item should be enabled then the function should return a null or empty string.
/// The itself.
public RingtoetsContextMenuBuilder AddValidateAllCalculationsInGroupItem(TCalculationContext calculationGroupContext,
- Action validateAllAction,
- Func enableMenuItemFunction = null)
+ Action validateAllAction,
+ Func enableMenuItemFunction = null)
where TCalculationContext : ICalculationContext
{
contextMenuBuilder.AddCustomItem(RingtoetsContextMenuItemFactory.CreateValidateAllCalculationsInGroupItem(calculationGroupContext, validateAllAction, enableMenuItemFunction));
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs
===================================================================
diff -u -r95aa0bc669d63fa2aed395e44b5f0ecde84e9828 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision 95aa0bc669d63fa2aed395e44b5f0ecde84e9828)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -382,7 +382,7 @@
(sender, args) => RemoveAllChildrenFromGroup(calculationGroup));
var errorMessage = calculationGroup.Children.Any() ? null : Resources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove;
-
+
if (errorMessage != null)
{
menuItem.Enabled = false;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverter.cs
===================================================================
diff -u -r9d7a5bd6246ec71a14f1944516d21e06954243f7 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverter.cs (.../FailureMechanismSectionResultNoProbabilityValueDoubleConverter.cs) (revision 9d7a5bd6246ec71a14f1944516d21e06954243f7)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverter.cs (.../FailureMechanismSectionResultNoProbabilityValueDoubleConverter.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -22,12 +22,9 @@
using System;
using System.ComponentModel;
using System.Globalization;
-
using Core.Common.Base.Data;
-
using Ringtoets.Common.Forms.Helpers;
using Ringtoets.Common.Forms.Properties;
-
using CommonBaseResources = Core.Common.Base.Properties.Resources;
namespace Ringtoets.Common.Forms.TypeConverters
@@ -41,7 +38,7 @@
{
public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
{
- var doubleValue = (double)value;
+ var doubleValue = (double) value;
if (destinationType == typeof(string))
{
if (double.IsNaN(doubleValue))
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/FailureMechanismSectionResultNoValueRoundedDoubleConverter.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/FailureMechanismSectionResultNoValueRoundedDoubleConverter.cs (.../FailureMechanismSectionResultNoValueRoundedDoubleConverter.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/FailureMechanismSectionResultNoValueRoundedDoubleConverter.cs (.../FailureMechanismSectionResultNoValueRoundedDoubleConverter.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -22,10 +22,8 @@
using System;
using System.ComponentModel;
using System.Globalization;
-
using Core.Common.Base.Data;
using Core.Common.Base.TypeConverters;
-
using Ringtoets.Common.Forms.Properties;
namespace Ringtoets.Common.Forms.TypeConverters
@@ -44,15 +42,15 @@
{
if (string.IsNullOrWhiteSpace(text) || text.Trim() == Resources.FailureMechanismSectionResult_No_result_dash)
{
- return (RoundedDouble)double.NaN;
+ return (RoundedDouble) double.NaN;
}
}
return base.ConvertFrom(context, culture, value);
}
public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
{
- var roundedDoubleValue = (RoundedDouble)value;
+ var roundedDoubleValue = (RoundedDouble) value;
if (destinationType == typeof(string))
{
if (double.IsNaN(roundedDoubleValue))
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -rfa2a0dff6598123689fc7a69745440215879a243 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision fa2a0dff6598123689fc7a69745440215879a243)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -45,15 +45,6 @@
private IFailureMechanism failureMechanism;
///
- /// Creates a display object for which is added to the
- /// on the .
- ///
- /// The for which to create a
- /// display object.
- /// A display object which can be added as a row to the .
- protected abstract object CreateFailureMechanismSectionResultRow(T sectionResult);
-
- ///
/// Creates a new instance of .
///
protected FailureMechanismResultView()
@@ -107,6 +98,15 @@
protected DataGridViewControl DataGridViewControl { get; private set; }
+ ///
+ /// Creates a display object for which is added to the
+ /// on the .
+ ///
+ /// The for which to create a
+ /// display object.
+ /// A display object which can be added as a row to the .
+ protected abstract object CreateFailureMechanismSectionResultRow(T sectionResult);
+
protected override void Dispose(bool disposing)
{
FailureMechanism = null;
@@ -146,7 +146,7 @@
.Select(CreateFailureMechanismSectionResultRow)
.Where(sr => sr != null)
.ToList()
- );
+ );
}
///
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/AssemblyInfo.cs
===================================================================
diff -u -r2c6171c45fe80090abcff004a03b8023196a7fe7 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 2c6171c45fe80090abcff004a03b8023196a7fe7)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -24,4 +24,4 @@
[assembly: AssemblyTitle("Ringtoets.Common.IO")]
[assembly: AssemblyProduct("Ringtoets.Common.IO")]
-[assembly: Guid("a5cefa3a-677c-4bd0-85a7-08657cfe6c70")]
+[assembly: Guid("a5cefa3a-677c-4bd0-85a7-08657cfe6c70")]
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs
===================================================================
diff -u -r7fcd0c3e627c8a69c3b4618c09782321a5b78c2e -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision 7fcd0c3e627c8a69c3b4618c09782321a5b78c2e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -32,7 +32,6 @@
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.IO.Properties;
using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsDataResources = Ringtoets.Common.Data.Properties.Resources;
@@ -91,7 +90,7 @@
bool clearReferenceLineDependentData = false;
- var importTarget = (ReferenceLineContext)targetItem;
+ var importTarget = (ReferenceLineContext) targetItem;
if (importTarget.WrappedData.ReferenceLine != null)
{
clearReferenceLineDependentData = ConfirmImportOfReferenceLineToClearReferenceLineDependentData(importTarget.WrappedData);
@@ -103,7 +102,7 @@
return false;
}
- NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Reading_referenceline,
+ NotifyProgress(RingtoetsCommonIOResources.ReferenceLineImporter_ProgressText_Reading_referenceline,
1, clearReferenceLineDependentData ? 4 : 2);
ReadResult readResult = ReadReferenceLine(filePath);
if (readResult.CriticalErrorOccurred)
@@ -133,7 +132,7 @@
{
var clearReferenceLineDependentData = false;
- DialogResult result = MessageBox.Show(Resources.ReferenceLineImporter_ConfirmImport_Confirm_referenceline_import_which_clears_data_when_performed,
+ DialogResult result = MessageBox.Show(RingtoetsCommonIOResources.ReferenceLineImporter_ConfirmImport_Confirm_referenceline_import_which_clears_data_when_performed,
CoreCommonBaseResources.Confirm,
MessageBoxButtons.OKCancel);
if (result == DialogResult.Cancel)
@@ -153,7 +152,7 @@
private static void HandleUserCancellingImport()
{
- log.Info(Resources.ReferenceLineImporter_ProgressText_Import_cancelled_no_data_read);
+ log.Info(RingtoetsCommonIOResources.ReferenceLineImporter_ProgressText_Import_cancelled_no_data_read);
}
private ReadResult ReadReferenceLine(string filePath)
@@ -180,15 +179,15 @@
private static ReadResult HandleCriticalFileReadError(Exception e)
{
- var errorMessage = string.Format(Resources.ReferenceLineImporter_HandleCriticalFileReadError_Error_0_no_referenceline_imported,
+ var errorMessage = string.Format(RingtoetsCommonIOResources.ReferenceLineImporter_HandleCriticalFileReadError_Error_0_no_referenceline_imported,
e.Message);
log.Error(errorMessage);
return new ReadResult(true);
}
private void AddReferenceLineToDataModel(IAssessmentSection assessmentSection, ReferenceLine importedReferenceLine, bool clearReferenceLineDependentData)
{
- NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Adding_imported_referenceline_to_assessmentsection,
+ NotifyProgress(RingtoetsCommonIOResources.ReferenceLineImporter_ProgressText_Adding_imported_referenceline_to_assessmentsection,
2, clearReferenceLineDependentData ? 4 : 2);
assessmentSection.ReferenceLine = importedReferenceLine;
@@ -200,14 +199,14 @@
private void ClearReferenceLineDependentData(IAssessmentSection assessmentSection)
{
- NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Removing_calculation_output_and_failure_mechanism_sections,
+ NotifyProgress(RingtoetsCommonIOResources.ReferenceLineImporter_ProgressText_Removing_calculation_output_and_failure_mechanism_sections,
3, 4);
foreach (var failureMechanism in assessmentSection.GetFailureMechanisms())
{
ClearCalculationOutput(failureMechanism);
ClearFailureMechanismSections(failureMechanism);
}
- NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Removing_hydraulic_boundary_output,
+ NotifyProgress(RingtoetsCommonIOResources.ReferenceLineImporter_ProgressText_Removing_hydraulic_boundary_output,
4, 4);
ClearHydraulicBoundaryOutput();
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -24,16 +24,12 @@
using System.IO;
using System.Linq;
using System.Security;
-
using Core.Common.IO.Exceptions;
using Core.Common.Utils.Builders;
using Core.Common.Utils.Properties;
-
using log4net;
-
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.IO.Exceptions;
-
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs
===================================================================
diff -u -r58e275211395fc690df2706ccdaff082ecf7b544 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision 58e275211395fc690df2706ccdaff082ecf7b544)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -22,7 +22,6 @@
using System;
using System.IO;
using System.Linq;
-
using Core.Common.Base.Geometry;
using Core.Common.IO.Exceptions;
using Core.Common.Utils;
Index: Ringtoets/Common/src/Ringtoets.Common.Service/CalculationServiceHelper.cs
===================================================================
diff -u -r022b272652639afd88cf47a8745eaa65327908e4 -rcf2dc4330cecec3b8c8acae9e195280323fc2a50
--- Ringtoets/Common/src/Ringtoets.Common.Service/CalculationServiceHelper.cs (.../CalculationServiceHelper.cs) (revision 022b272652639afd88cf47a8745eaa65327908e4)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/CalculationServiceHelper.cs (.../CalculationServiceHelper.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50)
@@ -109,7 +109,7 @@
public static void LogValidationBeginTime(string name)
{
log.Info(string.Format(Resources.Validation_Subject_0_started_Time_1_,
- name, DateTimeService.CurrentTimeAsString));
+ name, DateTimeService.CurrentTimeAsString));
}
///
@@ -119,7 +119,7 @@
public static void LogValidationEndTime(string name)
{
log.Info(string.Format(Resources.Validation_Subject_0_ended_Time_1_,
- name, DateTimeService.CurrentTimeAsString));
+ name, DateTimeService.CurrentTimeAsString));
}
///
@@ -129,7 +129,7 @@
public static void LogCalculationBeginTime(string name)
{
log.Info(string.Format(Resources.Calculation_Subject_0_started_Time_1_,
- name, DateTimeService.CurrentTimeAsString));
+ name, DateTimeService.CurrentTimeAsString));
}
///
@@ -139,7 +139,7 @@
public static void LogCalculationEndTime(string name)
{
log.Info(string.Format(Resources.Calculation_Subject_0_ended_Time_1_,
- name, DateTimeService.CurrentTimeAsString));
+ name, DateTimeService.CurrentTimeAsString));
}
}
}
\ No newline at end of file