Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Calculation.cs
===================================================================
diff -u -r375 -r376
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Calculation.cs (.../PipingModel2Calculation.cs) (revision 375)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Calculation.cs (.../PipingModel2Calculation.cs) (revision 376)
@@ -1,3 +1,5 @@
+using Deltares.DamPiping.SellmeijerVNKCalculator.Properties;
+
namespace Deltares.DamPiping.SellmeijerVNKCalculator
{
using System;
@@ -313,7 +315,7 @@
}
catch
{
- throw new PipingCalculationException("Error in Piping DLL");
+ throw new PipingCalculationException(Resources.PipingModel2Calculation_CalculateHeadDropPC2_Error_in_Piping_DLL);
}
fCurrentCalculationData.Messages = "";
Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.nl-NL.resx
===================================================================
diff -u
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.nl-NL.resx (revision 0)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.nl-NL.resx (revision 376)
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Er is een fout opgetreden in PipingCalc2.dll
+
+
\ No newline at end of file
Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.resx
===================================================================
diff -u
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.resx (revision 0)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.resx (revision 376)
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 1.3
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Error in Piping DLL
+
+
\ No newline at end of file
Index: dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPiping.SellmeijerVNKCalculatorTests/PipingCalculatorSellmeijerVNKTest.cs
===================================================================
diff -u -r374 -r376
--- dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPiping.SellmeijerVNKCalculatorTests/PipingCalculatorSellmeijerVNKTest.cs (.../PipingCalculatorSellmeijerVNKTest.cs) (revision 374)
+++ dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPiping.SellmeijerVNKCalculatorTests/PipingCalculatorSellmeijerVNKTest.cs (.../PipingCalculatorSellmeijerVNKTest.cs) (revision 376)
@@ -186,5 +186,23 @@
Assert.AreEqual(0.0, safetyFactor, cTolerance);
}
+ [Test]
+ [ExpectedException(typeof(PipingCalculationException), ExpectedMessage = "Er is een fout opgetreden in PipingCalc2.dll")]
+ [SetUICulture("nl-NL")]
+ public void TestLanguageNLThrowsExceptionWhenCalculationFails()
+ {
+ var calculator = new PipingCalculatorSellmeijerVNK();
+ calculator.Calculate();
+ }
+
+ [Test]
+ [ExpectedException(typeof(PipingCalculationException), ExpectedMessage = "Error in Piping DLL")]
+ [SetUICulture("en-US")]
+ public void TestLanguageEnThrowsExceptionWhenCalculationFails()
+ {
+ var calculator = new PipingCalculatorSellmeijerVNK();
+ calculator.Calculate();
+ }
+
}
}
Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.Designer.cs
===================================================================
diff -u
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.Designer.cs (revision 0)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Properties/Resources.Designer.cs (revision 376)
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Deltares.DamPiping.SellmeijerVNKCalculator.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Deltares.DamPiping.SellmeijerVNKCalculator.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Error in Piping DLL.
+ ///
+ internal static string PipingModel2Calculation_CalculateHeadDropPC2_Error_in_Piping_DLL {
+ get {
+ return ResourceManager.GetString("PipingModel2Calculation_CalculateHeadDropPC2_Error_in_Piping_DLL", resourceCulture);
+ }
+ }
+ }
+}
Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Deltares.DamPiping.SellmeijerVNKCalculator.csproj
===================================================================
diff -u -r374 -r376
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Deltares.DamPiping.SellmeijerVNKCalculator.csproj (.../Deltares.DamPiping.SellmeijerVNKCalculator.csproj) (revision 374)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/Deltares.DamPiping.SellmeijerVNKCalculator.csproj (.../Deltares.DamPiping.SellmeijerVNKCalculator.csproj) (revision 376)
@@ -52,12 +52,24 @@
+
+ True
+ True
+ Resources.resx
+
-
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+ Designer
+
+
+
+
PreserveNewest