--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java	Sun Apr 28 15:04:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java	Sun Apr 28 15:09:31 2013 +0200
@@ -75,7 +75,7 @@
 import org.dive4elements.river.model.RiverAxis;
 
 import org.dive4elements.river.utils.ArtifactMapfileGenerator;
-import org.dive4elements.river.utils.FLYSUtils;
+import org.dive4elements.river.utils.RiverUtils;
 import org.dive4elements.river.utils.GeometryUtils;
 import org.dive4elements.river.utils.MapfileGenerator;
 
@@ -275,8 +275,8 @@
      * @return the directory for WSPLEN data.
      */
     protected File getDirectory(FLYSArtifact artifact) {
-        String shapePath = FLYSUtils.getXPathString(
-            FLYSUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
+        String shapePath = RiverUtils.getXPathString(
+            RiverUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
 
         File artifactDir = FileTools.getDirectory(
             shapePath, artifact.identifier());
@@ -290,8 +290,8 @@
      * results of WSPLGEN are stored. Should be called in endOfLife().
      */
     protected void removeDirectory(FLYSArtifact artifact) {
-        String shapePath = FLYSUtils.getXPathString(
-            FLYSUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
+        String shapePath = RiverUtils.getXPathString(
+            RiverUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
 
         File artifactDir = new File(shapePath, artifact.identifier());
 
@@ -555,7 +555,7 @@
     ) {
         String river   = artifact.getDataAsString("river");
         String geoJSON = artifact.getDataAsString("uesk.barriers");
-        String srid    = FLYSUtils.getRiverDGMSrid(river);
+        String srid    = RiverUtils.getRiverDGMSrid(river);
         String srs     = "EPSG:" + srid;
 
         if (geoJSON == null || geoJSON.length() == 0) {
@@ -766,7 +766,7 @@
 
     protected void setAxis(FLYSArtifact artifact, File dir, WSPLGENJob job) {
         String river = artifact.getDataAsString("river");
-        String srid    = FLYSUtils.getRiverDGMSrid(river);
+        String srid    = RiverUtils.getRiverDGMSrid(river);
         String srs     = "EPSG:" + srid;
 
         List<RiverAxis> axes = null;
@@ -812,7 +812,7 @@
 
     protected void setPro(FLYSArtifact artifact, File dir, WSPLGENJob job) {
         String river = artifact.getDataAsString("river");
-        String srid    = FLYSUtils.getRiverDGMSrid(river);
+        String srid    = RiverUtils.getRiverDGMSrid(river);
         String srs     = "EPSG:" + srid;
 
         List<CrossSectionTrack> cst =
@@ -894,7 +894,7 @@
         }
 
         String river = artifact.getDataAsString("river");
-        String srid  = FLYSUtils.getRiverDGMSrid(river);
+        String srid  = RiverUtils.getRiverDGMSrid(river);
         String srs   = "EPSG:" + srid;
 
         Floodplain plain = Floodplain.getFloodplain(river);
@@ -942,7 +942,7 @@
         catch (NumberFormatException nfe) { /* do nothing */ }
 
         FLYSArtifact src = otherArtifact != null
-            ? FLYSUtils.getArtifact(otherArtifact, cc)
+            ? RiverUtils.getArtifact(otherArtifact, cc)
             : flys;
 
         logger.debug("Use waterlevel provided by Artifact: " + src.identifier());