--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Wed Sep 28 14:03:31 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Thu Sep 29 09:14:41 2011 +0000
@@ -1336,39 +1336,8 @@
      * @return a double array with [min, max].
      */
     protected double[] getMinMaxKM(DataList[] data) {
-        int     num = data != null ? data.length : 0;
-        double[] mm = new double[] { Double.MAX_VALUE, -Double.MAX_VALUE };
-
-        for (int i = 0; i < num; i++) {
-            DataList dl = data[i];
-
-            if (dl.getState().equals("state.winfo.location_distance")) {
-                for (int j = 0, n = dl.size(); j < n; j++) {
-                    Data d = dl.get(j);
-
-                    String label = d.getLabel();
-                    if (label.equals("ld_step") || label.equals("ld_mode")) {
-                        continue;
-                    }
-
-                    for (DataItem item: d.getItems()) {
-                        String itemValue = item.getStringValue();
-
-                        try {
-                            double v = Double.valueOf(itemValue);
-
-                            mm[0] = mm[0] < v ? mm[0] : v;
-                            mm[1] = mm[1] > v ? mm[1] : v;
-                        }
-                        catch (NumberFormatException nfe) {
-                            // do nothing
-                        }
-                    }
-                }
-            }
-        }
-
-        return mm;
+        ArtifactDescription adesc = artifact.getArtifactDescription();
+        return adesc.getKMRange();
     }
 
 
@@ -1380,24 +1349,8 @@
      * @return the name of the current river.
      */
     protected String getRiverName(DataList[] data) {
-        if (data != null && data.length > 0) {
-            for (int i = 0; i < data.length; i++) {
-                DataList dl = data[i];
-
-                if (dl.getState().equals("state.winfo.river")) {
-                    for (int j = 0; j < dl.size(); j++) {
-                        Data d = dl.get(j);
-                        DataItem[] di = d.getItems();
-
-                        if (di != null && di.length == 1) {
-                           return d.getItems()[0].getStringValue();
-                        }
-                    }
-                }
-            }
-        }
-
-        return null;
+        ArtifactDescription adesc = artifact.getArtifactDescription();
+        return adesc.getRiver();
     }