diff gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java @ 9523:d421c2bf0195

Allow to edit colors in vegetation zones
author gernotbelger
date Mon, 01 Oct 2018 17:08:50 +0200
parents 853f2dafc16e
children
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java	Mon Oct 01 16:37:12 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java	Mon Oct 01 17:08:50 2018 +0200
@@ -7,7 +7,6 @@
  * and comes with ABSOLUTELY NO WARRANTY! Check out the
  * documentation coming with Dive4Elements River for details.
  */
-
 package org.dive4elements.river.client.shared.model;
 
 import java.util.ArrayList;
@@ -21,13 +20,17 @@
 public class VegetationZoneServerClientXChange implements Comparable<VegetationZoneServerClientXChange> {
 
     // IMMER ABGLEICHEN MIT VegetationZoneServerClientXChange.class IM SERVER
-    public static final boolean HAS_COLORS_EDITABLE = false;
 
     private static final String TABLE_CELL_SEPARATOR = "TABLE_CELL_SEPARATOR";
+
     private static final String TABLE_ROW_SEPARATOR = "TABLE_ROW_SEPARATOR";
+
     private final String zoneName;
+
     private final int min_day_overflow;
+
     private final int max_day_overflow;
+
     private final String hexColor;
 
     public static List<VegetationZoneServerClientXChange> parse(final String zonesRaw) {
@@ -78,10 +81,12 @@
 
     public String getHexColor() {
         try {
-            final int test = Integer.decode(this.hexColor);
+            // REMARK: only return valid colors
+            Integer.decode(this.hexColor);
             return this.hexColor;
         }
         catch (final NumberFormatException e) {
+            e.printStackTrace();
             return "#ffffff";
         }
     }
@@ -90,22 +95,6 @@
         return this.min_day_overflow;
     }
 
-    public static final List<VegetationZoneServerClientXChange> getStandardList() {
-
-        final List<VegetationZoneServerClientXChange> list = new ArrayList<VegetationZoneServerClientXChange>();
-        list.add(new VegetationZoneServerClientXChange("Zonaler Wald", 0, 5, "#336600"));
-        list.add(new VegetationZoneServerClientXChange("Hartholzaue, trocken", 6, 40, "#00cc00"));
-        list.add(new VegetationZoneServerClientXChange("Hartholzaue, feucht", 41, 80, "#66ff33"));
-        list.add(new VegetationZoneServerClientXChange("Silberweidenwald", 81, 140, "#008080"));
-        list.add(new VegetationZoneServerClientXChange("Weidengebüsch", 141, 200, "#33cccc"));
-        list.add(new VegetationZoneServerClientXChange("Uferröhricht", 201, 260, "#ffa8ff"));
-        list.add(new VegetationZoneServerClientXChange("Uferpioniere", 261, 320, "#ff0000"));
-        list.add(new VegetationZoneServerClientXChange("Vegetationslos", 321, 364, "#b2b2b2"));
-        list.add(new VegetationZoneServerClientXChange("Wasserfläche", 365, 365, "#0066ff"));
-
-        return list;
-    }
-
     public static final String parseListToDataString(final List<VegetationZoneServerClientXChange> list) {
 
         java.util.Collections.sort(list);
@@ -178,7 +167,6 @@
 
         final int upper = getUpperFromTo();
         final int lower = getLowerFromTo();
-        // final int otherSchwerpunkt = (otherLower + otherUpper) / 2;
         if ((otherUpper <= upper && otherUpper > lower)) {
             return true;
         } else if (otherLower >= lower && otherLower < upper) {
@@ -196,5 +184,4 @@
     public Integer getUpperFromTo() {
         return this.min_day_overflow > this.max_day_overflow ? this.min_day_overflow : this.max_day_overflow;// Math. is forbidden :-(
     }
-
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org