Author: mallon Date: 2012-07-16 11:51:27 +0200 (Mon, 16 Jul 2012) New Revision: 3528 Url: http://chorem.org/repositories/revision/lima/3528 Log: Correction du syst?\195?\168me de cr?\195?\169ation de fichier xml utilis?\195?\169e par la librairie swing.widgets (Etat de l'application), via la classe LimaConfig (Ajout d'une entr?\195?\169e "LIMA_STATE_DIR") Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-07-16 09:51:27 UTC (rev 3528) @@ -25,16 +25,7 @@ package org.chorem.lima; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; - -import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.IOException; -import java.util.Locale; - import jaxx.runtime.JAXXUtil; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,6 +40,14 @@ import org.nuiton.util.VersionUtil; import org.nuiton.util.converter.ConverterUtil; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.IOException; +import java.util.Locale; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + /** * La configuration de l'application. * @@ -337,6 +336,11 @@ return result; } + public File getLimaStateDirectory() { + File result = getOptionAsFile(Option.LIMA_STATE_DIRECTORY.key); + return result; + } + public File getResourcesDirectory() { File result = getOptionAsFile(Option.RESOURCES_DIRECTORY.key); return result; @@ -395,7 +399,8 @@ LAUNCH_UI("lima.ui.launchui", n_("lima.config.ui.flaunchui.description"), "true", Boolean.class, true, true), SUPPORT_EMAIL("lima.misc.supportemail", n_("lima.misc.supportemail.description"), "support@codelutin.com", String.class, false, false), OPENEJB_REMOTEMODE("lima.openejb.remotemode", n_("lima.openejb.remotemode.description"), "false", String.class, false, false), - LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false); + LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false), + LIMA_STATE_DIRECTORY("lima.state.dir", n_("lima.config.state.dir"), "${lima.data.dir}/limaState.xml", String.class, false, false); public final String key; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-07-16 09:51:27 UTC (rev 3528) @@ -98,7 +98,7 @@ // show main ui MainView ui = new MainView(rootContext); - swingSession = new SwingSession(createFileLimaState(), false); + swingSession = new SwingSession(getLimaStateFile(), false); LimaContext.MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); @@ -108,24 +108,14 @@ return ui; } - //Creation of xml lima state file - protected File createFileLimaState(){ - File limaStateDir = new File("././.lima/reports"); - File limaState = new File("././.lima/reports/limaState.xml"); + //Get xml lima state file + protected File getLimaStateFile(){ - try { - if(!limaStateDir.exists()){ - limaStateDir.mkdirs(); - } - if(!limaState.exists()){ - limaState.createNewFile(); - } - } catch (Exception ex) { - if (log.isInfoEnabled()) { - log.info("can't create lima state file : " + ex.getMessage(), ex); - } - } - return limaState; + LimaConfig limaConfig = LimaConfig.getInstance(); + + File limaStateFile = limaConfig.getLimaStateDirectory(); + + return limaStateFile; } public void changeLanguage(MainView mainUI, Locale newLocale) { Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-07-16 09:51:27 UTC (rev 3528) @@ -75,6 +75,7 @@ lima.config.data.dir.description= lima.config.decimalseparator.description= lima.config.host.adress=Host adress +lima.config.state.dir=State file of LIMA lima.config.i18n.dir.description= lima.config.locale.description=Localization used by LIMA lima.config.resources.dir.description= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-07-16 09:51:27 UTC (rev 3528) @@ -75,6 +75,7 @@ lima.config.data.dir.description= lima.config.decimalseparator.description= lima.config.host.adress=Adresse du serveur distant +lima.config.state.dir=Fichier d'état de l'application lima.config.i18n.dir.description= lima.config.locale.description=Locale utilisée par l'application lima.config.resources.dir.description=