This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit af22f3fca4147528455982009083524e15888648 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 17 09:50:52 2014 +0100 simplify generated file name build --- .../services/service/spatial/GisService.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 8a70967..044d490 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -189,7 +189,7 @@ public class GisService extends EchoBaseServiceSupport { HierarchicalINIConfiguration lizmapIni = new HierarchicalINIConfiguration(lizmapConfigFile); SubnodeConfiguration section = lizmapIni.getSection("repository:" + repositoryName); - section.setProperty("label", "\""+workingDbConfiguration.getDescription()+"\""); + section.setProperty("label", "\"" + workingDbConfiguration.getDescription() + "\""); section.setProperty("path", repository.getAbsolutePath() + "/"); BufferedWriter writer = Files.newWriter(lizmapConfigFile, Charsets.UTF_8); @@ -306,27 +306,23 @@ public class GisService extends EchoBaseServiceSupport { String[] templateValues = getTemplateValues(conf, voyage); - generateFileFromTemplate(getConfiguration().getQgisTemplateFile(), repositoryDirectory, voyageName, templateValues); + generateFileFromTemplate(getConfiguration().getQgisTemplateFile(), new File(repositoryDirectory, voyageName + ".qgs"), templateValues); - generateFileFromTemplate(getConfiguration().getLizmapTemplateFile(), repositoryDirectory, voyageName, templateValues); + generateFileFromTemplate(getConfiguration().getLizmapTemplateFile(), new File(repositoryDirectory, voyageName + ".qgs.cfg"), templateValues); return voyageName; } /** - * Generate file from template and values + * Generate file from template and values. * - * @param templateFile file template to used - * @param repositoryDirectory lizmap repository - * @param voyageName project name - * @param templateValues values to used in the template + * @param templateFile file template to used + * @param target file to generate + * @param templateValues values to used in the template * @return file generated */ - public File generateFileFromTemplate(File templateFile, File repositoryDirectory, String voyageName, String... templateValues) { - - String fileName = voyageName + "." + Files.getFileExtension(templateFile.getAbsolutePath()); - File target = new File(repositoryDirectory, fileName); + public File generateFileFromTemplate(File templateFile, File target, String... templateValues) { if (!target.exists()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.