This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit b194eb2bdb990babb92f0b9df769e16f87e55ad1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie --- .../main/java/fr/ird/observe/IObserveConfig.java | 2 ++ .../java/fr/ird/observe/ObserveConfigOption.java | 11 ++++++++++ .../fr/ird/observe/ObserveResourceManager.java | 25 +++++++++++++++++----- .../main/java/fr/ird/observe/ObserveRunner.java | 9 +++++--- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java index c002ee5..5d9dc7a 100644 --- a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java +++ b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java @@ -155,6 +155,8 @@ public interface IObserveConfig { String PROPERTY_REPORT_DIRECTORY = "reportDirectory"; + String PROPERTY_MAP_DIRECTORY = "mapDirectory"; + String PROPERTY_TMP_DIRECTORY = "tmpDirectory"; String PROPERTY_DISPLAY_MAIN_UI = "displayMainUI"; diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java b/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java index c89cd3a..764b913 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java @@ -142,6 +142,17 @@ public enum ObserveConfigOption implements ConfigOptionDef { false ), + /** le repertoire ou sont stockees les cartes de l'utilisateur */ + MAP_DIRECTORY( + "map.directory", + IObserveConfig.PROPERTY_MAP_DIRECTORY, + n("observe.config.defaultMapDirectory.description"), + "${resources.directory}/map", + File.class, + false, + false + ), + /** le repertoire ou sont stockees les reports de validation de l'utilisateur */ VALIDATION_REPORT_DIRECTORY( "validation.report.directory", diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java b/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java index b6f8403..95c955f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java @@ -25,6 +25,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.SortedProperties; +import org.nuiton.util.ZipUtil; import java.io.BufferedInputStream; import java.io.File; @@ -61,8 +62,8 @@ public class ObserveResourceManager { public static final String OBSERVE_MAP_BACKGROUND = "/shapefiles/backgroundes/background.shp"; - public static final String OBSERVE_MAP_LAYERS = - "/shapeFiles"; + public static final String OBSERVE_MAP_ARCHIVE = + "/map.zip"; /** Logger */ static private Log log = LogFactory.getLog(ObserveResourceManager.class); @@ -72,7 +73,7 @@ public class ObserveResourceManager { ui(OBSERVE_UI_PROPERTIES), application(OBSERVE_APPLICATION_PROPERTIES), report(OBSERVE_REPORTS_PROPERTIES), - mapLayers(OBSERVE_MAP_LAYERS); + mapLayers(OBSERVE_MAP_ARCHIVE); private final String location; @@ -103,7 +104,6 @@ public class ObserveResourceManager { protected Map<String, Properties> resources; - public Map<String, Properties> getResources() { if (resources == null) { resources = new TreeMap<String, Properties>(); @@ -111,6 +111,7 @@ public class ObserveResourceManager { return resources; } + public Properties getResource(Resource resource) throws IOException { URL url = resource.getUrl(); @@ -118,7 +119,6 @@ public class ObserveResourceManager { return result; } - public Properties getResource(File file) throws IOException { URL url = file.toURI().toURL(); @@ -128,6 +128,7 @@ public class ObserveResourceManager { return result; } + public Properties getResource(URL url) throws IOException { String path = url.toString(); @@ -309,4 +310,18 @@ public class ObserveResourceManager { } } + public File unzipToDirectory(Resource resource, ObserveConfig config, ObserveConfigOption option, String message) throws IOException { + + File dir = config.getOptionAsFile(option.key); + createDirectory(dir); + InputStream inputStream = openInternalStream(resource.getUrl()); + try { + ZipUtil.uncompress(inputStream, dir); + return dir; + } finally { + inputStream.close(); + + } + } + } diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java index 432f4a2..68a2118 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -60,6 +60,7 @@ import static fr.ird.observe.ObserveConfigOption.DATA_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.DB_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.INITIAL_DB_DUMP; import static fr.ird.observe.ObserveConfigOption.REPORT_DIRECTORY; +import static fr.ird.observe.ObserveConfigOption.MAP_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.RESOURCES_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.TMP_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.VALIDATION_REPORT_DIRECTORY; @@ -461,9 +462,11 @@ public abstract class ObserveRunner extends ApplicationRunner { // 9 - resources shapeFiles -// String message = t("observe.runner.copy.default.report.file", eezShapeFile); -// -// resourceManager.copyDirectory(Resource.mapLayers, config, RESOURCES_DIRECTORY, massage); + File mapdirectory = resourceManager.createDirectory(config, MAP_DIRECTORY); + + String message = t("observe.runner.copy.default.map.file", mapdirectory); + + resourceManager.unzipToDirectory(Resource.mapLayers, config, RESOURCES_DIRECTORY, message); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.