# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1314608688 0
# Node ID 29c67a76ad5dedbb162d91a2aa87110616db6878
# Parent  af73f196eccc5b3030ab5fc20a5c02998dafadcb
Use new helper class FLYSUtils, minor refactorization.


flys-artifacts/trunk@2603 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r af73f196eccc -r 29c67a76ad5d flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Aug 29 09:01:40 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Aug 29 09:04:48 2011 +0000
@@ -1,3 +1,10 @@
+2011-08-29  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Use new helper class FLYSUtils, minor refactorization.
+
+	* src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java:
+	  Use new functionality of helper class, convenience of FLYSArtifact.
+
 2011-08-29  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	Refactored to use new Helper class FLYSUtils, moved getRiver-functionality
diff -r af73f196eccc -r 29c67a76ad5d flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Mon Aug 29 09:01:40 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Mon Aug 29 09:04:48 2011 +0000
@@ -154,32 +154,19 @@
 
 
     /**
-     * Get the river.
-     * @todo resolve, this is a duplicate of WINFOArtifact.
-     */
-    public River getRiver() {
-        StateData dRiver = getData("river");
-
-        return dRiver != null
-            ? RiverFactory.getRiver((String) dRiver.getValue())
-            : null;
-    }
-
-
-    /**
      * Access the Gauge that the mainvalues are taken from.
      * @return Gauge that main values are taken from or null in case of
      *         invalid parameterization.
      */
     protected Gauge getGauge() {
-        River river = getRiver();
+        River river = FLYSUtils.getRiver(this);
 
         if (river == null) {
             return null;
         }
 
         double location = Double.parseDouble(
-                (String)getData("location").getValue());
+                getDataAsString("location"));
 
         return river.determineGaugeByPosition(location);
     }