[Dive4elements-commits] [PATCH] Temporary remove classification from floodmap plane theme editor (#801)

Wald Commits scm-commit at wald.intevation.org
Thu Apr 11 13:58:21 CEST 2013


# HG changeset patch
# User Christian Lins <christian.lins at intevation.de>
# Date 1365681498 -7200
# Node ID 995320711d80fd5f02b2ca7744f9fdb296bf236e
# Parent  41a71071755ba4030954b768e5fe42d40b7b8c29
Temporary remove classification from floodmap plane theme editor (#801).

diff -r 41a71071755b -r 995320711d80 flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java	Thu Apr 11 13:18:00 2013 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java	Thu Apr 11 13:58:18 2013 +0200
@@ -300,7 +300,7 @@
 
 
     public List<String> validate() {
-        return new ArrayList<String>();
+        return new ArrayList<String>(); // FIXME: What's this?
     }
 
 
diff -r 41a71071755b -r 995320711d80 flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Thu Apr 11 13:18:00 2013 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Thu Apr 11 13:58:18 2013 +0200
@@ -2,6 +2,7 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
+
 import com.smartgwt.client.types.Alignment;
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Button;
@@ -327,7 +328,9 @@
                 set.getName(),
                 set.getType(),
                 set.getDefaultValue());
-            vl.addMember(property);
+            if (property != null) {
+                vl.addMember(property);
+            }
         }
 
         // Add settings not in whitelist above.
@@ -345,7 +348,9 @@
                 set.getName(),
                 set.getType(),
                 set.getDefaultValue());
-            vl.addMember(property);
+            if (property != null) {
+                vl.addMember(property);
+            }
         }
 
         return vl;
@@ -434,6 +439,8 @@
                 valueMap.put("20", "20");
                 f.setValueMap(valueMap);
                 f.setValue(value);
+                // FIXME: Make that work again
+                return null;
             }
             else if (name.contains("transparency")) {
                 LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();


More information about the Dive4elements-commits mailing list