--- a/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java	Sun Apr 28 15:04:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java	Sun Apr 28 15:09:31 2013 +0200
@@ -53,8 +53,8 @@
 import org.dive4elements.river.artifacts.model.WQKmsResult;
 import org.dive4elements.river.artifacts.resources.Resources;
 
-import org.dive4elements.river.utils.FLYSUtils;
-import org.dive4elements.river.utils.FLYSUtils.WQ_MODE;
+import org.dive4elements.river.utils.RiverUtils;
+import org.dive4elements.river.utils.RiverUtils.WQ_MODE;
 import org.dive4elements.river.utils.Formatter;
 
 /**
@@ -211,10 +211,10 @@
             try {
                 double v = Double.valueOf(raw);
 
-                String nmv = FLYSUtils.getNamedMainValue(winfo, v);
+                String nmv = RiverUtils.getNamedMainValue(winfo, v);
 
                 if (nmv != null && nmv.length() > 0) {
-                    nmv  = FLYSUtils.stripNamedMainValue(nmv);
+                    nmv  = RiverUtils.stripNamedMainValue(nmv);
                     nmv += "=" + String.valueOf(v);
                     logger.debug("Set named main value '" + nmv + "'");
 
@@ -237,7 +237,7 @@
 
         logger.debug("Name of WQKms = '" + name + "'");
 
-        WQ_MODE wqmode = FLYSUtils.getWQMode(winfo);
+        WQ_MODE wqmode = RiverUtils.getWQMode(winfo);
 
         if (wqmode == WQ_MODE.WFREE || wqmode == WQ_MODE.QGAUGE) {
             return localizeWQKms(winfo, wqkms);
@@ -245,10 +245,10 @@
 
         Double v = wqkms.getRawValue();
 
-        String nmv = FLYSUtils.getNamedMainValue(winfo, v);
+        String nmv = RiverUtils.getNamedMainValue(winfo, v);
 
         if (nmv != null && nmv.length() > 0) {
-            nmv = FLYSUtils.stripNamedMainValue(nmv);
+            nmv = RiverUtils.stripNamedMainValue(nmv);
             logger.debug("Set named main value '" + nmv + "'");
 
             return nmv;
@@ -263,7 +263,7 @@
      * format.
      */
     protected String localizeWQKms(WINFOArtifact winfo, WQKms wqkms) {
-        WQ_MODE wqmode   = FLYSUtils.getWQMode(winfo);
+        WQ_MODE wqmode   = RiverUtils.getWQMode(winfo);
         Double  rawValue = wqkms.getRawValue();
 
         if (rawValue == null) {
@@ -285,11 +285,11 @@
     protected void writeCSVData(CSVWriter writer) {
         logger.info("WaterlevelExporter.writeData");
 
-        WQ_MODE mode    = FLYSUtils.getWQMode((FLYSArtifact)master);
+        WQ_MODE mode    = RiverUtils.getWQMode((FLYSArtifact)master);
         boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE;
         boolean isQ     = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.QFREE;
-        FLYSUtils.WQ_INPUT input
-            = FLYSUtils.getWQInputMode((FLYSArtifact)master);
+        RiverUtils.WQ_INPUT input
+            = RiverUtils.getWQInputMode((FLYSArtifact)master);
 
         writeCSVMeta(writer);
         writeCSVHeader(writer, atGauge, isQ);
@@ -305,7 +305,7 @@
     protected void writeCSVMeta(CSVWriter writer) {
         logger.info("WaterlevelExporter.writeCSVMeta");
 
-        // TODO use Access instead of FLYSUtils
+        // TODO use Access instead of RiverUtils
 
         CallMeta meta = context.getMeta();
 
@@ -316,7 +316,7 @@
                 meta,
                 CSV_META_RESULT,
                 CSV_META_RESULT,
-                new Object[] { FLYSUtils.getRivername(flys) })
+                new Object[] { RiverUtils.getRivername(flys) })
         });
 
         Locale locale = Resources.getLocale(meta);
@@ -343,7 +343,7 @@
                 meta,
                 CSV_META_RIVER,
                 CSV_META_RIVER,
-                new Object[] { FLYSUtils.getRivername(flys) })
+                new Object[] { RiverUtils.getRivername(flys) })
         });
 
         RangeAccess rangeAccess = new RangeAccess(flys, null);
@@ -361,24 +361,24 @@
                 meta,
                 CSV_META_GAUGE,
                 CSV_META_GAUGE,
-                new Object[] { FLYSUtils.getGaugename(flys) })
+                new Object[] { RiverUtils.getGaugename(flys) })
         });
 
-        FLYSUtils.WQ_MODE wq = FLYSUtils.getWQMode(flys);
-        if (wq == FLYSUtils.WQ_MODE.QFREE || wq == FLYSUtils.WQ_MODE.QGAUGE) {
-            double[] qs  = FLYSUtils.getQs(flys);
-            FLYSUtils.WQ_INPUT input = FLYSUtils.getWQInputMode(flys);
+        RiverUtils.WQ_MODE wq = RiverUtils.getWQMode(flys);
+        if (wq == RiverUtils.WQ_MODE.QFREE || wq == RiverUtils.WQ_MODE.QGAUGE) {
+            double[] qs  = RiverUtils.getQs(flys);
+            RiverUtils.WQ_INPUT input = RiverUtils.getWQInputMode(flys);
 
             String data = "";
 
-            if ((input == FLYSUtils.WQ_INPUT.ADAPTED ||
-                input == FLYSUtils.WQ_INPUT.RANGE) &&
+            if ((input == RiverUtils.WQ_INPUT.ADAPTED ||
+                input == RiverUtils.WQ_INPUT.RANGE) &&
                 qs != null && qs.length > 0)
             {
                 data = String.valueOf(qs[0]);
                 data += " - " + String.valueOf(qs[qs.length-1]);
             }
-            else if (input == FLYSUtils.WQ_INPUT.SINGLE && qs != null){
+            else if (input == RiverUtils.WQ_INPUT.SINGLE && qs != null){
                 data = String.valueOf(qs[0]);
                 for (int i = 1; i < qs.length; i++) {
                     data += ", " + String.valueOf(qs[i]);
@@ -397,7 +397,7 @@
             });
         }
         else {
-            double[] ws = FLYSUtils.getWs(flys);
+            double[] ws = RiverUtils.getWs(flys);
 
             String lower = "";
             String upper = "";
@@ -434,7 +434,7 @@
     ) {
         logger.info("WaterlevelExporter.writeCSVHeader");
 
-        String unit = FLYSUtils.getRiver((FLYSArtifact) master).getWstUnit().getName();
+        String unit = RiverUtils.getRiver((FLYSArtifact) master).getWstUnit().getName();
 
         if (atGauge) {
             writer.writeNext(new String[] {
@@ -489,7 +489,7 @@
            kmf.format(wqkm[2]),
            wf.format(wqkm[0]),
            qf.format(wqkm[1]),
-           FLYSUtils.getLocationDescription(flys, wqkm[2])
+           RiverUtils.getLocationDescription(flys, wqkm[2])
        });
     }
 
@@ -506,7 +506,7 @@
             wf.format(wqkm[0]),
             qf.format(wqkm[1]),
             wOrQDesc,
-            FLYSUtils.getLocationDescription(flys, wqkm[2]),
+            RiverUtils.getLocationDescription(flys, wqkm[2]),
             gaugeName
         });
     }
@@ -536,8 +536,8 @@
         double[] result = new double[3];
 
         FLYSArtifact flys       = (FLYSArtifact) master;
-        List<Gauge>  gauges     = FLYSUtils.getGauges(flys);
-        Gauge        gauge      = FLYSUtils.getGauge(flys);
+        List<Gauge>  gauges     = RiverUtils.getGauges(flys);
+        Gauge        gauge      = RiverUtils.getGauge(flys);
         String       gaugeName  = gauge.getName();
         String       desc       = "";
         String       notinrange = msg(
@@ -551,7 +551,7 @@
             desc = getCSVRowTitle((WINFOArtifact)flys, wqkms);
         }
         else if (!isQ) {
-            Double value = FLYSUtils.getValueFromWQ(wqkms);
+            Double value = RiverUtils.getValueFromWQ(wqkms);
             desc         = value != null
                 ? Formatter.getWaterlevelW(context).format(value) : null;
         }
@@ -564,7 +564,7 @@
         if (flys instanceof WINFOArtifact) {
             if (wqkms != null && wqkms.getRawValue() != null) {
                 WINFOArtifact winfo = (WINFOArtifact) flys;
-                colDesc = FLYSUtils.getNamedMainValue(winfo, wqkms.getRawValue());
+                colDesc = RiverUtils.getNamedMainValue(winfo, wqkms.getRawValue());
             }
         }
         else if (flys instanceof FixationArtifact) {
@@ -743,7 +743,7 @@
     protected WKmsJRDataSource createJRData() {
         WKmsJRDataSource source = new WKmsJRDataSource();
 
-        WQ_MODE mode    = FLYSUtils.getWQMode((FLYSArtifact)master);
+        WQ_MODE mode    = RiverUtils.getWQMode((FLYSArtifact)master);
         boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE;
         boolean isQ     = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.QFREE;
 
@@ -761,7 +761,7 @@
 
         FLYSArtifact flys = (FLYSArtifact) master;
 
-        source.addMetaData ("river", FLYSUtils.getRivername(flys));
+        source.addMetaData ("river", RiverUtils.getRivername(flys));
 
         Locale locale = Resources.getLocale(meta);
         DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
@@ -772,7 +772,7 @@
         double[] kms = rangeAccess.getKmRange();
         source.addMetaData("range", kms[0] + " - " + kms[kms.length-1]);
 
-        source.addMetaData("gauge", FLYSUtils.getGaugename(flys));
+        source.addMetaData("gauge", RiverUtils.getGaugename(flys));
 
         source.addMetaData("calculation", Resources.getMsg(
                                             locale,
@@ -801,7 +801,7 @@
         double[] result = new double[3];
 
         FLYSArtifact flys       = (FLYSArtifact) master;
-        Gauge        gauge      = FLYSUtils.getGauge(flys);
+        Gauge        gauge      = RiverUtils.getGauge(flys);
         String       gaugeName  = gauge.getName();
         String       desc       = "";
         String       notinrange = msg(
@@ -815,7 +815,7 @@
             desc = getCSVRowTitle((WINFOArtifact)flys, wqkms);
         }
         else if (!isQ) {
-            Double value = FLYSUtils.getValueFromWQ(wqkms);
+            Double value = RiverUtils.getValueFromWQ(wqkms);
             desc         = value != null
                 ? Formatter.getWaterlevelW(context).format(value) : null;
         }
@@ -831,7 +831,7 @@
                     wf.format(result[0]),
                     qf.format(result[1]),
                     desc,
-                    FLYSUtils.getLocationDescription(flys, result[2]),
+                    RiverUtils.getLocationDescription(flys, result[2]),
                     result[2] >= a && result[2] <= b
                         ? gaugeName
                         : notinrange
@@ -843,7 +843,7 @@
                     wf.format(result[0]),
                     qf.format(result[1]),
                     desc,
-                    FLYSUtils.getLocationDescription(flys, result[2]),
+                    RiverUtils.getLocationDescription(flys, result[2]),
                     result[2] >= a && result[2] <= b
                         ? gaugeName
                         : notinrange