Mercurial > dive4elements > river
changeset 872:a7179e3a774e
Suppress the GeoJSON string to be drawn into the static UI.
flys-client/trunk@2693 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 12 Sep 2011 04:55:55 +0000 |
| parents | d08cf5ed1bfc |
| children | 77a549772aa9 |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java flys-client/src/main/java/de/intevation/flys/client/shared/model/DataList.java |
| diffstat | 3 files changed, 34 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Mon Sep 12 04:54:35 2011 +0000 +++ b/flys-client/ChangeLog Mon Sep 12 04:55:55 2011 +0000 @@ -1,3 +1,19 @@ +2011-09-12 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/client/shared/model/DataList.java: Made + the DataList cloneable. + + * src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java: + Remove the data "uesk.barriers" that contains the GeoJSON geometries + from cloned DataList to supress the GeoJSON string in UI. + +2011-09-12 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java, + src/main/java/de/intevation/flys/client/client/ui/TableFilter.java, + src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java: + Removed needless imports. + 2011-09-09 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/shared/model/CalculationMessage.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java Mon Sep 12 04:54:35 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java Mon Sep 12 04:55:55 2011 +0000 @@ -58,7 +58,11 @@ } } - Canvas selectBox = super.create(list); + DataList clone = (DataList) list.clone(); + List<Data> all = clone.getAll(); + all.remove(UESK_BARRIERS); + + Canvas selectBox = super.create(clone); final Config cfg = Config.getInstance(); final String url = cfg.getServerUrl();
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/DataList.java Mon Sep 12 04:54:35 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/DataList.java Mon Sep 12 04:55:55 2011 +0000 @@ -7,7 +7,7 @@ /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ -public class DataList implements Serializable { +public class DataList implements Serializable, Cloneable { /** The list of Data objects managed by this list.*/ protected List<Data> data; @@ -161,5 +161,17 @@ public String getUIProvider() { return uiprovider; } + + + public Object clone() { + DataList clone = new DataList( + this.state, + this.data.size(), + this.uiprovider, + this.label); + clone.data = (List<Data>) ((ArrayList<Data>)data).clone(); + + return clone; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :