Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r294 -r298
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 294)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 298)
@@ -169,7 +169,6 @@
-
@@ -185,9 +184,6 @@
-
-
-
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/SurfaceLineHeightAdapter.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/SurfaceLineSlopeAdapter.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/SurfaceLineShoulderAdapterTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/SurfaceLineHeightAdapterTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/SurfaceAdapterTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/SurfaceLineSlopeAdapterTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs
===================================================================
diff -u -r236 -r298
--- dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs (.../Scenario.cs) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs (.../Scenario.cs) (revision 298)
@@ -687,7 +687,7 @@
{
if ((defaultUpliftCriterionStability == null) && (ModelFactors.UpliftCriterionStability == null))
{
- throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(typeof(SurfaceLineAdapter), "NoUpliftCriterionForStability"), Location.Name, ToString()));
+ throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString()));
}
return (ModelFactors.UpliftCriterionStability == null ? defaultUpliftCriterionStability.Value
@@ -703,7 +703,7 @@
{
if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping == null))
{
- throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(typeof(SurfaceLineAdapter), "NoUpliftCriterionForPiping"), Location.Name, ToString()));
+ throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString()));
}
return (ModelFactors.UpliftCriterionPiping == null ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping.Value);
}
@@ -717,7 +717,7 @@
{
if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping == null))
{
- throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(typeof(SurfaceLineAdapter), "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
+ throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
}
return (ModelFactors.RequiredSafetyFactorPiping == null ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping.Value);
}
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/SurfaceLineAdapterException.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/SurfaceLineAdapter.cd'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r294 -r298
--- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 294)
+++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 298)
@@ -325,7 +325,6 @@
-
@@ -376,10 +375,6 @@
-
-
-
-
@@ -437,7 +432,6 @@
PreserveNewest
-
Designer
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/SurfaceLineShoulderAdapter.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 298 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/SurfaceLineAdapter.cs'.
Fisheye: No comparison available. Pass `N' to diff?