This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6eb2fec5a120e406d418e784d3c1e201d28a1ebf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:12:09 2015 +0100 Fermeture du context applicatif à la fermeture de l'application --- .../main/java/fr/ird/observe/ObserveRunner.java | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java index d4ca764..15517db 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -50,7 +50,7 @@ import org.nuiton.util.StringUtil; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import javax.swing.*; +import javax.swing.UIManager; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -61,8 +61,16 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.*; import static fr.ird.observe.ObserveResourceManager.Resource; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.DATA_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.DB_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.INITIAL_DB_DUMP; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.MAP_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.REPORT_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.TMP_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY; import static org.nuiton.i18n.I18n.t; /** @@ -376,13 +384,24 @@ public abstract class ObserveRunner extends ApplicationRunner { log.info("ObServe shutdown at " + new Date()); } - // on ferme le service de traduction uniquement si on quitte - // definitivement l'application - I18n.close(); + try { + + // on éteint le context applicatif + onClose(false); + + // on ferme le service de traduction uniquement si on quitte + // definitivement l'application + I18n.close(); + + getActionExecutor().terminatesAndWaits(); + + } finally { + + Runtime.getRuntime().halt(0); + + } - getActionExecutor().terminatesAndWaits(); - Runtime.getRuntime().halt(0); } @Override @@ -505,7 +524,7 @@ public abstract class ObserveRunner extends ApplicationRunner { } protected void detectLocalDataBase(ObserveSwingApplicationConfig config) throws IOException { - boolean hasLocalStorage = new File(config.getLocalDBDirectory(),ObserveSwingApplicationConfig.DB_NAME).exists(); + boolean hasLocalStorage = new File(config.getLocalDBDirectory(), ObserveSwingApplicationConfig.DB_NAME).exists(); config.setLocalStorageExist(hasLocalStorage); if (!hasLocalStorage) { if (log.isInfoEnabled()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.