Mercurial > dive4elements > river
changeset 5658:995320711d80
Temporary remove classification from floodmap plane theme editor (#801).
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Thu, 11 Apr 2013 13:58:18 +0200 |
| parents | 41a71071755b |
| children | 47c07faf388a |
| files | flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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? }
--- 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>();