--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java	Sun Apr 28 15:04:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java	Sun Apr 28 15:09:31 2013 +0200
@@ -36,7 +36,7 @@
 import org.dive4elements.river.artifacts.model.WstValueTable;
 import org.dive4elements.river.artifacts.resources.Resources;
 
-import org.dive4elements.river.utils.FLYSUtils;
+import org.dive4elements.river.utils.RiverUtils;
 
 
 /**
@@ -188,7 +188,7 @@
                 double v = Double.parseDouble(value.trim());
 
                 String tmp = nf.format(v);
-                String mv  = FLYSUtils.getNamedMainValue(gauge, v);
+                String mv  = RiverUtils.getNamedMainValue(gauge, v);
 
                 if (mv != null && mv.length() > 0) {
                     tmp = mv + ": " + tmp;
@@ -458,7 +458,7 @@
 
         WINFOArtifact flysArtifact = (WINFOArtifact) artifact;
 
-        River river = FLYSUtils.getRiver(flysArtifact);
+        River river = RiverUtils.getRiver(flysArtifact);
         Gauge gauge = flysArtifact.getGauge();
         Wst   wst   = WstFactory.getWst(river);
 
@@ -588,19 +588,19 @@
 
         all.sort();
 
-        FLYSUtils.WQ_MODE mode = FLYSUtils.getWQMode(flys);
+        RiverUtils.WQ_MODE mode = RiverUtils.getWQMode(flys);
 
         logger.debug("WQ Mode: " + mode);
 
         double[] minmax = null;
 
-        if (mode == FLYSUtils.WQ_MODE.WGAUGE) {
+        if (mode == RiverUtils.WQ_MODE.WGAUGE) {
             minmax = determineMinMaxW(artifact);
         }
-        else if (mode == FLYSUtils.WQ_MODE.QGAUGE) {
+        else if (mode == RiverUtils.WQ_MODE.QGAUGE) {
             minmax = determineMinMaxQAtGauge(artifact);
         }
-        else if (mode == FLYSUtils.WQ_MODE.QFREE) {
+        else if (mode == RiverUtils.WQ_MODE.QFREE) {
             minmax = determineMinMaxQ(artifact);
         }
         else {
@@ -623,7 +623,7 @@
         logger.debug("WQSelect.validateRange");
 
         WINFOArtifact     flys = (WINFOArtifact) artifact;
-        FLYSUtils.WQ_MODE mode = FLYSUtils.getWQMode(flys);
+        RiverUtils.WQ_MODE mode = RiverUtils.getWQMode(flys);
 
         if (mode == null) {
             throw new IllegalArgumentException("error_feed_invalid_wq_mode");
@@ -646,16 +646,16 @@
             double to   = Double.parseDouble(toStr);
             double step = Double.parseDouble(stepStr);
 
-            if (mode == FLYSUtils.WQ_MODE.WGAUGE) {
+            if (mode == RiverUtils.WQ_MODE.WGAUGE) {
                 return validateGaugeW(artifact, from, to, step);
             }
-            else if (mode == FLYSUtils.WQ_MODE.QGAUGE) {
+            else if (mode == RiverUtils.WQ_MODE.QGAUGE) {
                 return validateGaugeQ(artifact, from, to, step);
             }
-            else if (mode == FLYSUtils.WQ_MODE.QFREE) {
+            else if (mode == RiverUtils.WQ_MODE.QFREE) {
                 return validateFreeQ(artifact, from, to, step);
             }
-            else if (mode == FLYSUtils.WQ_MODE.WFREE) {
+            else if (mode == RiverUtils.WQ_MODE.WFREE) {
                 return validateFreeW(artifact, from, to, step);
             }
             else {