diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java @ 9285:9b16f58c62a7

Small cleanup/renames
author mschaefer
date Mon, 23 Jul 2018 19:18:11 +0200
parents e5367900dd6d
children 7a8b9331a946
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Fri Jul 20 16:03:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Mon Jul 23 19:18:11 2018 +0200
@@ -56,7 +56,7 @@
 
     private static final long serialVersionUID = 1L;
 
-    private final String[] mainvalueLabels;
+    private final String[] waterlevelLabels;
 
     // private final WstInfo wstInfo;
 
@@ -72,7 +72,7 @@
 
     public FloodDurationCalculationResult(final String label, final String[] mainvalueLabels, final Collection<ResultRow> rows) {
         super(label, rows);
-        this.mainvalueLabels = mainvalueLabels;
+        this.waterlevelLabels = mainvalueLabels;
     }
 
     /**
@@ -94,12 +94,12 @@
 
     @Override
     protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
-        if (this.mainvalueLabels.length >= 1) {
+        if (this.waterlevelLabels.length >= 1) {
             // "##METADATEN WASSERSPIEGELLAGE"
             exportContextCSV.writeCSVMetaEntry(SInfoI18NStrings.CSV_META_HEADER_WATERLEVEL);
             for (int i = 1; i <= getWaterlevelCount(); i++) {
                 // "# Bezeichnung der Wasserspiegellage: "
-                final String label = this.getMainValueLabel(i - 1);
+                final String label = this.getWaterlevelLabel(i - 1);
                 exportContextCSV.writeCSVMetaEntry(SInfoI18NStrings.CSV_META_HEADER_WATERLEVEL_NAME, String.format("%d: %s", i, label));
             }
             // "# Bezugspegel: "
@@ -232,12 +232,12 @@
     }
 
     public final int getWaterlevelCount() {
-        return (this.mainvalueLabels != null) ? this.mainvalueLabels.length : 0;
+        return (this.waterlevelLabels != null) ? this.waterlevelLabels.length : 0;
     }
 
-    public String getMainValueLabel(final int j) {
-        if (this.mainvalueLabels != null && j < this.mainvalueLabels.length)
-            return this.mainvalueLabels[j];
+    public String getWaterlevelLabel(final int j) {
+        if (this.waterlevelLabels != null && j < this.waterlevelLabels.length)
+            return this.waterlevelLabels[j];
         return "";
     }
 

http://dive4elements.wald.intevation.org