Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rd585b18f2f4d58d6e64f161a50318116de26fce6 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d585b18f2f4d58d6e64f161a50318116de26fce6)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -817,6 +817,15 @@
}
///
+ /// Looks up a localized string similar to Stochastische ondergrondmodellen.
+ ///
+ public static string StochasticSoilModelCollection_TypeDescriptor {
+ get {
+ return ResourceManager.GetString("StochasticSoilModelCollection_TypeDescriptor", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Kunstwerken.
///
public static string StructureCollection_TypeDescriptor {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -rd585b18f2f4d58d6e64f161a50318116de26fce6 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision d585b18f2f4d58d6e64f161a50318116de26fce6)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -378,4 +378,7 @@
De signaleringswaarde moet gelijk of kleiner zijn dan de ondergrens.
+
+ Stochastische ondergrondmodellen
+
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -rb78437864e9677d66dc309d766b0e706c8af0c1f -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision b78437864e9677d66dc309d766b0e706c8af0c1f)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -146,6 +146,7 @@
+
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporter.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporter.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporter.cs (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -0,0 +1,85 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Common.Base.IO;
+using Ringtoets.Common.Data;
+using Ringtoets.Common.IO.FileImporters.MessageProviders;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+
+namespace Ringtoets.Common.IO.SoilProfile
+{
+ ///
+ /// Imports .soil files (SqlLite database files) created with the D-Soil Model application.
+ ///
+ /// The type of stochastic soil models to import.
+ public class StochasticSoilModelImporter
+ : FileImporterBase> where T
+ : class, IMechanismStochasticSoilModel
+ {
+ private readonly IImporterMessageProvider messageProvider;
+ private readonly IStochasticSoilModelUpdateModelStrategy stochasticSoilModelupdateStrategy;
+ private readonly IStochasticSoilModelTransformer stochasticSoilModeltransformer;
+
+ ///
+ /// Creates a new instance of the class.
+ ///
+ /// The import target.
+ /// The path to the file to import from.
+ /// The message provider to provide messages during importer
+ /// actions.
+ /// The mechanism specific configuration containing all
+ /// necessary stochastic soil model components.
+ /// Thrown when any of the input parameters is null.
+ public StochasticSoilModelImporter(
+ ObservableUniqueItemCollectionWithSourcePath importTarget,
+ string filePath,
+ IImporterMessageProvider messageProvider,
+ StochasticSoilModelImporterConfiguration configuration)
+ : base(filePath, importTarget)
+ {
+ if (messageProvider == null)
+ {
+ throw new ArgumentNullException(nameof(messageProvider));
+ }
+ if (configuration == null)
+ {
+ throw new ArgumentNullException(nameof(configuration));
+ }
+
+ this.messageProvider = messageProvider;
+ stochasticSoilModelupdateStrategy = configuration.UpdateStrategy;
+ stochasticSoilModeltransformer = configuration.Transformer;
+ }
+
+ protected override void LogImportCanceledMessage()
+ {
+ string message = messageProvider.GetCancelledLogMessageText(RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor);
+ Log.Info(message);
+ }
+
+ protected override bool OnImport()
+ {
+ return false;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj
===================================================================
diff -u -rb78437864e9677d66dc309d766b0e706c8af0c1f -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision b78437864e9677d66dc309d766b0e706c8af0c1f)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -128,6 +128,7 @@
+
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -0,0 +1,172 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Common.Base.IO;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data;
+using Ringtoets.Common.IO.FileImporters.MessageProviders;
+using Ringtoets.Common.IO.SoilProfile;
+
+namespace Ringtoets.Common.IO.Test.SoilProfile
+{
+ [TestFixture]
+ public class StochasticSoilModelImporterTest
+ {
+ private MockRepository mocks;
+ private IStochasticSoilModelTransformer transformer;
+
+ [SetUp]
+ public void Setup()
+ {
+ mocks = new MockRepository();
+ transformer = mocks.Stub>();
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void Constructor_ImportTargetNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var messageProvider = mocks.Stub();
+ var updateStrategy = mocks.Stub>();
+ mocks.ReplayAll();
+
+ string filePath = string.Empty;
+ var configuration = new StochasticSoilModelImporterConfiguration(transformer, updateStrategy);
+
+ // Call
+ TestDelegate call = () => new StochasticSoilModelImporter(
+ null,
+ filePath,
+ messageProvider,
+ configuration);
+
+ // Assert
+ string parameter = Assert.Throws(call).ParamName;
+ Assert.AreEqual("importTarget", parameter);
+ }
+
+ [Test]
+ public void Constructor_FilePathNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var messageProvider = mocks.Stub();
+ var updateStrategy = mocks.Stub>();
+ mocks.ReplayAll();
+
+ var collection = new TestStochasticSoilModelCollection();
+ var configuration = new StochasticSoilModelImporterConfiguration(transformer, updateStrategy);
+
+ // Call
+ TestDelegate call = () => new StochasticSoilModelImporter(
+ collection,
+ null,
+ messageProvider,
+ configuration);
+
+ // Assert
+ string parameter = Assert.Throws(call).ParamName;
+ Assert.AreEqual("filePath", parameter);
+ }
+
+ [Test]
+ public void Constructor_MessageProviderNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var updateStrategy = mocks.Stub>();
+ mocks.ReplayAll();
+
+ var collection = new TestStochasticSoilModelCollection();
+ string filePath = string.Empty;
+ var configuration = new StochasticSoilModelImporterConfiguration(transformer, updateStrategy);
+
+ // Call
+ TestDelegate call = () => new StochasticSoilModelImporter(
+ collection,
+ filePath,
+ null,
+ configuration);
+
+ // Assert
+ string parameter = Assert.Throws(call).ParamName;
+ Assert.AreEqual("messageProvider", parameter);
+ }
+
+ [Test]
+ public void Constructor_ConfigurationNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var messageProvider = mocks.Stub();
+ mocks.ReplayAll();
+
+ var collection = new TestStochasticSoilModelCollection();
+ string filePath = string.Empty;
+
+ // Call
+ TestDelegate call = () => new StochasticSoilModelImporter(
+ collection,
+ filePath,
+ messageProvider,
+ null);
+
+ // Assert
+ string parameter = Assert.Throws(call).ParamName;
+ Assert.AreEqual("configuration", parameter);
+ }
+
+ [Test]
+ public void Constructor_ValidArguments_ExpectedValues()
+ {
+ // Setup
+ var messageProvider = mocks.Stub();
+ var updateStrategy = mocks.Stub>();
+ mocks.ReplayAll();
+
+ var collection = new TestStochasticSoilModelCollection();
+ string filePath = string.Empty;
+ var configuration = new StochasticSoilModelImporterConfiguration(transformer, updateStrategy);
+
+ // Call
+ var importer = new StochasticSoilModelImporter(
+ collection,
+ filePath,
+ messageProvider,
+ configuration);
+
+ // Assert
+ Assert.IsInstanceOf>>(importer);
+ }
+
+ private class TestStochasticSoilModelCollection : ObservableUniqueItemCollectionWithSourcePath
+ {
+ public TestStochasticSoilModelCollection()
+ : base(s => s.ToString(), "something", "something else") {}
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r9540d67453c6a1caf5833d64ab651660dce11595 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -109,15 +109,6 @@
}
///
- /// Looks up a localized string similar to Stochastische ondergrondmodellen.
- ///
- public static string StochasticSoilModelCollection_TypeDescriptor {
- get {
- return ResourceManager.GetString("StochasticSoilModelCollection_TypeDescriptor", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen..
///
public static string StochasticSoilProfile_Probability_Should_be_in_range_0_ {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx
===================================================================
diff -u -r9540d67453c6a1caf5833d64ab651660dce11595 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 9540d67453c6a1caf5833d64ab651660dce11595)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -123,9 +123,6 @@
Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen.
-
- Stochastische ondergrondmodellen
-
naam
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModelCollection.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -21,6 +21,7 @@
using Core.Common.Base;
using Ringtoets.MacroStabilityInwards.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.MacroStabilityInwards.Data
{
@@ -31,7 +32,7 @@
public class StochasticSoilModelCollection : ObservableUniqueItemCollectionWithSourcePath
{
public StochasticSoilModelCollection() : base(model => model.Name,
- Resources.StochasticSoilModelCollection_TypeDescriptor,
+ RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Resources.UniqueFeature_Name_FeatureDescription) {}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs
===================================================================
diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs (.../MacroStabilityInwardsMapDataFactory.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs (.../MacroStabilityInwardsMapDataFactory.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -24,7 +24,6 @@
using Core.Components.Gis.Style;
using Ringtoets.MacroStabilityInwards.Data;
using Ringtoets.MacroStabilityInwards.Primitives;
-using DataResources = Ringtoets.MacroStabilityInwards.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
@@ -59,7 +58,7 @@
/// The created .
public static MapLineData CreateStochasticSoilModelsMapData()
{
- return new MapLineData(DataResources.StochasticSoilModelCollection_TypeDescriptor,
+ return new MapLineData(RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
new LineStyle
{
Color = Color.FromArgb(70, Color.SaddleBrown),
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/StochasticSoilModelImporter.cs
===================================================================
diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -33,8 +33,8 @@
using Ringtoets.MacroStabilityInwards.IO.Properties;
using Ringtoets.MacroStabilityInwards.IO.SoilProfile;
using Ringtoets.MacroStabilityInwards.Primitives;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
-using RingtoetsMacroStabilityInwardsDataResources = Ringtoets.MacroStabilityInwards.Data.Properties.Resources;
namespace Ringtoets.MacroStabilityInwards.IO.Importers
{
@@ -118,7 +118,7 @@
catch (UpdateDataException e)
{
string message = string.Format(messageProvider.GetUpdateDataFailedLogMessageText(
- RingtoetsMacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor),
+ RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor),
e.Message);
Log.Error(message, e);
return false;
@@ -128,7 +128,7 @@
protected override void LogImportCanceledMessage()
{
- string message = messageProvider.GetCancelledLogMessageText(RingtoetsMacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor);
+ string message = messageProvider.GetCancelledLogMessageText(RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor);
Log.Info(message);
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -54,7 +54,6 @@
using Ringtoets.MacroStabilityInwards.Service;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using MacroStabilityInwardsDataResources = Ringtoets.MacroStabilityInwards.Data.Properties.Resources;
using MacroStabilityInwardsFormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources;
namespace Ringtoets.MacroStabilityInwards.Plugin
@@ -107,7 +106,7 @@
yield return new ImportInfo
{
- Name = MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ Name = RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
Image = MacroStabilityInwardsFormsResources.SoilProfileIcon,
FileFilterGenerator = StochasticSoilModelFileFilter,
@@ -158,7 +157,7 @@
yield return new UpdateInfo
{
- Name = MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ Name = RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
Image = MacroStabilityInwardsFormsResources.SoilProfileIcon,
FileFilterGenerator = StochasticSoilModelFileFilter,
@@ -286,7 +285,7 @@
yield return new TreeNodeInfo
{
- Text = stochasticSoilModelContext => MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ Text = stochasticSoilModelContext => RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Image = stochasticSoilModelContext => RingtoetsCommonFormsResources.GeneralFolderIcon,
ForeColor = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Any()
? Color.FromKnownColor(KnownColor.ControlText)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -136,15 +136,6 @@
}
///
- /// Looks up a localized string similar to Stochastische ondergrondmodellen.
- ///
- public static string StochasticSoilModelCollection_TypeDescriptor {
- get {
- return ResourceManager.GetString("StochasticSoilModelCollection_TypeDescriptor", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen..
///
public static string StochasticSoilProfile_Probability_Should_be_in_range_0_ {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx
===================================================================
diff -u -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -138,9 +138,6 @@
Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen.
-
- Stochastische ondergrondmodellen
-
naam
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -21,6 +21,7 @@
using Core.Common.Base;
using Ringtoets.Piping.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.Piping.Data
{
@@ -31,7 +32,7 @@
public class StochasticSoilModelCollection : ObservableUniqueItemCollectionWithSourcePath
{
public StochasticSoilModelCollection() : base(model => model.Name,
- Resources.StochasticSoilModelCollection_TypeDescriptor,
+ RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Resources.UniqueFeature_Name_FeatureDescription) {}
}
}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFactory.cs
===================================================================
diff -u -rd6fe8399e8398224cf1bda9259052232d85b85a4 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFactory.cs (.../PipingMapDataFactory.cs) (revision d6fe8399e8398224cf1bda9259052232d85b85a4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFactory.cs (.../PipingMapDataFactory.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -24,7 +24,6 @@
using Core.Components.Gis.Style;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Primitives;
-using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -59,7 +58,7 @@
/// The created .
public static MapLineData CreateStochasticSoilModelsMapData()
{
- return new MapLineData(PipingDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ return new MapLineData(RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
new LineStyle
{
Color = Color.FromArgb(70, Color.SaddleBrown),
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -33,8 +33,8 @@
using Ringtoets.Piping.IO.Properties;
using Ringtoets.Piping.IO.SoilProfile;
using Ringtoets.Piping.Primitives;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
-using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
namespace Ringtoets.Piping.IO.Importers
{
@@ -118,7 +118,7 @@
catch (UpdateDataException e)
{
string message = string.Format(messageProvider.GetUpdateDataFailedLogMessageText(
- RingtoetsPipingDataResources.StochasticSoilModelCollection_TypeDescriptor),
+ RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor),
e.Message);
Log.Error(message, e);
return false;
@@ -128,7 +128,7 @@
protected override void LogImportCanceledMessage()
{
- string message = messageProvider.GetCancelledLogMessageText(RingtoetsPipingDataResources.StochasticSoilModelCollection_TypeDescriptor);
+ string message = messageProvider.GetCancelledLogMessageText(RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor);
Log.Info(message);
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -raa49537188229065df91b1a931f088c32115702a -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision aa49537188229065df91b1a931f088c32115702a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e)
@@ -56,7 +56,6 @@
using Ringtoets.Piping.Service;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
namespace Ringtoets.Piping.Plugin
@@ -109,7 +108,7 @@
yield return new ImportInfo
{
- Name = PipingDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ Name = RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
Image = PipingFormsResources.PipingSoilProfileIcon,
FileFilterGenerator = StochasticSoilModelFileFilter,
@@ -160,7 +159,7 @@
yield return new UpdateInfo
{
- Name = PipingDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ Name = RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
Image = PipingFormsResources.PipingSoilProfileIcon,
FileFilterGenerator = StochasticSoilModelFileFilter,
@@ -285,7 +284,7 @@
yield return new TreeNodeInfo
{
- Text = stochasticSoilModelContext => PipingDataResources.StochasticSoilModelCollection_TypeDescriptor,
+ Text = stochasticSoilModelContext => RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor,
Image = stochasticSoilModelContext => RingtoetsCommonFormsResources.GeneralFolderIcon,
ForeColor = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Any()
? Color.FromKnownColor(KnownColor.ControlText)