diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java @ 4656:442fbb290fa8

Introduce river mapfile generation (WARNING: Changes in config xml files required!). On startup the RiverMapfileGeneratorStarter is called by the server app. The starter invokes a call to RiverMapfileGenerator.generate() which reads all available rivers from the database and generates layers for each river (in theory...uncompleted) in a river.map file. The old MapfileGenerator which generates layers that have artifact dependencies is now in ArtifactMapfileGenerator.
author Christian Lins <christian.lins@intevation.de>
date Tue, 11 Dec 2012 15:24:24 +0100
parents 861c47e0a8a0
children c53b3fdc9821
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Tue Dec 11 09:44:04 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Tue Dec 11 15:24:24 2012 +0100
@@ -227,7 +227,7 @@
      */
     protected File getDirectory(FLYSArtifact artifact) {
         String shapePath = FLYSUtils.getXPathString(
-            FLYSUtils.XPATH_SHAPEFILE_DIR);
+            FLYSUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
 
         File artifactDir = FileTools.getDirectory(
             shapePath, artifact.identifier());
@@ -242,13 +242,16 @@
      */
     protected void removeDirectory(FLYSArtifact artifact) {
         String shapePath = FLYSUtils.getXPathString(
-            FLYSUtils.XPATH_SHAPEFILE_DIR);
+            FLYSUtils.XPATH_FLOODMAP_SHAPEFILE_DIR);
 
         File artifactDir = new File(shapePath, artifact.identifier());
 
         if (artifactDir.exists()) {
             logger.info("Delete directory: " + artifactDir.getAbsolutePath());
-            boolean success = FileTools.deleteRecursive(artifactDir);
+            if (!FileTools.deleteRecursive(artifactDir)) {
+                logger.warn("Could not delete directory: "
+                        + artifactDir.getAbsolutePath());
+            }
         }
         else {
             logger.debug("There is no directory to remove.");

http://dive4elements.wald.intevation.org