--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java	Sun Apr 28 15:23:01 2013 +0200
@@ -40,7 +40,7 @@
 
 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator;
 
-import org.dive4elements.river.artifacts.FLYSArtifact;
+import org.dive4elements.river.artifacts.D4EArtifact;
 
 import org.dive4elements.river.artifacts.access.MapAccess;
 
@@ -74,7 +74,7 @@
 
     @Override
     protected Element createStaticData(
-        FLYSArtifact   flys,
+        D4EArtifact   flys,
         ElementCreator creator,
         CallContext    cc,
         String         name,
@@ -97,7 +97,7 @@
 
     @Override
     public Object computeAdvance(
-        FLYSArtifact artifact,
+        D4EArtifact artifact,
         String hash,
         CallContext context,
         List<Facet> facets,
@@ -277,7 +277,7 @@
     }
 
     private void createMapfile(
-        FLYSArtifact artifact,
+        D4EArtifact artifact,
         File artifactDir,
         String name,
         String hwsShapefile,
@@ -317,7 +317,7 @@
         super.endOfLife(artifact, callContext);
         logger.info("ScenarioSelect.endOfLife: " + artifact.identifier());
 
-        FLYSArtifact flys = (FLYSArtifact) artifact;
+        D4EArtifact flys = (D4EArtifact) artifact;
         removeDirectory(flys);
     }
 
@@ -327,7 +327,7 @@
      * results of WSPLGEN are stored. Should be called in endOfLife().
      */
     // FIXME: I've seen this code somewhere else...
-    protected void removeDirectory(FLYSArtifact artifact) {
+    protected void removeDirectory(D4EArtifact artifact) {
         String shapePath = RiverUtils.getXPathString(
             RiverUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
 
@@ -353,7 +353,7 @@
      *
      * @return the directory for WSPLEN data.
      */
-    protected File getDirectory(FLYSArtifact artifact) {
+    protected File getDirectory(D4EArtifact artifact) {
         String shapePath = RiverUtils.getXPathString(
             RiverUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);