Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java @ 624:929137ee8154
ISSUE-62 (part I/II) States are no longer filled with data - if a state needs user input, it needs to query the owner artifact.
flys-artifacts/trunk@1982 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 23 May 2011 15:11:55 +0000 |
| parents | c21fb8de54f8 |
| children | a9af60c84dca |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java Mon May 23 14:32:17 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java Mon May 23 15:11:55 2011 +0000 @@ -1,7 +1,5 @@ package de.intevation.flys.artifacts.states; -import java.util.Map; - import gnu.trove.TDoubleArrayList; import org.apache.log4j.Logger; @@ -203,9 +201,10 @@ { logger.debug("WQSelect.validate"); - Map<String, StateData> data = getData(); + FLYSArtifact flys = (FLYSArtifact) artifact; - String selectionMode = (String) data.get(WQ_SELECTION).getValue(); + StateData data = getData(flys, WQ_SELECTION); + String selectionMode = data != null ? (String) data.getValue() : null; if (selectionMode == null || selectionMode.equals("single")) { return validateSingle(artifact, context); @@ -221,7 +220,10 @@ { logger.debug("WQSelect.validateSingle"); - String tmp = (String) data.get(WQ_SINGLE).getValue(); + FLYSArtifact flys = (FLYSArtifact) artifact; + StateData data = getData(flys, WQ_SINGLE); + + String tmp = data != null ? (String) data.getValue() : null; if (tmp == null || tmp.length() == 0) { throw new IllegalArgumentException("error_empty_state"); @@ -241,7 +243,9 @@ all.sort(); - String mode = (String) data.get(WQ_MODE).getValue(); + StateData dMode = getData(flys, WQ_MODE); + String mode = dMode != null ? (String) data.getValue() : null; + logger.debug("WQ Mode: " + mode); double[] minmax = null;