# HG changeset patch # User Sascha L. Teichmann # Date 1314182138 0 # Node ID 0fe4563327851581550373e00c625ed00a75c9c0 # Parent c89a42950d11b5b24ad6900a3365e71eecb381b9 Datacage: s/db-ids/ids/g to unify system and user specific loading. flys-client/trunk@2551 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r c89a42950d11 -r 0fe456332785 flys-client/ChangeLog --- a/flys-client/ChangeLog Wed Aug 24 09:26:33 2011 +0000 +++ b/flys-client/ChangeLog Wed Aug 24 10:35:38 2011 +0000 @@ -1,3 +1,10 @@ +2011-08-24 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java, + src/main/java/de/intevation/flys/client/server/CollectionHelper.java: + s/db-ids/ids/g to unify system and user specific loading. + 2011-08-24 Ingo Weinzierl * src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java: diff -r c89a42950d11 -r 0fe456332785 flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java Wed Aug 24 09:26:33 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java Wed Aug 24 10:35:38 2011 +0000 @@ -490,7 +490,7 @@ for (int i = 0; i < num; i++) { Element e = (Element) list.item(i); String factory = e.getAttribute("factory"); - String index = e.getAttribute("db-ids"); + String index = e.getAttribute("ids"); if (factory != null && factory.length() > 0) { rec[i] = new DefaultRecommendation(factory, index); diff -r c89a42950d11 -r 0fe456332785 flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Wed Aug 24 09:26:33 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Wed Aug 24 10:35:38 2011 +0000 @@ -228,7 +228,7 @@ Element recommendation = cr.create("recommendation"); cr.addAttr(recommendation, "factory", r.getFactory(), true); - cr.addAttr(recommendation, "db-ids", r.getIDs(), true); + cr.addAttr(recommendation, "ids", r.getIDs(), true); return recommendation; } diff -r c89a42950d11 -r 0fe456332785 flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java Wed Aug 24 09:26:33 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java Wed Aug 24 10:35:38 2011 +0000 @@ -422,7 +422,7 @@ Element rec = (Element) list.item(i); String factory = rec.getAttributeNS(uri, "factory"); - String dbids = rec.getAttributeNS(uri, "db-ids"); + String dbids = rec.getAttributeNS(uri, "ids"); if (factory != null && factory.length() > 0) { recs.add(new DefaultRecommendation(factory, dbids));