--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Mon Aug 29 08:58:03 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Mon Aug 29 09:01:40 2011 +0000
@@ -28,18 +28,17 @@
 import de.intevation.artifacts.common.utils.XMLUtils;
 
 import de.intevation.flys.artifacts.states.DefaultState;
+import de.intevation.flys.artifacts.cache.CacheFactory;
 import de.intevation.flys.artifacts.context.FLYSContext;
+import de.intevation.flys.artifacts.model.AnnotationsFactory;
+import de.intevation.flys.artifacts.model.RiverFactory;
 
 import de.intevation.flys.backend.SessionHolder;
 
-import de.intevation.flys.artifacts.cache.CacheFactory;
-
 import de.intevation.flys.model.Annotation;
-import de.intevation.flys.artifacts.model.AnnotationsFactory;
-
 import de.intevation.flys.model.River;
 
-import de.intevation.flys.artifacts.model.RiverFactory;
+import de.intevation.flys.utils.FLYSUtils;
 
 /**
  * Artifact to access names of Points Of Interest along a segment of a river.
@@ -232,13 +231,6 @@
         }
     } 
 
-    public River getRiver() {
-        StateData dRiver = getData("river");
-
-        return dRiver != null
-            ? RiverFactory.getRiver((String) dRiver.getValue())
-            : null;
-    }
 
     /**
      * Get Annotations for Points (opposed to segments) in river in range.
@@ -246,7 +238,7 @@
      * @return list of Annotations.
      */
     public List<Annotation> getAnnotations() {
-        String river = getRiver().getName();
+        String river = FLYSUtils.getRiver(this).getName();
         logger.debug("Search annotations for river: " /*+ river*/);
         //Cache cache = CacheFactory.getCache(CACHE_NAME);