--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java	Wed Oct 19 13:51:16 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java	Wed Oct 19 14:00:36 2011 +0000
@@ -1,6 +1,5 @@
 package de.intevation.flys.artifacts.states;
 
-import java.text.NumberFormat;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -19,7 +18,7 @@
 import de.intevation.flys.artifacts.model.ReportFacet;
 import de.intevation.flys.artifacts.model.WaterlevelFacet;
 import de.intevation.flys.artifacts.model.WQKms;
-import de.intevation.flys.utils.Formatter;
+import de.intevation.flys.utils.FLYSUtils;
 
 
 public class WaterlevelState
@@ -57,10 +56,9 @@
 
         for (int i = 0; i < wqkms.length; i++) {
             String  name = wqkms[i].getName();
-            boolean isQ  = winfo.isQ();
 
-            String nameW = createWTitle(cc, name, isQ);
-            String nameQ = createQTitle(cc, name, isQ);
+            String nameW = FLYSUtils.createWspWTitle(winfo, cc, name);
+            String nameQ = FLYSUtils.createWspQTitle(winfo, cc, name);
 
             logger.debug("Create facet: " + nameW);
             logger.debug("Create facet: " + nameQ);
@@ -98,60 +96,6 @@
     }
 
 
-    public static String createWTitle(CallContext cc, String name, boolean isQ) {
-        String[] parts = name.split("=");
-
-        NumberFormat nf = Formatter.getWaterlevelW(cc);
-
-        double v;
-
-        try {
-            v = Double.valueOf(parts[1]);
-        }
-        catch (NumberFormatException nfe) {
-            logger.warn("Cannot parse Double of: '" + parts[1] + "'");
-            return name;
-        }
-
-        String prefix = null;
-
-        if (isQ) {
-            prefix = "Q=";
-        }
-
-        return prefix == null
-            ? "W(" + nf.format(v) + ")"
-            : "W(" + prefix + nf.format(v) + ")";
-    }
-
-
-    public static String createQTitle(CallContext cc, String name, boolean isQ) {
-        String[] parts = name.split("=");
-
-        NumberFormat nf = Formatter.getWaterlevelQ(cc);
-
-        double v;
-
-        try {
-            v = Double.valueOf(parts[1]);
-        }
-        catch (NumberFormatException nfe) {
-            logger.warn("Cannot parse Double of: '" + parts[1] + "'");
-            return name;
-        }
-
-        String prefix = null;
-
-        if (!isQ) {
-            prefix = "W=";
-        }
-
-        return prefix == null
-            ? "Q(" + nf.format(v) + ")"
-            : "Q(" + prefix + nf.format(v) + ")";
-    }
-
-
     /**
      * @param context Ignored.
      */