--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Mon Feb 18 16:33:13 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Tue Feb 19 13:41:20 2013 +0100
@@ -11,8 +11,8 @@
 import de.intevation.artifacts.CallMeta;
 import de.intevation.artifacts.GlobalContext;
 import de.intevation.artifacts.common.utils.FileTools;
+import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.access.RangeAccess;
-import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.context.FLYSContext;
 import de.intevation.flys.artifacts.model.CalculationMessage;
 import de.intevation.flys.artifacts.model.CalculationResult;
@@ -24,14 +24,15 @@
 import de.intevation.flys.artifacts.model.map.WSPLGENReportFacet;
 import de.intevation.flys.artifacts.resources.Resources;
 import de.intevation.flys.exports.WstWriter;
+import de.intevation.flys.mapserver.ArtifactMapfileGenerator;
+import de.intevation.flys.mapserver.MapfileGenerator;
 import de.intevation.flys.model.CrossSectionTrack;
 import de.intevation.flys.model.DGM;
 import de.intevation.flys.model.Floodplain;
 import de.intevation.flys.model.RiverAxis;
-import de.intevation.flys.utils.ArtifactMapfileGenerator;
 import de.intevation.flys.utils.FLYSUtils;
+import de.intevation.flys.utils.FileUtils;
 import de.intevation.flys.utils.GeometryUtils;
-import de.intevation.flys.utils.MapfileGenerator;
 import de.intevation.flys.wsplgen.FacetCreator;
 import de.intevation.flys.wsplgen.JobObserver;
 import de.intevation.flys.wsplgen.Scheduler;
@@ -56,7 +57,7 @@
 implements   FacetTypes
 {
     /** The logger that is used in this state. */
-    private static Logger logger = Logger.getLogger(FloodMapState.class);
+    public static Logger logger = Logger.getLogger(FloodMapState.class);
 
 
     public static final String KEEP_ARTIFACT_DIR =
@@ -489,15 +490,7 @@
         boolean exists = archive.exists();
         logger.debug("Zip file exists: " + exists);
         if (exists) {
-            try {
-                File tmpDir = new File(dir, "usr_tmp");
-                FileTools.extractArchive(archive, tmpDir);
-                moveFiles(tmpDir, dir);
-            }
-            catch (IOException ioe) {
-                logger.warn("Zip archive " + dir + "/" + WSPLGEN_USER_ZIP + " could not be extracted.");
-                return;
-            }
+            FileUtils.extractZipfile(archive, dir);
 
             job.addLin(dir + "/" + WSPLGEN_USER_SHAPE);
             facetCreator.createUserShapeFacet();
@@ -844,43 +837,5 @@
             }
         }
     }
-
-
-    protected void moveFiles(File source, final File target)
-    throws IOException
-    {
-        if (!source.exists()) {
-            return;
-        }
-        if (!target.exists()) {
-            target.mkdir();
-        }
-        FileTools.walkTree(source, new FileTools.FileVisitor() {
-            @Override
-            public boolean visit(File file) {
-                if (!file.isDirectory()) {
-                    String name = file.getName();
-                    String suffix = "";
-                    int pos = name.lastIndexOf('.');
-                    if (pos > 0 && pos < name.length() - 1) {
-                        suffix = name.substring(pos + 1);
-                    }
-                    else {
-                        return true;
-                    }
-                    try {
-                        FileTools.copyFile(file, new File(target, WSPLGEN_USER_FILENAME + "." + suffix));
-                    }
-                    catch (IOException ioe) {
-                        logger.warn ("Error while copying file " + file.getName());
-                        return true;
-                    }
-                }
-                return true;
-            }
-        });
-
-        FileTools.deleteRecursive(source);
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :