--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Thu Feb 16 12:35:51 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Fri Feb 17 11:29:41 2012 +0000
@@ -1119,11 +1119,12 @@
         StateData dMode      = getData("wq_mode");
         StateData dSelection = getData("wq_selection");
 
-        String mode = dMode != null ? (String) dMode.getValue() : "";
-        String sel  = dSelection != null ? (String)dSelection.getValue() : null;
+        boolean isRange = dSelection != null
+            ? Boolean.valueOf((String)dSelection.getValue())
+            : false;
 
-        if (mode.equals("Q")) {
-            if (sel != null && sel.equals("single")) {
+        if (isQ()) {
+            if (!isRange) {
                 return getSingleWQValues();
             }
             else {
@@ -1139,12 +1140,24 @@
 
     public boolean isQ() {
         StateData mode = getData("wq_mode");
-        return mode != null && mode.getValue().equals("Q");
+        String value = (mode != null) ? (String) mode.getValue() : null;
+        return value != null ? Boolean.valueOf(value) : false;
+    }
+
+    public boolean isW() {
+        StateData mode = getData("wq_mode");
+        String value = (mode != null) ? (String) mode.getValue() : null;
+        return value != null ? !Boolean.valueOf(value) : false;
     }
 
     public boolean isFreeW() {
-        StateData mode = getData("wq_mode");
-        return mode != null && mode.getValue().equals("WFREE");
+        if(!isW()) {
+            return false;
+        }
+        StateData mode = getData("wq_free");
+        String value =  (mode != null) ? (String) mode.getValue() : null;
+
+        return value != null ? Boolean.valueOf(value) : false;
     }
 
 
@@ -1157,6 +1170,9 @@
      * false and the calculation is bound to a gauge.
      */
     public boolean isFreeQ() {
+        if(!isQ()) {
+            return false;
+        }
         StateData mode  = getData("wq_free");
         String    value = (mode != null) ? (String) mode.getValue() : null;
 
@@ -1175,11 +1191,8 @@
      */
     public double[] getQs(double[] range) {
         StateData dMode   = getData("wq_mode");
-        StateData dValues = getData("wq_values");
 
-        String mode = (dMode != null) ? (String) dMode.getValue() : "";
-
-        if (mode.equals("Q")) {
+        if (isQ()) {
             return getWQForDist(range);
         }
 
@@ -1196,12 +1209,7 @@
      * @return an array of W values.
      */
     public double[] getWs(double[] range) {
-        StateData dMode   = getData("wq_mode");
-        StateData dValues = getData("wq_values");
-
-        String mode = (dMode != null) ? (String) dMode.getValue() : "";
-
-        if (mode.equals("W")) {
+        if (isW()) {
             return getWQForDist(range);
         }
 
@@ -1216,12 +1224,9 @@
      * @return the selected W values or null, if no W values are selected.
      */
     public double[] getWs() {
-        StateData dMode   = getData("wq_mode");
         StateData dSingle = getData("wq_single");
 
-        String mode = (dMode != null) ? (String) dMode.getValue() : "";
-
-        if (mode.equals("W") || mode.equals("WFREE")) {
+        if (isW()) {
             if (dSingle != null) {
                 return getSingleWQValues();
             }
@@ -1230,7 +1235,7 @@
             }
         }
         else {
-            logger.warn("You try to get Qs, but W has been inserted.");
+            logger.warn("You try to get Ws, but Q has been inserted.");
             return null;
         }
     }