Author: tchemit Date: 2008-03-16 21:10:15 +0000 (Sun, 16 Mar 2008) New Revision: 1369 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java Log: context is now responsible of init + save configs TODO put all config stuff in context ? instead of parser Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -61,7 +61,10 @@ try { // init context, parser and configs - context = new SimExplorerContext(args); + context = new SimExplorerContext(); + + context.init(args); + } catch (IOException e) { log.error("io error : " + e.getMessage()); e.printStackTrace(); @@ -132,7 +135,7 @@ init(args); // launch actions required - context.getParser().doAllActions(context); + context.getParser().getLastResult().doAllActions(context); // show edit config if first launch if (context.isFirstLaunch()) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -35,8 +35,6 @@ import org.codelutin.i18n.I18n; import org.codelutin.option.ParserFailedException; -import java.io.IOException; - /** * Le context de l'application, implanté en singleton. * <p/> @@ -180,14 +178,19 @@ /** * restricted access constructor * - * @param args argumentsfor parser * @throws java.io.IOException if pb while saing configuration * @throws ParserFailedException if pb while parsing arguments */ - SimExplorerContext(String... args) throws IOException, ParserFailedException { + SimExplorerContext() throws Exception { + super(); + } - super(args); + @Override + public void init(String[] args) throws Exception { + + super.init(args); + initServices(); } @@ -199,7 +202,7 @@ localService = new MockStorageServiceImpl(false); } else { try { - localService = new StorageServiceClient(getConfig().getSource().toString(), "local."); + localService = new StorageServiceClient(this.getSource().toString(), "local."); } catch (Exception e) { throw new SimExplorerRuntimeException(e); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -61,7 +61,7 @@ public ConfigUI getUi() { if (ui == null) { - ui = new ConfigUI().init(getContext().getConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); + ui = new ConfigUI().init(getContext(),getContext().getConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); } return ui; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -176,7 +176,7 @@ //always keep login getContext().getRemoteConfig().setLogin(login); //Save configuration, I don't like it, but required by client... - getContext().getConfig().saveSafely(); + getContext().saveSafely(); return isConnected; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -49,7 +49,7 @@ public void doAction(java.awt.event.ActionEvent e) { getContext().getRemoteConfig().setPassword(null); - getContext().getConfig().saveSafely(); + getContext().saveSafely(); if (getContext().isConnected()) { // unconnect Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -94,7 +94,7 @@ // serait toujours sur l'ancienne valeur ... getContext().initI18n(); // save config - getContext().getConfig().saveSafely(); + getContext().saveSafely(); // dispose then reload main ui SimExplorer.dispose(true); }