Mercurial > dive4elements > river
changeset 837:29966a53cfeb
Datacage: Use 'ids' instead of 'num' in user specific part, too.
flys-client/trunk@2553 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Wed, 24 Aug 2011 10:58:15 +0000 |
| parents | 0fe456332785 |
| children | a5e96a36478c |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java flys-client/src/main/java/de/intevation/flys/client/shared/model/ToLoad.java |
| diffstat | 4 files changed, 19 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Wed Aug 24 10:35:38 2011 +0000 +++ b/flys-client/ChangeLog Wed Aug 24 10:58:15 2011 +0000 @@ -1,3 +1,10 @@ +2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/client/shared/model/ToLoad.java, + src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java: + Use "ids" instead of "num". + 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Wed Aug 24 10:35:38 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Wed Aug 24 10:58:15 2011 +0000 @@ -177,9 +177,9 @@ String artifact = node.getAttribute("artifact-id"); String out = node.getAttribute("out"); String name = node.getName(); - String num = node.getAttribute("num"); + String ids = node.getAttribute("ids"); - toLoad.add(artifact, factory, out, name, num); + toLoad.add(artifact, factory, out, name, ids); } TreeNode [] children = tree.getChildren(node); if (children != null) {
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java Wed Aug 24 10:35:38 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetFilter.java Wed Aug 24 10:58:15 2011 +0000 @@ -6,14 +6,14 @@ implements Serializable { protected String name; - protected String num; + protected String ids; public FacetFilter() { } - public FacetFilter(String name, String num) { + public FacetFilter(String name, String ids) { this.name = name; - this.num = num; + this.ids = ids; } public String getName() { @@ -24,12 +24,12 @@ this.name = name; } - public String getNum() { - return num; + public String getIds() { + return ids; } - public void setNum(String num) { - this.num = num; + public void setIds(String ids) { + this.ids = ids; } protected static boolean equals(String a, String b) { @@ -44,7 +44,7 @@ return false; } FacetFilter o = (FacetFilter)other; - return equals(o.name, name) && equals(o.num, num); + return equals(o.name, name) && equals(o.ids, ids); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/ToLoad.java Wed Aug 24 10:35:38 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/ToLoad.java Wed Aug 24 10:58:15 2011 +0000 @@ -28,7 +28,7 @@ String factory, String out, String name, - String num + String ids ) { if (artifactName == null) { artifactName = uniqueKey(artifacts); @@ -47,7 +47,7 @@ artifact.put(factory, filter); } - filter.add(out, name, num); + filter.add(out, name, ids); } public boolean isEmpty() {