--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java	Mon May 14 09:52:04 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java	Mon May 14 10:29:05 2012 +0000
@@ -637,26 +637,7 @@
 
     protected String getRiverName() {
         ArtifactDescription adescr = artifact.getArtifactDescription();
-        DataList[] data = adescr.getOldData();
-
-        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;
+        return adescr.getRiver();
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :