[PATCH 1 of 2] Punkt 2.3.8 vom 1. Zwischenrelease

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1532421378 -7200
# Node ID 6c88ad449c832b809ae027b040d7f82caf0d43c7
# Parent  bcbae86ce7b3d36ae5684210bf7337b9f8e4d1db
Punkt 2.3.8 vom 1. Zwischenrelease

diff -r bcbae86ce7b3 -r 6c88ad449c83 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Mon Jul 23 19:20:06 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Tue Jul 24 10:36:18 2018 +0200
@@ -279,7 +279,7 @@
         }
     };
     public static final SInfoResultType flowdepthDevelopmentPerYear = new SInfoResultType(I18NStrings.UNIT_CM_A,
-            SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_PER_YEAR_HEADER) {
+            SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_PER_YEAR_HEADER, "sinfo.export.pdf.header.flowdepth.development.per.year") {
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -551,7 +551,7 @@
         }
     };
 
-    public static final SInfoResultType flowdepthDevelopment = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_HEADER,
+    public static final SInfoResultType flowdepthDevelopment = new SInfoResultType(I18NStrings.UNIT_CM, SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_HEADER,
             SInfoI18NStrings.PDF_FLOWDEPTH_DEVELOPMENT_HEADER) {
         private static final long serialVersionUID = 1L;
 
@@ -567,23 +567,8 @@
         }
     };
 
-    public static final SInfoResultType depthDevelopmentPerYear = new SInfoResultType(I18NStrings.UNIT_CM_A,
-            SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_PER_YEAR_HEADER) {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getFlowDepthDevelopmentPerYear(context);
-        }
-    };
-    public static final SInfoResultType waterlevelDifference = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER,
-            "sinfo.export.csv.header.waterlevel.difference") {
+    public static final SInfoResultType waterlevelDifference = new SInfoResultType(I18NStrings.UNIT_CM, SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER,
+            SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER) {
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -597,7 +582,7 @@
             return Formatter.getTkh(context);
         }
     };
-    public static final SInfoResultType bedHeightDifference = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_MEAN_BED_HEIGHT_DIFFERENCE_HEADER,
+    public static final SInfoResultType bedHeightDifference = new SInfoResultType(I18NStrings.UNIT_CM, SInfoI18NStrings.CSV_MEAN_BED_HEIGHT_DIFFERENCE_HEADER,
             "sinfo.export.csv.header.mean_bed_height.difference") {
         private static final long serialVersionUID = 1L;
 
diff -r bcbae86ce7b3 -r 6c88ad449c83 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Mon Jul 23 19:20:06 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Tue Jul 24 10:36:18 2018 +0200
@@ -870,7 +870,7 @@
 state.sinfo.riverside.option3 = Beide Uferseiten
 help.state.sinfo.wspl= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
 
-state.bundu.wst.qs = Eingabe f\u00fcr W/Q Daten
+state.bundu.wst.qs = Eingabe f\u00fcr UD/Q Daten
 state.sinfo.wqinput = Eingabe f\u00fcr W/Q Daten
 state.sinfo.wqinput.option = wqinput-option
 help.state.sinfo.wqinput = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.wqinput
@@ -1041,7 +1041,8 @@
 sinfo.export.csv.header.channel.depth = Solltiefe Fahrrinne
 sinfo.export.csv.header.flowdepth.development = Flie\u00dftiefenentwicklung
 sinfo.export.pdf.header.flowdepth.development = Flie\u00dftiefen-entwicklung
-sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr
+sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenentwicklung pro Jahr
+sinfo.export.pdf.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr
 sinfo.export.csv.header.waterlevel.difference = \u0394WSPL
 sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH
 sinfo.export.csv.header.flowdepth.current = Flie\u00dftiefe h-aktuell
diff -r bcbae86ce7b3 -r 6c88ad449c83 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Mon Jul 23 19:20:06 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Tue Jul 24 10:36:18 2018 +0200
@@ -870,7 +870,7 @@
 state.sinfo.riverside.option3 = Beide Uferseiten
 help.state.sinfo.wspl= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
 
-state.bundu.wst.qs = Eingabe f\u00fcr W/Q Daten
+state.bundu.wst.qs = Eingabe f\u00fcr UD/Q Daten
 state.sinfo.wqinput = Eingabe f\u00fcr W/Q Daten
 state.sinfo.wqinput.option = wqinput-option
 help.state.sinfo.wqinput = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.wqinput
@@ -1041,7 +1041,8 @@
 sinfo.export.csv.header.channel.depth = Solltiefe Fahrrinne
 sinfo.export.pdf.header.flowdepth.development = Flie\u00dftiefen-entwicklung
 sinfo.export.csv.header.flowdepth.development = Flie\u00dftiefenentwicklung
-sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr
+sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenentwicklung pro Jahr
+sinfo.export.pdf.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr
 sinfo.export.csv.header.waterlevel.difference = \u0394WSPL
 sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH
 sinfo.export.csv.header.flowdepth.current = Flie\u00dftiefe h-aktuell