Author: tchemit Date: 2013-02-04 01:39:02 +0100 (Mon, 04 Feb 2013) New Revision: 318 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/318 Log: reload i18n execpt when using full mode launch + improve configuration code Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-04 00:37:59 UTC (rev 317) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-04 00:39:02 UTC (rev 318) @@ -59,10 +59,8 @@ // prepare context (mainly init configs, i18n) context.init(); - String launchMode = config.getTuttiLaunchMode(); + if (config.isFullLaunchMode()) { - if ("full".equals(launchMode)) { - if (log.isInfoEnabled()) { log.info("Full launch mode, try to update jre / application."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-02-04 00:37:59 UTC (rev 317) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-02-04 00:39:02 UTC (rev 318) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -312,11 +313,20 @@ config.getServiceConfig().getPersistenceConfig().initConfig(getResourceLoader()); } catch (IOException e) { - throw new RuntimeException("Could not init adagio configuration", e); + throw new RuntimeException("Could not init persistence configuration", e); } // Initialize i18n File i18nDirectory = config.getI18nDirectory(); + if (!config.isFullLaunchMode()) { + + // clean i18n cache + try { + FileUtils.cleanDirectory(i18nDirectory); + } catch (IOException e) { + throw new RuntimeException("Could not delete i18n cache at " + i18nDirectory, e); + } + } Locale i18nLocale = config.getI18nLocale(); if (log.isInfoEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-02-04 00:37:59 UTC (rev 317) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-02-04 00:39:02 UTC (rev 318) @@ -148,6 +148,10 @@ return ReflectionToStringBuilder.toString(this); } + public boolean isFullLaunchMode() { + return "full".equals(getTuttiLaunchMode()); + } + public String getTuttiLaunchMode() { return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_LAUNCH_MODE.getKey()); }