Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs
===================================================================
diff -u -r2ce70de3d6d063317e1ae1088281ded8704975cf -rd8901a860a022433ecff7cd3f98e2b9934a93a42
--- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs (.../HydraulicBoundaryDataHelper.cs) (revision 2ce70de3d6d063317e1ae1088281ded8704975cf)
+++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs (.../HydraulicBoundaryDataHelper.cs) (revision d8901a860a022433ecff7cd3f98e2b9934a93a42)
@@ -29,7 +29,6 @@
using Riskeer.Common.IO.Properties;
using Riskeer.HydraRing.IO.HydraulicBoundaryDatabase;
using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase;
-using HydraRingResources = Riskeer.HydraRing.IO.Properties.Resources;
using CoreCommonUtilResources = Core.Common.Util.Properties.Resources;
namespace Riskeer.Common.IO.HydraRing
@@ -69,7 +68,7 @@
}
catch (PathTooLongException)
{
- return string.Format(CultureInfo.CurrentCulture, HydraRingResources.HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_,
+ return string.Format(CultureInfo.CurrentCulture, Resources.HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_,
hrdFilePath);
}
Index: Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r22d0624d4dacaa53bdfaaf94efb800da0c4919ad -rd8901a860a022433ecff7cd3f98e2b9934a93a42
--- Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 22d0624d4dacaa53bdfaaf94efb800da0c4919ad)
+++ Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d8901a860a022433ecff7cd3f98e2b9934a93a42)
@@ -970,6 +970,15 @@
}
///
+ /// Looks up a localized string similar to Het opgegeven bestandspad ({0}) is niet geldig..
+ ///
+ public static string HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_ {
+ get {
+ return ResourceManager.GetString("HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De bestandsmap waar de preprocessor bestanden opslaat is ongeldig..
///
public static string HydraulicBoundaryDatabaseHelper_ValidatePreprocessorDirectory_Invalid_path {
Index: Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.resx
===================================================================
diff -u -reacef78cbfb9d2d5eb8596da25ebbb52fc1f7d52 -rd8901a860a022433ecff7cd3f98e2b9934a93a42
--- Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision eacef78cbfb9d2d5eb8596da25ebbb52fc1f7d52)
+++ Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision d8901a860a022433ecff7cd3f98e2b9934a93a42)
@@ -852,6 +852,9 @@
De bestandsmap bestaat niet.
+
+ Het opgegeven bestandspad ({0}) is niet geldig.
+
..\Resources\settings-schema-preprocessor.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rd8901a860a022433ecff7cd3f98e2b9934a93a42
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d8901a860a022433ecff7cd3f98e2b9934a93a42)
@@ -57,7 +57,7 @@
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- public static global::System.Resources.ResourceManager ResourceManager {
+ internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Riskeer.HydraRing.IO.Properties.Resources", typeof(Resources).Assembly);
@@ -72,7 +72,7 @@
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- public static global::System.Globalization.CultureInfo Culture {
+ internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -84,25 +84,16 @@
///
/// Looks up a localized string similar to Kon geen locaties verkrijgen van de database..
///
- public static string Error_HydraulicBoundaryLocation_read_from_database {
+ internal static string Error_HydraulicBoundaryLocation_read_from_database {
get {
return ResourceManager.GetString("Error_HydraulicBoundaryLocation_read_from_database", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Het opgegeven bestandspad ({0}) is niet geldig..
- ///
- public static string HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_ {
- get {
- return ResourceManager.GetString("HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database..
///
- public static string HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column {
+ internal static string HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column {
get {
return ResourceManager.GetString("HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column", resourceCulture);
}
@@ -111,7 +102,7 @@
///
/// Looks up a localized string similar to Het bevragen van de database is mislukt..
///
- public static string HydraulicLocationConfigurationDatabaseReader_Critical_Unexpected_Exception {
+ internal static string HydraulicLocationConfigurationDatabaseReader_Critical_Unexpected_Exception {
get {
return ResourceManager.GetString("HydraulicLocationConfigurationDatabaseReader_Critical_Unexpected_Exception", resourceCulture);
}
@@ -120,7 +111,7 @@
///
/// Looks up a localized string similar to Er zijn meerdere resultaten gevonden, wat niet voor zou mogen komen. Neem contact op met de leverancier. Het eerste resultaat zal worden gebruikt..
///
- public static string HydraulicLocationConfigurationDatabaseReader_GetLocationIdFromDatabase_Ambiguous_Row_Found_Take_First {
+ internal static string HydraulicLocationConfigurationDatabaseReader_GetLocationIdFromDatabase_Ambiguous_Row_Found_Take_First {
get {
return ResourceManager.GetString("HydraulicLocationConfigurationDatabaseReader_GetLocationIdFromDatabase_Ambiguous_" +
"Row_Found_Take_First", resourceCulture);
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.resx
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -rd8901a860a022433ecff7cd3f98e2b9934a93a42
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.resx (.../Resources.resx) (revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.resx (.../Resources.resx) (revision d8901a860a022433ecff7cd3f98e2b9934a93a42)
@@ -129,7 +129,4 @@
Het bevragen van de database is mislukt.
-
- Het opgegeven bestandspad ({0}) is niet geldig.
-
\ No newline at end of file