--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Sun Apr 28 15:04:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Sun Apr 28 15:09:31 2013 +0200
@@ -51,7 +51,7 @@
 import org.dive4elements.river.model.River;
 
 import org.dive4elements.river.utils.DoubleUtil;
-import org.dive4elements.river.utils.FLYSUtils;
+import org.dive4elements.river.utils.RiverUtils;
 
 import gnu.trove.TDoubleArrayList;
 
@@ -209,7 +209,7 @@
                 this.compute(context, ComputeType.ADVANCE, false);
         }
 
-        River river = FLYSUtils.getRiver(this);
+        River river = RiverUtils.getRiver(this);
         if (river == null) {
             return error(new WQKms[0], "no.river.selected");
         }
@@ -312,7 +312,7 @@
     public CalculationResult getDurationCurveData() {
         logger.debug("WINFOArtifact.getDurationCurveData");
 
-        River r = FLYSUtils.getRiver(this);
+        River r = RiverUtils.getRiver(this);
 
         if (r == null) {
             return error(null, "no.river.selected");
@@ -376,7 +376,7 @@
     {
         logger.debug("WINFOArtifact.getComputedDischargeCurveData");
 
-        River r = FLYSUtils.getRiver(this);
+        River r = RiverUtils.getRiver(this);
 
         if (r == null) {
             return error(new WQKms[0], "no.river.selected");
@@ -452,7 +452,7 @@
 
         Calculation5 calc5 = new Calculation5(startKm, endKms);
 
-        River r = FLYSUtils.getRiver(this);
+        River r = RiverUtils.getRiver(this);
         if (r == null) {
             return error(new WW[0], "no.river.found");
         }
@@ -537,13 +537,13 @@
 
 
     public CalculationResult getHistoricalDischargeData() {
-        Gauge  gauge        = FLYSUtils.getReferenceGauge(this);
+        Gauge  gauge        = RiverUtils.getReferenceGauge(this);
         String rawTimerange = getDataAsString("year_range");
         String rawValues    = getDataAsString("historical_values");
         int    mode         = getDataAsInteger("historical_mode");
 
-        long[]   timerange = FLYSUtils.longArrayFromString(rawTimerange);
-        double[] values    = FLYSUtils.doubleArrayFromString(rawValues);
+        long[]   timerange = RiverUtils.longArrayFromString(rawTimerange);
+        double[] values    = RiverUtils.doubleArrayFromString(rawValues);
 
         Calendar start = new GregorianCalendar();
         start.setTimeInMillis(timerange[0]);
@@ -699,7 +699,7 @@
             logger.debug("FLYSArtifact.getQsForWs");
         }
 
-        River r = FLYSUtils.getRiver(this);
+        River r = RiverUtils.getRiver(this);
         if (r == null) {
             logger.warn("no river found");
             return null;
@@ -926,7 +926,7 @@
      * @return the gauge.
      */
     public Gauge getGauge() {
-        return FLYSUtils.getGauge(this);
+        return RiverUtils.getGauge(this);
     }
 
 
@@ -1187,7 +1187,7 @@
      * Returns the WstValueTable of current river.
      */
     public WstValueTable getWstValueTable() {
-        River r = FLYSUtils.getRiver(this);
+        River r = RiverUtils.getRiver(this);
         return WstValueTableFactory.getTable(r);
     }
 }