Author: tchemit Date: 2008-07-25 23:07:10 +0000 (Fri, 25 Jul 2008) New Revision: 922 Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties Log: use commons actions from commandline-ui-action Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-25 23:04:26 UTC (rev 921) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-25 23:07:10 UTC (rev 922) @@ -45,6 +45,20 @@ I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding()); } + public void dispose(boolean reload) { + + getActionFactory().dispose(); + + disposeUI(); + + //ErrorDialog.disposeUI(); + + if (reload) { + DemoMain.launch(); + } + + } + public JDemoMainUI getMainUI() { if (mainUI == null) { mainUI = new DemoMainUI(); Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-07-25 23:04:26 UTC (rev 921) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-07-25 23:07:10 UTC (rev 922) @@ -18,6 +18,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.option.OptionParserResult; import org.codelutin.option.ParserFailedException; +import org.codelutin.option.ContextProvider; import java.io.IOException; @@ -45,7 +46,7 @@ try { // instanciate context, parser and configs - context = new DemoContext(); + context = (DemoContext) ContextProvider.getContext(); // init context context.init(args); @@ -105,17 +106,4 @@ } } - public static void dispose(boolean reload) { - - getContext().getActionFactory().dispose(); - - getContext().disposeUI(); - - //ErrorDialog.disposeUI(); - - if (reload) { - launch(); - } - } - } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-25 23:04:26 UTC (rev 921) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-25 23:07:10 UTC (rev 922) @@ -18,7 +18,6 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.commandline.demo.DemoContext; import org.codelutin.commandline.demo.DemoMain; -import org.codelutin.commandline.demo.ui.actions.ChangeLocaleAction; import org.codelutin.commandline.demo.ui.actions.CommandLineDemoBaseAction; import static org.codelutin.i18n.I18n._; @@ -70,12 +69,13 @@ //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(); + CommandLineDemoBaseAction action1 = (CommandLineDemoBaseAction) button.getAction(); + org.codelutin.option.ui.actions.ChangeLocaleAction action = (org.codelutin.option.ui.actions.ChangeLocaleAction) action1.getDelegate(); boolean enable = !action.equalsLocale(locale); log.debug("incoming locale : " + locale); log.debug("load i18n action " + action + " is enable ? " + enable); Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-25 23:04:26 UTC (rev 921) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-25 23:07:10 UTC (rev 922) @@ -1,21 +1,3 @@ -commandlinedemo.action.about=About -commandlinedemo.action.about.help= -commandlinedemo.action.about.tooltip= -commandlinedemo.action.changeLocale.help= -commandlinedemo.action.changeLocale.tooltip= -commandlinedemo.action.config=Preferences -commandlinedemo.action.config.help= -commandlinedemo.action.config.tooltip= -commandlinedemo.action.help=Help -commandlinedemo.action.help.help= -commandlinedemo.action.help.tooltip= -commandlinedemo.action.quit=Quite -commandlinedemo.action.quit.help= -commandlinedemo.action.quit.tooltip= -commandlinedemo.action.site=Site -commandlinedemo.action.site.help= -commandlinedemo.action.site.tooltip= -commandlinedemo.close_question=Really quit ? commandlinedemo.config.main.configFileName.description= commandlinedemo.config.main.debugMode.description= commandlinedemo.config.main.description= @@ -34,8 +16,6 @@ commandlinedemo.config.remote.proxyLogin.description= commandlinedemo.config.remote.proxyPassword.description= commandlinedemo.config.remote.useProxy.description= -commandlinedemo.confirm.changeLanguage= -commandlinedemo.no=No commandlinedemo.option.description.changeConfig= commandlinedemo.option.description.changeFileConfig= commandlinedemo.option.description.editConfig= @@ -44,8 +24,6 @@ commandlinedemo.option.description.resetConfig= commandlinedemo.option.description.showConfig= commandlinedemo.option.description.ui= -commandlinedemo.question=Quit -commandlinedemo.yes=Yes mainui.menu.edit=Edit mainui.menu.file=File mainui.menu.help=Help Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-25 23:04:26 UTC (rev 921) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-25 23:07:10 UTC (rev 922) @@ -1,21 +1,3 @@ -commandlinedemo.action.about=A propos -commandlinedemo.action.about.help= -commandlinedemo.action.about.tooltip= -commandlinedemo.action.changeLocale.help= -commandlinedemo.action.changeLocale.tooltip= -commandlinedemo.action.config=Pr\u00E9f\u00E9rences -commandlinedemo.action.config.help= -commandlinedemo.action.config.tooltip= -commandlinedemo.action.help=Aide -commandlinedemo.action.help.help= -commandlinedemo.action.help.tooltip= -commandlinedemo.action.quit=Quitter -commandlinedemo.action.quit.help= -commandlinedemo.action.quit.tooltip= -commandlinedemo.action.site=Site -commandlinedemo.action.site.help= -commandlinedemo.action.site.tooltip= -commandlinedemo.close_question=Voulez-vous quitter ? commandlinedemo.config.main.configFileName.description= commandlinedemo.config.main.debugMode.description= commandlinedemo.config.main.description= @@ -34,8 +16,6 @@ commandlinedemo.config.remote.proxyLogin.description= commandlinedemo.config.remote.proxyPassword.description= commandlinedemo.config.remote.useProxy.description= -commandlinedemo.confirm.changeLanguage= -commandlinedemo.no=Non commandlinedemo.option.description.changeConfig= commandlinedemo.option.description.changeFileConfig= commandlinedemo.option.description.editConfig= @@ -44,8 +24,6 @@ commandlinedemo.option.description.resetConfig= commandlinedemo.option.description.showConfig= commandlinedemo.option.description.ui= -commandlinedemo.question=Quitter -commandlinedemo.yes=Oui mainui.menu.edit=Edit mainui.menu.file=Fichier mainui.menu.help=Aide