Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -89,10 +89,8 @@
entity.StochasticSoilProfileEntity = registry.Get(inputParameters.StochasticSoilProfile);
}
- double tempQualifier = inputParameters.ExitPointL.Value;
- entity.ExitPointL = tempQualifier.ToNaNAsNull();
- double tempQualifier1 = inputParameters.EntryPointL.Value;
- entity.EntryPointL = tempQualifier1.ToNaNAsNull();
+ entity.ExitPointL = inputParameters.ExitPointL.Value.ToNaNAsNull();
+ entity.EntryPointL = inputParameters.EntryPointL.Value.ToNaNAsNull();
entity.PhreaticLevelExitMean = inputParameters.PhreaticLevelExit.Mean.ToNaNAsNull();
entity.PhreaticLevelExitStandardDeviation = inputParameters.PhreaticLevelExit.StandardDeviation.ToNaNAsNull();
Index: Core/Common/src/Core.Common.IO/Readers/ReadResult.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Core/Common/src/Core.Common.IO/Readers/ReadResult.cs (.../ReadResult.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Core/Common/src/Core.Common.IO/Readers/ReadResult.cs (.../ReadResult.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -35,21 +35,21 @@
/// is set to .
///
/// value indicating whether an error has occurred while collecting
- /// the import items for this .
+ /// the items for this .
public ReadResult(bool errorOccurred)
{
CriticalErrorOccurred = errorOccurred;
Items = new T[0];
}
///
- /// Gets or sets the of items that were read.
+ /// Gets or sets the of items that were read.
///
public ICollection Items { get; set; }
///
- /// Gets or sets the representing whether an critical error has occurred during
- /// import.
+ /// Gets the representing whether an critical error has occurred during
+ /// read.
///
public bool CriticalErrorOccurred { get; }
}
Index: Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -95,10 +95,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs (.../ClosingStructuresContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs (.../ClosingStructuresContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -121,10 +121,10 @@
ImportInfo importInfo = GetImportInfo(plugin);
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -98,7 +98,7 @@
return false;
}
- NotifyProgress(Resources.Importer_ProgressText_Adding_imported_data_to_DataModel, 3, 3);
+ NotifyProgress(Resources.Importer_ProgressText_Adding_imported_data_to_data_model, 3, 3);
AddImportedDataToModel(readFailureMechanismSections);
return true;
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -81,7 +81,7 @@
return false;
}
- NotifyProgress(Resources.Importer_ProgressText_Adding_imported_data_to_DataModel, 1, 1);
+ NotifyProgress(Resources.Importer_ProgressText_Adding_imported_data_to_data_model, 1, 1);
CreateProfiles(importDikeProfilesResult, importDikeProfileDataResult);
return true;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -79,7 +79,7 @@
return false;
}
- NotifyProgress(Resources.Importer_ProgressText_Adding_imported_data_to_DataModel, 1, 1);
+ NotifyProgress(Resources.Importer_ProgressText_Adding_imported_data_to_data_model, 1, 1);
CreateStructures(importStructureLocationsResult, importStructureParameterRowsDataResult);
return true;
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r0fbb881c5c82f540f01772234b3c1faadfab07f9 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -676,9 +676,9 @@
///
/// Looks up a localized string similar to Geïmporteerde data toevoegen aan het toetsspoor..
///
- public static string Importer_ProgressText_Adding_imported_data_to_DataModel {
+ public static string Importer_ProgressText_Adding_imported_data_to_data_model {
get {
- return ResourceManager.GetString("Importer_ProgressText_Adding_imported_data_to_DataModel", resourceCulture);
+ return ResourceManager.GetString("Importer_ProgressText_Adding_imported_data_to_data_model", resourceCulture);
}
}
@@ -971,14 +971,14 @@
}
///
- /// Looks up a localized string similar to BEGIN TRANSACTION;
- ///CREATE TABLE "TimeIntegrationSettings" (
- /// "LocationID" INTEGER NOT NULL,
- /// "CalculationTypeID" INTEGER NOT NULL,
- /// "TimeIntegrationSchemeID" INTEGER NOT NULL,
- /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"),
- /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION
- ///);
+ /// Looks up a localized string similar to BEGIN TRANSACTION;
+ ///CREATE TABLE "TimeIntegrationSettings" (
+ /// "LocationID" INTEGER NOT NULL,
+ /// "CalculationTypeID" INTEGER NOT NULL,
+ /// "TimeIntegrationSchemeID" INTEGER NOT NULL,
+ /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"),
+ /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION
+ ///);
///CREATE TABLE "Numeri [rest of string was truncated]";.
///
public static string settings_schema {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -r0765637cd19a665cdd0ce28add4fc06499adc6b3 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 0765637cd19a665cdd0ce28add4fc06499adc6b3)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -498,7 +498,7 @@
De opgetelde lengte van de vakken moet overeenkomen met de trajectlengte.
-
+
Geïmporteerde data toevoegen aan het toetsspoor.
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -149,7 +149,7 @@
private void AddReferenceLineToDataModel(ReferenceLine importedReferenceLine, bool clearReferenceLineDependentData)
{
- NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_DataModel,
+ NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_data_model,
2, clearReferenceLineDependentData ? 3 : 2);
if (clearReferenceLineDependentData)
{
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs (.../DikeProfileDataReaderTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs (.../DikeProfileDataReaderTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -48,7 +48,7 @@
}
[Test]
- public void Constructor_EmptyAcceptedIds_successfullyInitialzed()
+ public void Constructor_EmptyAcceptedIds_SuccessfullyInitialzed()
{
// Call
TestDelegate call = () => new DikeProfileDataReader(new string[0]);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs (.../HeightStructuresContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs (.../HeightStructuresContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -121,10 +121,10 @@
ImportInfo importInfo = GetImportInfo(plugin);
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -175,10 +175,10 @@
ImportInfo importInfo = GetImportInfo(plugin);
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs (.../FailureMechanismSectionsContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs (.../FailureMechanismSectionsContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -128,10 +128,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs (.../ForeshoreProfilesContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs (.../ForeshoreProfilesContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -179,10 +179,10 @@
ImportInfo importInfo = GetImportInfo(plugin);
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs (.../ReferenceLineContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs (.../ReferenceLineContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -110,10 +110,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -75,7 +75,7 @@
throw new ArgumentNullException(nameof(failureMechanism));
}
this.hydraulicBoundaryLocations = hydraulicBoundaryLocations;
- this.failureMechanism = failureMechanism;
+ this.failureMechanism = failureMechanism;
}
protected override void LogImportCanceledMessage()
@@ -111,7 +111,7 @@
}
}
- NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_DataModel, 3, 3);
+ NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_data_model, 3, 3);
AddItemsToModel(validCalculationItems);
return true;
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -140,7 +140,7 @@
StochasticSoilModel[] importedModels = importStochasticSoilModelResult.Items.ToArray();
foreach (StochasticSoilModel importedModel in importedModels)
{
- NotifyProgress(RingtoestCommonIOResources.Importer_ProgressText_Adding_imported_data_to_DataModel, currentStep, importedModels.Length);
+ NotifyProgress(RingtoestCommonIOResources.Importer_ProgressText_Adding_imported_data_to_data_model, currentStep, importedModels.Length);
if (ValidateStochasticSoilModel(importedModel))
{
yield return importedModel;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -130,13 +130,13 @@
private IEnumerable ProcessImportedDataToModel(ICollection readSurfaceLines,
ICollection readCharacteristicPointsLocations)
{
- NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_DataModel, 0, readSurfaceLines.Count);
+ NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_data_model, 0, readSurfaceLines.Count);
List readCharacteristicPointsLocationNames = readCharacteristicPointsLocations.Select(cpl => cpl.Name).ToList();
int surfaceLineNumber = 1;
foreach (var readSurfaceLine in readSurfaceLines)
{
- NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_DataModel,
+ NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_data_model,
surfaceLineNumber++, readSurfaceLines.Count);
if (Canceled)
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs
===================================================================
diff -u -rf0546eef016ca191ca0958e00cfed380f682c80d -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -338,7 +338,7 @@
calculationGroup,
new[]
{
- new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20),
+ new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20)
},
new PipingFailureMechanism());
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs (.../PipingCalculationGroupContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs (.../PipingCalculationGroupContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -91,10 +91,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Ringtoets berekeningenconfiguratie (*.xml)|*.xml", fileFilter.Filter);
+ Assert.AreEqual("Ringtoets berekeningenconfiguratie (*.xml)|*.xml", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -r583456a0f5395189a54a8cedf4e4a7b40945d990 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision 583456a0f5395189a54a8cedf4e4a7b40945d990)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -133,10 +133,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Profielschematisaties Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter);
+ Assert.AreEqual("Profielschematisaties Kommagescheiden bestand (*.csv)|*.csv", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -131,10 +131,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("D-Soil Model bestand (*.soil)|*.soil", fileFilter.Filter);
+ Assert.AreEqual("D-Soil Model bestand (*.soil)|*.soil", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -132,10 +132,10 @@
public void FileFilterGenerator_Always_ReturnExpectedFileFilter()
{
// Call
- FileFilterGenerator fileFilter = updateInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = updateInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("D-Soil Model bestand (*.soil)|*.soil", fileFilter.Filter);
+ Assert.AreEqual("D-Soil Model bestand (*.soil)|*.soil", fileFilterGenerator.Filter);
}
[Test]
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs
===================================================================
diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rda6c157314d3df1c278d58cc444c7754a79dc656
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs (.../StabilityPointStructuresContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs (.../StabilityPointStructuresContextImportInfoTest.cs) (revision da6c157314d3df1c278d58cc444c7754a79dc656)
@@ -124,10 +124,10 @@
ImportInfo importInfo = GetImportInfo(plugin);
// Call
- FileFilterGenerator fileFilter = importInfo.FileFilterGenerator;
+ FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator;
// Assert
- Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter);
+ Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter);
}
}