--- a/artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java	Sun Apr 28 15:23:01 2013 +0200
@@ -19,13 +19,13 @@
 import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
 import org.dive4elements.artifacts.common.utils.XMLUtils;
 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.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.map.WMSDBLayerFacet;
 import org.dive4elements.river.artifacts.model.map.WMSLayerFacet;
 import org.dive4elements.river.artifacts.model.map.WSPLGENLayerFacet;
 import org.dive4elements.river.artifacts.states.WaterlevelGroundDifferences;
-import org.dive4elements.river.collections.FLYSArtifactCollection;
+import org.dive4elements.river.collections.D4EArtifactCollection;
 import org.dive4elements.river.utils.ArtifactMapfileGenerator;
 import org.dive4elements.river.utils.GeometryUtils;
 import org.dive4elements.river.utils.ThemeUtil;
@@ -46,7 +46,7 @@
 
     private static Logger logger = Logger.getLogger(MapGenerator.class);
 
-    protected FLYSArtifactCollection collection;
+    protected D4EArtifactCollection collection;
 
     protected Artifact master;
 
@@ -89,7 +89,7 @@
     }
 
     @Override
-    public void setCollection(FLYSArtifactCollection collection) {
+    public void setCollection(D4EArtifactCollection collection) {
         this.collection = collection;
     }
 
@@ -103,7 +103,7 @@
 
         logger.debug("MapGenerator.doOut: " +
             artifactFacet.getArtifact().identifier() + " | " + name);
-        FLYSArtifact flys = (FLYSArtifact) artifactFacet.getArtifact();
+        D4EArtifact flys = (D4EArtifact) artifactFacet.getArtifact();
 
         Facet nativeFacet = artifactFacet.getFacet();
 
@@ -138,7 +138,7 @@
 
 
     protected void createWSPLGENLayer(
-        FLYSArtifact  flys,
+        D4EArtifact  flys,
         WMSLayerFacet wms,
         Document      attr
     ) {
@@ -175,7 +175,7 @@
     }
 
 
-    protected void createBarriersLayer(FLYSArtifact flys, WMSLayerFacet wms) {
+    protected void createBarriersLayer(D4EArtifact flys, WMSLayerFacet wms) {
         ArtifactMapfileGenerator mfg = new ArtifactMapfileGenerator();
 
         try {
@@ -190,7 +190,7 @@
     }
 
 
-    protected void createUserShapeLayer(FLYSArtifact flys, WMSLayerFacet wms) {
+    protected void createUserShapeLayer(D4EArtifact flys, WMSLayerFacet wms) {
         ArtifactMapfileGenerator mfg = new ArtifactMapfileGenerator();
 
         try {
@@ -206,7 +206,7 @@
 
 
     protected void createDatabaseLayer(
-        FLYSArtifact  flys,
+        D4EArtifact  flys,
         WMSLayerFacet wms,
         Document      attr
     ) {