changeset 2403:177b0c91928d

'Bezugslinienverfahren': Improve the error messages even more. flys-artifacts/trunk@4030 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 10 Feb 2012 11:28:43 +0000 (2012-02-10)
parents c5e4a2d67631
children 750cdcccb39c
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties
diffstat 6 files changed, 20 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Feb 10 11:21:35 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Feb 10 11:28:43 2012 +0000
@@ -1,3 +1,13 @@
+2012-02-10  Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java:
+	  Improved error messsages even more.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties: Adjusted messages.
+
 2012-02-10  Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Fri Feb 10 11:21:35 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Fri Feb 10 11:28:43 2012 +0000
@@ -987,7 +987,7 @@
                 w1 = qW1.value(q1);
             }
             catch (ArgumentOutsideDomainException aode) {
-                err.error(km1, "w.w.wkm1.failed", p);
+                err.error(km1, "w.w.wkm1.failed", q1, p);
                 continue;
             }
 
@@ -1005,7 +1005,7 @@
                 w2 = qW2.value(q2);
             }
             catch (ArgumentOutsideDomainException aode) {
-                err.error(km2, "w.w.wkm2.failed", p);
+                err.error(km2, "w.w.wkm2.failed", q2, p);
                 continue;
             }
 
--- a/flys-artifacts/src/main/resources/messages.properties	Fri Feb 10 11:21:35 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Fri Feb 10 11:28:43 2012 +0000
@@ -180,9 +180,9 @@
 cannot.create.index.q.relation = Cannot create index/Q relation.
 
 w.w.qkm1.failed = Calculating Q for WST index {0,number,#.##} failed.
-w.w.wkm1.failed = Calculating W for WST index {0,number,#.##} failed.
+w.w.wkm1.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 w.w.qkm2.failed = Calculating Q for WST index {0,number,#.##} failed.
-w.w.wkm2.failed = Calculating W for WST index {0,number,#.##} failed.
+w.w.wkm2.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 
 cannot.find.hist.q.for.w = Cannot find Q for W = {0,number,#.##} in timerange {1, date} - {2, date}
 cannot.find.hist.q.tables = Cannot find Discharge Tables for given timerange.
--- a/flys-artifacts/src/main/resources/messages_de.properties	Fri Feb 10 11:21:35 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Fri Feb 10 11:28:43 2012 +0000
@@ -180,9 +180,9 @@
 cannot.create.index.q.relation = Spaltenindex/Q-Beziehung konnte nicht erstellt werden.
 
 w.w.qkm1.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen.
-w.w.wkm1.failed = Berechnung von W f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen.
+w.w.wkm1.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen.
 w.w.qkm2.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. 
-w.w.wkm2.failed = Berechnung von W f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. 
+w.w.wkm2.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen. 
 
 cannot.find.hist.q.for.w = Konnte zu W = {0,number,#.##} im Zeitraum ({1,date} - {2,date}) kein Abfluss ermitteln.
 cannot.find.hist.q.tables = Konnte f\u00fcr den angegebenen Zeitraum keine Abflusstafeln finden.
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Feb 10 11:21:35 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Feb 10 11:28:43 2012 +0000
@@ -180,9 +180,9 @@
 cannot.create.index.q.relation = Spaltenindex/Q-Beziehung konnte nicht erstellt werden.
 
 w.w.qkm1.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen.
-w.w.wkm1.failed = Berechnung von W f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen.
+w.w.wkm1.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen.
 w.w.qkm2.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. 
-w.w.wkm2.failed = Berechnung von W f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. 
+w.w.wkm2.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen. 
 
 cannot.find.hist.q.for.w = Konnte zu W = {0,number,#.##} im Zeitraum ({1,date} - {2,date}) kein Abfluss ermitteln.
 cannot.find.hist.q.tables = Konnte f\u00fcr den angegebenen Zeitraum keine Abflusstafeln finden.
--- a/flys-artifacts/src/main/resources/messages_en.properties	Fri Feb 10 11:21:35 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Fri Feb 10 11:28:43 2012 +0000
@@ -176,9 +176,9 @@
 cannot.create.index.q.relation = Cannot create index/Q relation.
 
 w.w.qkm1.failed = Calculating Q for WST index {0,number,#.##} failed.
-w.w.wkm1.failed = Calculating W for WST index {0,number,#.##} failed.
+w.w.wkm1.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 w.w.qkm2.failed = Calculating Q for WST index {0,number,#.##} failed.
-w.w.wkm2.failed = Calculating W for WST index {0,number,#.##} failed.
+w.w.wkm2.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 
 cannot.find.hist.q.for.w = Cannot find Q for W = {0,number,#.##} in timerange {1, date} - {2, date}
 cannot.find.hist.q.tables = Cannot find Discharge Tables for given timerange.

http://dive4elements.wald.intevation.org