diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java @ 9287:6c88ad449c83

Punkt 2.3.8 vom 1. Zwischenrelease
author gernotbelger
date Tue, 24 Jul 2018 10:36:18 +0200
parents 0dcd1cd41915
children 740d65e4aa14
line wrap: on
line diff
--- 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;
 

http://dive4elements.wald.intevation.org