Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java @ 4865:1358d0c8481c
RangeState and descendants: Use RangeAccess, resolve direct ld_* usage.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 24 Jan 2013 16:09:46 +0100 |
parents | cafd8af6734a |
children | 53be73133104 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java Thu Jan 24 15:04:01 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java Thu Jan 24 16:09:46 2013 +0100 @@ -6,6 +6,7 @@ import de.intevation.artifactdatabase.data.StateData; +import de.intevation.flys.artifacts.access.RangeAccess; import de.intevation.flys.artifacts.FLYSArtifact; @@ -23,21 +24,13 @@ public boolean validate(Artifact artifact) throws IllegalArgumentException { + // TODO think about better hierarchy wrt RangeState#validate. FLYSArtifact flys = (FLYSArtifact) artifact; - StateData dFrom = getData(flys, getLowerField()); - StateData dTo = getData(flys, getUpperField()); - - String fromStr = dFrom != null ? (String) dFrom.getValue() : null; - String toStr = dTo != null ? (String) dTo.getValue() : null; - - if (fromStr == null || toStr == null) { - throw new IllegalArgumentException("error_empty_state"); - } - try { - double from = Double.parseDouble(fromStr); - double to = Double.parseDouble(toStr); + RangeAccess rangeAccess = new RangeAccess(flys, null); + double from = rangeAccess.getFrom(); + double to = rangeAccess.getTo(); double[] minmax = getMinMax(flys); @@ -46,6 +39,9 @@ catch (NumberFormatException nfe) { throw new IllegalArgumentException("error_invalid_double_value"); } + catch (NullPointerException npe) { + throw new IllegalArgumentException("error_empty_state"); + } } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :