Author: tchemit Date: 2008-07-24 21:00:10 +0000 (Thu, 24 Jul 2008) New Revision: 897 Modified: trunk/commandline/commandline-demo/pom.xml trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java Log: update from jaxx-swing-action framework Modified: trunk/commandline/commandline-demo/pom.xml =================================================================== --- trunk/commandline/commandline-demo/pom.xml 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/pom.xml 2008-07-24 21:00:10 UTC (rev 897) @@ -170,7 +170,7 @@ </goals> <configuration> <fqn>org.codelutin.commandline.demo.ui.MyActionProvider</fqn> - <fqnAction>org.codelutin.commandline.demo.ui.actions.MyAbstractAction</fqnAction> + <fqnAction>org.codelutin.commandline.demo.ui.actions.CommandLineAction</fqnAction> <providerName>commandlinedemo</providerName> </configuration> </execution> Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java 2008-07-24 21:00:10 UTC (rev 897) @@ -16,7 +16,10 @@ import org.codelutin.commandline.demo.ui.JMainUI; import org.codelutin.commandline.demo.ui.MyMainUI; +import org.codelutin.commandline.demo.ui.actions.CommandLineAction; import org.codelutin.i18n.I18n; +import org.codelutin.jaxx.action.factory.ActionFactory; +import org.codelutin.jaxx.action.factory.ActionFactoryFromProvider; /** @author chemit */ public class MyContext extends CommandLineDemoAbstractContext { @@ -24,10 +27,20 @@ /** main UI */ protected JMainUI mainUI; + /** l'usine d'actions */ + private ActionFactory<CommandLineAction> actionFactory; + public MyContext() throws Exception { super(); } + public ActionFactory<CommandLineAction> getActionFactory() { + if (actionFactory == null) { + actionFactory = ActionFactoryFromProvider.newInstance(CommandLineAction.class); + } + return actionFactory; + } + public void initI18n() { I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding()); } @@ -45,4 +58,5 @@ mainUI = null; } } + } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java 2008-07-24 21:00:10 UTC (rev 897) @@ -16,7 +16,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.commandline.demo.ui.MyActionManager; import org.codelutin.option.OptionParserResult; import org.codelutin.option.ParserFailedException; @@ -70,9 +69,9 @@ /** Lancement de l'ui apr�s init de l'application. */ public static void launch() { - + getContext().getMainUI().setVisible(true); - + } @@ -108,7 +107,7 @@ public static void dispose(boolean reload) { - MyActionManager.dispose(); + getContext().getActionFactory().dispose(); getContext().disposeUI(); Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java 2008-07-24 21:00:10 UTC (rev 897) @@ -19,7 +19,7 @@ import org.codelutin.commandline.demo.MyContext; import org.codelutin.commandline.demo.MyMain; import org.codelutin.commandline.demo.ui.actions.ChangeLocaleAction; -import org.codelutin.commandline.demo.ui.actions.MyAbstractAction; +import org.codelutin.commandline.demo.ui.actions.CommandLineAction; import static org.codelutin.i18n.I18n._; import javax.swing.AbstractButton; @@ -48,10 +48,10 @@ protected void finalizeInit(MyContext context) { // chargement dans l'ui des actions - MyActionManager.loadActions(this); + context.getActionFactory().loadActions(this); getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.ALT_MASK), "quit"); - getRootPane().getActionMap().put("quit", MyActionManager.newAction("quit")); + getRootPane().getActionMap().put("quit", context.getActionFactory().newAction("quit", null)); // repaint i18n actions refreshI18nActions(context); @@ -68,7 +68,7 @@ Locale locale = context.getMainConfig().getLocale(); //CountryEnum country = context.getConfig().getUserCountry(); - String[] actions = MyActionManager.getFactory().getActionNames(); + String[] actions = context.getActionFactory().getActionNames(); for (String actionName : actions) { Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); if (!matcher.matches()) { @@ -99,7 +99,7 @@ if (!enabled) { button.setToolTipText(null); } else { - MyAbstractAction action = (MyAbstractAction) button.getAction(); + CommandLineAction action = (CommandLineAction) button.getAction(); String t = _(action.getI18nToolTipText(), params); button.setToolTipText(t); } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -28,7 +28,7 @@ mnemonic = 'a', hideActionText = false ) -public class AboutAction extends MyAbstractAction { +public class AboutAction extends CommandLineAction { private static final long serialVersionUID = 9050439968144935986L; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -41,7 +41,7 @@ multiNames = {"i18n_fr", "i18n_en"} ) @org.codelutin.i18n.I18nable -public class ChangeLocaleAction extends MyAbstractAction { +public class ChangeLocaleAction extends CommandLineAction { public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)"); Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -14,96 +14,37 @@ */ package org.codelutin.commandline.demo.ui.actions; -import jaxx.runtime.JAXXObject; -import org.apache.commons.logging.LogFactory; import org.codelutin.commandline.demo.MyContext; import org.codelutin.commandline.demo.MyMain; +import org.codelutin.jaxx.action.MyAbstractAction; -import javax.swing.AbstractAction; -import javax.swing.JComponent; import java.awt.event.ActionEvent; /** @author chemit */ -public abstract class CommandLineAction extends AbstractAction { +public class CommandLineAction extends MyAbstractAction { - static org.apache.commons.logging.Log log = LogFactory.getLog(CommandLineAction.class); - private static final long serialVersionUID = -810023044364620841L; protected ActionEvent e; - public void actionPerformed(java.awt.event.ActionEvent e) { + protected String getPrefix() { + return "commandlinedemo"; + } - log.debug("------------------------------------------------------------"); - log.debug("event : " + e); - log.debug("source : " + e.getSource()); - this.e = e; - try { - boolean accepted = beforeAction(e); - log.debug("action : " + this); - if (accepted) { - log.info(getActionName() + " (treate:" + accepted + ") : " + this); - } else { - log.debug(getActionName() + " (treate:" + accepted + ") : " + this); - } - if (accepted) { - doAction(e); - updateUI(); - } - } catch (Exception e1) { - showError(e1); - } finally { - this.e = null; - // always clear action after use : actions are staless - clear(); + protected CommandLineAction(String name) { + super(name); + if (log.isTraceEnabled()) { + log.trace("> " + this); } } - protected String getActionName() { - return (String) getValue(ACTION_COMMAND_KEY); - } - - protected boolean beforeAction(ActionEvent e) throws Exception { - return isEnabled(); - } - - protected JComponent getUIObject(String name, JAXXObject container) { - if (container == null) { - return null; + public CommandLineAction(MyAbstractAction delegate) { + super(delegate); + if (log.isTraceEnabled()) { + log.trace("> " + this); } - return (JComponent) container.getObjectById(name); } - public String getI18nToolTipText() { - return "commandlinedemo.action." + getActionName() + ".tooltip"; - } - - protected void doAction(ActionEvent e) throws Exception { - // nothing by default - } - - public void updateUI() { - // nothing by default - } - - public void disposeUI() { - // nothing by default - } - - protected void clear() { - // nothing by default - } - - - protected void showError(Exception e) { - log.error(e); - } - - protected CommandLineAction(String name) { - super(name); - log.debug("> " + this); - } - protected MyContext getContext() { return MyMain.getContext(); } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -31,7 +31,7 @@ mnemonic = 'P', hideActionText = false ) -public class ConfigAction extends MyAbstractAction { +public class ConfigAction extends CommandLineAction { ConfigUI ui; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -28,7 +28,7 @@ mnemonic = 'h', hideActionText = false ) -public class HelpAction extends MyAbstractAction { +public class HelpAction extends CommandLineAction { private static final long serialVersionUID = 9050439968144935986L; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -35,7 +35,7 @@ mnemonic = 'q', hideActionText = false ) -public class QuitAction extends MyAbstractAction { +public class QuitAction extends CommandLineAction { private static final long serialVersionUID = 9050439968144935986L; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-24 20:47:24 UTC (rev 896) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-24 21:00:10 UTC (rev 897) @@ -33,7 +33,7 @@ mnemonic = 's', hideActionText = false ) -public class SiteAction extends MyAbstractAction { +public class SiteAction extends CommandLineAction { private static final long serialVersionUID = 9050439968144935986L; protected URL siteUrl;