Mercurial > dive4elements > river
changeset 1392:baada4879c20
Fix clone of static artifacts for differences.
flys-client/trunk@3225 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 10 Nov 2011 14:04:03 +0000 |
| parents | f554dce42d66 |
| children | ddc927b232ca |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java |
| diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Nov 10 13:59:48 2011 +0000 +++ b/flys-client/ChangeLog Thu Nov 10 14:04:03 2011 +0000 @@ -1,3 +1,10 @@ +2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Fix cloning of static data artifacts, resolved todos. + + * src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java: + Remove temporary hack that depended on dc conf. + 2011-11-10 Raimund Renkert <raimund.renkert@intevation.de> Issue 355.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Thu Nov 10 13:59:48 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Thu Nov 10 14:04:03 2011 +0000 @@ -305,10 +305,7 @@ if(firstR.getIDs() != null) { GWT.log("First IDs: " + firstR.getIDs() + " factory: " + firstR.getFactory()); } - // TODO resolve this hack, fix datacage/recommendation for this case. - if(firstR.getIDs() != null && - firstR.getIDs().startsWith("flood_protection")) - { + if(firstR.getIDs() != null) { // These do not get cloned but loaded ("spawned"). firstR.setFactory("staticwkms"); } @@ -319,9 +316,7 @@ if(secondR.getIDs() != null) { GWT.log("Second IDs: " + secondR.getIDs() + " factory: " + secondR.getFactory()); } - if(secondR.getIDs() != null - && secondR.getIDs().startsWith("flood_protection")) - { + if (secondR.getIDs() != null) { // These do not get cloned but loaded ("spawned"). secondR.setFactory("staticwkms"); }