Author: tchemit Date: 2008-07-27 10:03:21 +0000 (Sun, 27 Jul 2008) New Revision: 928 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/ui/DemoMainUI.java Log: use ContextProvider + ActionHelper 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-27 10:02:45 UTC (rev 927) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-07-27 10:03:21 UTC (rev 928) @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.option.ContextProvider; import org.codelutin.option.OptionParserResult; import org.codelutin.option.ParserFailedException; -import org.codelutin.option.ContextProvider; import java.io.IOException; @@ -27,18 +27,15 @@ private static final Log log = LogFactory.getLog(DemoMain.class); - /** le context principal de l'application */ - protected static DemoContext context; - + /** @return le context applicatif. */ public static DemoContext getContext() { - checkInitContext(); - return context; + return (DemoContext) ContextProvider.get(); } /** * initialisation de l'application : * <p/> - * chargement du context + * chargement du context applicatif * * @param args les arguments pass�s � l'application */ @@ -46,7 +43,7 @@ try { // instanciate context, parser and configs - context = (DemoContext) ContextProvider.getContext(); + DemoContext context = (DemoContext) ContextProvider.init(); // init context context.init(args); @@ -100,10 +97,4 @@ } - public static void checkInitContext() { - if (context == null) { - throw new RuntimeException("context is null, you must init first the " + DemoContext.class.getName() + " class via init method"); - } - } - } 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-27 10:02:45 UTC (rev 927) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-27 10:03:21 UTC (rev 928) @@ -14,32 +14,22 @@ */ package org.codelutin.commandline.demo.ui; -import org.apache.commons.logging.Log; -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.CommandLineDemoBaseAction; -import static org.codelutin.i18n.I18n._; +import org.codelutin.option.ui.actions.ActionHelper; -import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.KeyStroke; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import java.util.Locale; -import java.util.regex.Matcher; /** @author chemit */ public class DemoMainUI extends JDemoMainUI { - /** log */ - private static final Log log = LogFactory.getLog(DemoMainUI.class); - public DemoMainUI() { + super(); - DemoMain.checkInitContext(); - finalizeInit(DemoMain.getContext()); } @@ -53,55 +43,7 @@ getRootPane().getActionMap().put("quit", context.getActionFactory().newAction("quit", null)); // repaint i18n actions - refreshI18nActions(context); - + ActionHelper.refreshI18nActions(context, context.getActionFactory(), this); } - /** - * Rafraichit les actions i18n dans le menu en fonction de la locale - * actuellement utilis�e. - * - * @param context application context - */ - public void refreshI18nActions(DemoContext context) { - - Locale locale = context.getMainConfig().getLocale(); - //CountryEnum country = context.getConfig().getUserCountry(); - String[] actions = context.getActionFactory().getActionNames(); - for (String actionName : actions) { - Matcher matcher = org.codelutin.option.ui.actions.ChangeLocaleAction.PATTERN_NAME.matcher(actionName); - if (!matcher.matches()) { - continue; - } - AbstractButton button = (AbstractButton) getObjectById(actionName); - 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); - UpdateButton(button, enable, enable ? action.getLocale() : null); - button.setEnabled(enable); - } - } - - public static void DisableButton(AbstractButton... buttons) { - for (AbstractButton button : buttons) { - UpdateButton(button, false); - } - } - - public static void EnableButton(AbstractButton button, Object... params) { - UpdateButton(button, true, params); - } - - public static void UpdateButton(AbstractButton button, boolean enabled, Object... params) { - button.setEnabled(enabled); - if (!enabled) { - button.setToolTipText(null); - } else { - CommandLineDemoBaseAction action = (CommandLineDemoBaseAction) button.getAction(); - String t = _(action.getI18nToolTipText(), params); - button.setToolTipText(t); - } - } }