--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/RangeState.java	Thu Jan 24 15:04:01 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/RangeState.java	Thu Jan 24 16:09:46 2013 +0100
@@ -6,10 +6,12 @@
 
 import de.intevation.artifactdatabase.data.StateData;
 
+import de.intevation.flys.artifacts.access.RangeAccess;
 import de.intevation.flys.artifacts.FLYSArtifact;
 
 
 /**
+ * State in which km range is set.
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public abstract class RangeState extends DefaultState {
@@ -21,10 +23,6 @@
     public RangeState() {
     }
 
-
-    protected abstract String   getLowerField();
-    protected abstract String   getUpperField();
-    protected abstract String   getStepField();
     protected abstract double[] getMinMax(Artifact artifact);
 
 
@@ -77,22 +75,11 @@
     {
         FLYSArtifact flys = (FLYSArtifact) artifact;
 
-        StateData dFrom = getData(flys, getLowerField());
-        StateData dTo   = getData(flys, getUpperField());
-        StateData dStep = getData(flys, getStepField());
-
-        String fromStr = dFrom != null ? (String) dFrom.getValue() : null;
-        String toStr   = dTo   != null ? (String) dTo.getValue()   : null;
-        String stepStr = dStep != null ? (String) dStep.getValue() : null;
-
-        if (fromStr == null || toStr == null || stepStr == null) {
-            throw new IllegalArgumentException("error_empty_state");
-        }
-
         try {
-            double from = Double.parseDouble(fromStr);
-            double to   = Double.parseDouble(toStr);
-            double step = Double.parseDouble(stepStr);
+            RangeAccess rangeAccess = new RangeAccess(flys, null);
+            double from = rangeAccess.getFrom();
+            double to   = rangeAccess.getTo();
+            double step = rangeAccess.getStep();
 
             double[] minmax = getMinMax(flys);
 
@@ -101,6 +88,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 :