diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java @ 9429:bd5f5d2220fa

Work on salix cross sections; waterlevels work now with different colors Colors and i10n for all themes.
author gernotbelger
date Fri, 17 Aug 2018 17:48:01 +0200
parents 7b2b086e45f0
children e44c1a8b0c54
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Fri Aug 17 17:48:01 2018 +0200
@@ -30,11 +30,11 @@
 
     private static final long serialVersionUID = 1L;
 
-    private SInfoResultType(final String unit, final String csvHeader) {
+    protected SInfoResultType(final String unit, final String csvHeader) {
         super(unit, csvHeader, csvHeader);
     }
 
-    private SInfoResultType(final String unit, final String csvHeader, final String pdfHeader) {
+    protected SInfoResultType(final String unit, final String csvHeader, final String pdfHeader) {
         super(unit, csvHeader, pdfHeader);
     }
 
@@ -104,55 +104,6 @@
         }
     };
 
-    public static final SInfoResultType waterlevel1 = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.1.w",
-            "sinfo.flood_duration.header.pdf.mainvalue.1.w") {
-        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.getFlowDepth(context);
-        }
-    };
-
-    public static final SInfoResultType waterlevel2 = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.2.w",
-            "sinfo.flood_duration.header.pdf.mainvalue.2.w") {
-        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.getFlowDepth(context);
-        }
-    };
-
-    // public static final SInfoResultType waterlevel3 = new SInfoResultType(null,
-    // "sinfo.flood_duration.header.mainvalue.3.w",
-    // "sinfo.flood_duration.header.pdf.mainvalue.3.w") {
-    // 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.getFlowDepth(context);
-    // }
-    // };
-
     public static final SInfoResultType infrastructuretype = new SInfoResultType(I18NStrings.UNIT_NONE,
             "sinfo.export.flood_duration.csv.header.infrastructure_type", "sinfo.export.flood_duration.pdf.header.infrastructure_type") {
         private static final long serialVersionUID = 1L;

http://dive4elements.wald.intevation.org