Author: tchemit Date: 2008-07-26 11:23:03 +0000 (Sat, 26 Jul 2008) New Revision: 1517 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-swing/pom.xml 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/ui/SimExplorerMainUI.java Log: utilisation du module commandline-ui-action avec les actions de base (help,quit,i18n,config,about,help)... Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-07-25 16:07:36 UTC (rev 1516) +++ trunk/simexplorer-is/pom.xml 2008-07-26 11:23:03 UTC (rev 1517) @@ -455,6 +455,12 @@ <version>${commandline.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin.commandline</groupId> + <artifactId>commandline-ui-action</artifactId> + <version>${commandline.version}</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>javax.persistence</groupId> Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-07-25 16:07:36 UTC (rev 1516) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-07-26 11:23:03 UTC (rev 1517) @@ -242,6 +242,10 @@ <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-ui</artifactId> </dependency> + <dependency> + <groupId>org.codelutin.commandline</groupId> + <artifactId>commandline-ui-action</artifactId> + </dependency> <!-- librairie jaxx --> <dependency> <groupId>org.codelutin.jaxx</groupId> 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-07-25 16:07:36 UTC (rev 1516) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-26 11:23:03 UTC (rev 1517) @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.i18n.I18n; +import org.codelutin.option.ContextProvider; import org.codelutin.option.ParserFailedException; import java.awt.event.ActionEvent; @@ -59,7 +60,7 @@ try { // instanciate context, parser and configs - context = new SimExplorerContext(); + context = (SimExplorerContext) ContextProvider.getContext(); // init context context.init(args); 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-07-25 16:07:36 UTC (rev 1516) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-07-26 11:23:03 UTC (rev 1517) @@ -32,9 +32,11 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; +import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; +import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; import org.codelutin.i18n.I18n; import org.codelutin.jaxx.action.factory.ActionFactory; -import org.codelutin.option.ParserFailedException; /** * Le context de l'application, implanté en singleton. @@ -104,7 +106,18 @@ I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding()); } + public void dispose(boolean reload) { + SimExplorerTab.dispose(); + getActionFactory().dispose(); + ErrorDialog.disposeUI(); + SimExplorerMainUI.getUI().disposeUI(); + if (reload) { + SimExplorer.launch(); + } + } + + public void initServices() { // init local service getLocalStorageService(); @@ -199,12 +212,11 @@ } /** - * restricted access constructor + * public access constructor to make it instanciable vai a {@link java.util.ServiceLoader} * - * @throws java.io.IOException if pb while saing configuration - * @throws ParserFailedException if pb while parsing arguments + * @throws Exception if any execption while init the context */ - SimExplorerContext() throws Exception { + public SimExplorerContext() throws Exception { super(); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-25 16:07:36 UTC (rev 1516) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-26 11:23:03 UTC (rev 1517) @@ -22,7 +22,6 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import static org.codelutin.i18n.I18n._; @@ -133,14 +132,15 @@ //CountryEnum country = context.getConfig().getUserCountry(); String[] actions = context.getActionFactory().getActionNames(); for (String actionName : actions) { - Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); + Matcher matcher = org.codelutin.option.ui.actions.ChangeLocaleAction.PATTERN_NAME.matcher(actionName); if (!matcher.matches()) { continue; } AbstractButton button = (AbstractButton) getObjectById(actionName); - ChangeLocaleAction action = (ChangeLocaleAction) button.getAction(); - boolean enable = !action.equalsLocale(locale); - UpdateButton(button, enable, enable ? action.getLocale() : null); + SimExplorerBaseAction action = (SimExplorerBaseAction) button.getAction(); + org.codelutin.option.ui.actions.ChangeLocaleAction realAction = (org.codelutin.option.ui.actions.ChangeLocaleAction) action.getDelegate(); + boolean enable = !realAction.equalsLocale(locale); + UpdateButton(button, enable, enable ? realAction.getLocale() : null); //button.setEnabled(enable); } }