July 2008 - Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r906 - trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:08:20 +0000 (Thu, 24 Jul 2008) New Revision: 906 Added: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx Removed: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JMainUI.jaxx Log: demo :) Copied: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx (from rev 891, trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JMainUI.jaxx) =================================================================== --- trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx (rev 0) +++ trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-07-24 21:08:20 UTC (rev 906) @@ -0,0 +1,34 @@ +<JFrame title="mainui.title" width="1024" height="768" defaultCloseOperation="dispose_on_close"> + <JMenuBar> + <JMenu text="mainui.menu.file"> + <JMenuItem id="quit"/> + </JMenu> + <JMenu text="mainui.menu.edit"> + <JMenuItem id="config"/> + </JMenu> + <JMenu text="mainui.menu.help" mnemonic="{'H'}"> + <JMenuItem id="help"/> + <JMenuItem id="site"/> + <JMenuItem id="about"/> + <JMenu text='mainui.menu.help.i18n' mnemonic="{'L'}" + icon='{createImageIcon("action/translate.png")}'> + <JMenuItem id="i18n_fr"/> + <JMenuItem id="i18n_en"/> + </JMenu> + </JMenu> + </JMenuBar> + <Table insets='0,0,0,0'> +  + <row fill="both" weightx="1" weighty="1"> + <cell> + <JTabbedPane id="contentTabbedPane"/> + </cell> + </row> +  + <row> + <cell fill="both"> + <org.codelutin.widget.StatusBar id='statusBar'/> + </cell> + </row> + </Table> +</JFrame> \ No newline at end of file Deleted: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JMainUI.jaxx =================================================================== --- trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JMainUI.jaxx 2008-07-24 21:07:45 UTC (rev 905) +++ trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JMainUI.jaxx 2008-07-24 21:08:20 UTC (rev 906) @@ -1,34 +0,0 @@ -<JFrame title="mainui.title" width="1024" height="768" defaultCloseOperation="dispose_on_close"> - <JMenuBar> - <JMenu text="mainui.menu.file"> - <JMenuItem id="quit"/> - </JMenu> - <JMenu text="mainui.menu.edit"> - <JMenuItem id="config"/> - </JMenu> - <JMenu text="mainui.menu.help" mnemonic="{'H'}"> - <JMenuItem id="help"/> - <JMenuItem id="site"/> - <JMenuItem id="about"/> - <JMenu text='mainui.menu.help.i18n' mnemonic="{'L'}" - icon='{createImageIcon("action/translate.png")}'> - <JMenuItem id="i18n_fr"/> - <JMenuItem id="i18n_en"/> - </JMenu> - </JMenu> - </JMenuBar> - <Table insets='0,0,0,0'> -  - <row fill="both" weightx="1" weighty="1"> - <cell> - <JTabbedPane id="contentTabbedPane"/> - </cell> - </row> -  - <row> - <cell fill="both"> - <org.codelutin.widget.StatusBar id='statusBar'/> - </cell> - </row> - </Table> -</JFrame> \ No newline at end of file

1 0

[Lutinutil-commits] r905 - in trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo: . ui
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:07:45 +0000 (Thu, 24 Jul 2008) New Revision: 905 Added: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java Removed: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java Log: demo :) 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-24 21:07:14 UTC (rev 904) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-24 21:07:45 UTC (rev 905) @@ -15,7 +15,7 @@ package org.codelutin.commandline.demo; import org.codelutin.commandline.demo.ui.JMainUI; -import org.codelutin.commandline.demo.ui.MyMainUI; +import org.codelutin.commandline.demo.ui.DemoMainUI; import org.codelutin.commandline.demo.ui.actions.CommandLineAction; import org.codelutin.i18n.I18n; import org.codelutin.jaxx.action.factory.ActionFactory; @@ -47,7 +47,7 @@ public JMainUI getMainUI() { if (mainUI == null) { - mainUI = new MyMainUI(); + mainUI = new DemoMainUI(); } return mainUI; } Copied: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java (from rev 903, 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/DemoMainUI.java (rev 0) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-24 21:07:45 UTC (rev 905) @@ -0,0 +1,107 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +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.ChangeLocaleAction; +import org.codelutin.commandline.demo.ui.actions.CommandLineAction; +import static org.codelutin.i18n.I18n._; + +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 JMainUI { + + /** log */ + private static final Log log = LogFactory.getLog(DemoMainUI.class); + + public DemoMainUI() { + super(); + + DemoMain.checkInitContext(); + + finalizeInit(DemoMain.getContext()); + + } + + protected void finalizeInit(DemoContext context) { + + // chargement dans l'ui des actions + 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", context.getActionFactory().newAction("quit", null)); + + // repaint i18n actions + refreshI18nActions(context); + + } + + /** + * 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 = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); + if (!matcher.matches()) { + continue; + } + AbstractButton button = (AbstractButton) getObjectById(actionName); + ChangeLocaleAction action = (ChangeLocaleAction) button.getAction(); + 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 { + CommandLineAction action = (CommandLineAction) button.getAction(); + String t = _(action.getI18nToolTipText(), params); + button.setToolTipText(t); + } + } +} Deleted: 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 21:07:14 UTC (rev 904) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java 2008-07-24 21:07:45 UTC (rev 905) @@ -1,107 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -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.ChangeLocaleAction; -import org.codelutin.commandline.demo.ui.actions.CommandLineAction; -import static org.codelutin.i18n.I18n._; - -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 MyMainUI extends JMainUI { - - /** log */ - private static final Log log = LogFactory.getLog(MyMainUI.class); - - public MyMainUI() { - super(); - - DemoMain.checkInitContext(); - - finalizeInit(DemoMain.getContext()); - - } - - protected void finalizeInit(DemoContext context) { - - // chargement dans l'ui des actions - 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", context.getActionFactory().newAction("quit", null)); - - // repaint i18n actions - refreshI18nActions(context); - - } - - /** - * 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 = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); - if (!matcher.matches()) { - continue; - } - AbstractButton button = (AbstractButton) getObjectById(actionName); - ChangeLocaleAction action = (ChangeLocaleAction) button.getAction(); - 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 { - CommandLineAction action = (CommandLineAction) button.getAction(); - String t = _(action.getI18nToolTipText(), params); - button.setToolTipText(t); - } - } -}

1 0

[Lutinutil-commits] r904 - trunk/commandline/commandline-demo
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:07:14 +0000 (Thu, 24 Jul 2008) New Revision: 904 Modified: trunk/commandline/commandline-demo/pom.xml Log: demo :) Modified: trunk/commandline/commandline-demo/pom.xml =================================================================== --- trunk/commandline/commandline-demo/pom.xml 2008-07-24 21:07:03 UTC (rev 903) +++ trunk/commandline/commandline-demo/pom.xml 2008-07-24 21:07:14 UTC (rev 904) @@ -58,7 +58,7 @@ <properties>  - <maven.jar.main.class>org.codelutin.commandline.demo.MyMain</maven.jar.main.class> + <maven.jar.main.class>org.codelutin.commandline.demo.DemoMain</maven.jar.main.class> </properties>

1 0

[Lutinutil-commits] r903 - in trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo: . ui ui/actions
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:07:03 +0000 (Thu, 24 Jul 2008) New Revision: 903 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/MyMainUI.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java Log: demo :) 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-24 21:06:51 UTC (rev 902) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-07-24 21:07:03 UTC (rev 903) @@ -27,9 +27,9 @@ private static final Log log = LogFactory.getLog(DemoMain.class); /** le context principal de l'application */ - protected static MyContext context; + protected static DemoContext context; - public static MyContext getContext() { + public static DemoContext getContext() { checkInitContext(); return context; } @@ -45,7 +45,7 @@ try { // instanciate context, parser and configs - context = new MyContext(); + context = new DemoContext(); // init context context.init(args); @@ -101,7 +101,7 @@ public static void checkInitContext() { if (context == null) { - throw new RuntimeException("context is null, you must init first the " + MyContext.class.getName() + " class via init method"); + 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/MyMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java 2008-07-24 21:06:51 UTC (rev 902) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java 2008-07-24 21:07:03 UTC (rev 903) @@ -16,7 +16,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.commandline.demo.MyContext; +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.CommandLineAction; @@ -45,7 +45,7 @@ } - protected void finalizeInit(MyContext context) { + protected void finalizeInit(DemoContext context) { // chargement dans l'ui des actions context.getActionFactory().loadActions(this); @@ -64,7 +64,7 @@ * * @param context application context */ - public void refreshI18nActions(MyContext context) { + public void refreshI18nActions(DemoContext context) { Locale locale = context.getMainConfig().getLocale(); //CountryEnum country = context.getConfig().getUserCountry(); 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 21:06:51 UTC (rev 902) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java 2008-07-24 21:07:03 UTC (rev 903) @@ -14,7 +14,7 @@ */ package org.codelutin.commandline.demo.ui.actions; -import org.codelutin.commandline.demo.MyContext; +import org.codelutin.commandline.demo.DemoContext; import org.codelutin.commandline.demo.DemoMain; import org.codelutin.jaxx.action.MyAbstractAction; @@ -45,7 +45,7 @@ } } - protected MyContext getContext() { + protected DemoContext getContext() { return DemoMain.getContext(); }

1 0

[Lutinutil-commits] r902 - trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:06:51 +0000 (Thu, 24 Jul 2008) New Revision: 902 Added: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java Removed: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java Log: demo :) Copied: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java (from rev 897, trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java) =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java (rev 0) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-24 21:06:51 UTC (rev 902) @@ -0,0 +1,62 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.commandline.demo; + +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 DemoContext extends CommandLineDemoAbstractContext { + + /** main UI */ + protected JMainUI mainUI; + + /** l'usine d'actions */ + private ActionFactory<CommandLineAction> actionFactory; + + public DemoContext() 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()); + } + + public JMainUI getMainUI() { + if (mainUI == null) { + mainUI = new MyMainUI(); + } + return mainUI; + } + + public void disposeUI() { + if (mainUI != null) { + mainUI.dispose(); + mainUI = null; + } + } + +} Deleted: 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 21:06:38 UTC (rev 901) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyContext.java 2008-07-24 21:06:51 UTC (rev 902) @@ -1,62 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.commandline.demo; - -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 { - - /** 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()); - } - - public JMainUI getMainUI() { - if (mainUI == null) { - mainUI = new MyMainUI(); - } - return mainUI; - } - - public void disposeUI() { - if (mainUI != null) { - mainUI.dispose(); - mainUI = null; - } - } - -}

1 0

[Lutinutil-commits] r901 - in trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui: . actions
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:06:38 +0000 (Thu, 24 Jul 2008) New Revision: 901 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/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/QuitAction.java Log: demo :) 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 21:06:28 UTC (rev 900) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyMainUI.java 2008-07-24 21:06:38 UTC (rev 901) @@ -17,7 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.commandline.demo.MyContext; -import org.codelutin.commandline.demo.MyMain; +import org.codelutin.commandline.demo.DemoMain; import org.codelutin.commandline.demo.ui.actions.ChangeLocaleAction; import org.codelutin.commandline.demo.ui.actions.CommandLineAction; import static org.codelutin.i18n.I18n._; @@ -39,9 +39,9 @@ public MyMainUI() { super(); - MyMain.checkInitContext(); + DemoMain.checkInitContext(); - finalizeInit(MyMain.getContext()); + finalizeInit(DemoMain.getContext()); } 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 21:06:28 UTC (rev 900) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-24 21:06:38 UTC (rev 901) @@ -16,7 +16,7 @@ /** @author chemit */ -import org.codelutin.commandline.demo.MyMain; +import org.codelutin.commandline.demo.DemoMain; import static org.codelutin.i18n.I18n._; import javax.swing.Action; @@ -93,7 +93,7 @@ // save config getContext().saveSafely(); // dispose then reload main ui - MyMain.dispose(true); + DemoMain.dispose(true); } @Override 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 21:06:28 UTC (rev 900) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java 2008-07-24 21:06:38 UTC (rev 901) @@ -15,7 +15,7 @@ package org.codelutin.commandline.demo.ui.actions; import org.codelutin.commandline.demo.MyContext; -import org.codelutin.commandline.demo.MyMain; +import org.codelutin.commandline.demo.DemoMain; import org.codelutin.jaxx.action.MyAbstractAction; import java.awt.event.ActionEvent; @@ -46,7 +46,7 @@ } protected MyContext getContext() { - return MyMain.getContext(); + return DemoMain.getContext(); } 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 21:06:28 UTC (rev 900) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-24 21:06:38 UTC (rev 901) @@ -15,7 +15,7 @@ package org.codelutin.commandline.demo.ui.actions; import static org.codelutin.i18n.I18n._; -import org.codelutin.commandline.demo.MyMain; +import org.codelutin.commandline.demo.DemoMain; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; @@ -69,7 +69,7 @@ @Override public void doAction(java.awt.event.ActionEvent e) { - MyMain.dispose(false); + DemoMain.dispose(false); } @Override

1 0

[Lutinutil-commits] r900 - trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:06:28 +0000 (Thu, 24 Jul 2008) New Revision: 900 Added: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java Removed: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java Log: demo :) Copied: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java (from rev 897, trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java) =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java (rev 0) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-07-24 21:06:28 UTC (rev 900) @@ -0,0 +1,121 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.commandline.demo; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.option.OptionParserResult; +import org.codelutin.option.ParserFailedException; + +import java.io.IOException; + +/** @author chemit */ +public class DemoMain { + + private static final Log log = LogFactory.getLog(DemoMain.class); + + /** le context principal de l'application */ + protected static MyContext context; + + public static MyContext getContext() { + checkInitContext(); + return context; + } + + /** + * initialisation de l'application : + * <p/> + * chargement du context + * + * @param args les arguments pass�s � l'application + */ + public static synchronized void init(String... args) { + + try { + // instanciate context, parser and configs + context = new MyContext(); + + // init context + context.init(args); + + } catch (IOException e) { + log.error("io error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + + } catch (ParserFailedException e) { + log.error("parser error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (Exception e) { + log.error("fatal error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } + + } + + /** Lancement de l'ui apr�s init de l'application. */ + public static void launch() { + + getContext().getMainUI().setVisible(true); + + } + + + /** @param args les arguments pass�s au programme */ + public static void main(String[] args) { + + init(args); + + try { + OptionParserResult optionParserResult = getContext().getParser().getLastResult(); + if (optionParserResult.size() > 0) { + optionParserResult.doAllActions(getContext()); + } + } catch (Exception e) { + log.error("a problem occurs while treating commandline : " + e.getMessage(), e); + //TODO should we stop ? + } + + if (getContext().isQuit() || !getContext().isUseUI()) { + // nothing more to be done here + return; + } + + launch(); + + } + + public static void checkInitContext() { + if (context == null) { + throw new RuntimeException("context is null, you must init first the " + MyContext.class.getName() + " class via init method"); + } + } + + public static void dispose(boolean reload) { + + getContext().getActionFactory().dispose(); + + getContext().disposeUI(); + + //ErrorDialog.disposeUI(); + + if (reload) { + launch(); + } + } + +} Deleted: 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 21:00:46 UTC (rev 899) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java 2008-07-24 21:06:28 UTC (rev 900) @@ -1,121 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.commandline.demo; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.option.OptionParserResult; -import org.codelutin.option.ParserFailedException; - -import java.io.IOException; - -/** @author chemit */ -public class MyMain { - - private static final Log log = LogFactory.getLog(MyMain.class); - - /** le context principal de l'application */ - protected static MyContext context; - - public static MyContext getContext() { - checkInitContext(); - return context; - } - - /** - * initialisation de l'application : - * <p/> - * chargement du context - * - * @param args les arguments pass�s � l'application - */ - public static synchronized void init(String... args) { - - try { - // instanciate context, parser and configs - context = new MyContext(); - - // init context - context.init(args); - - } catch (IOException e) { - log.error("io error : " + e.getMessage()); - e.printStackTrace(); - System.exit(1); - - } catch (ParserFailedException e) { - log.error("parser error : " + e.getMessage()); - e.printStackTrace(); - System.exit(1); - } catch (Exception e) { - log.error("fatal error : " + e.getMessage()); - e.printStackTrace(); - System.exit(1); - } - - } - - /** Lancement de l'ui apr�s init de l'application. */ - public static void launch() { - - getContext().getMainUI().setVisible(true); - - } - - - /** @param args les arguments pass�s au programme */ - public static void main(String[] args) { - - init(args); - - try { - OptionParserResult optionParserResult = getContext().getParser().getLastResult(); - if (optionParserResult.size() > 0) { - optionParserResult.doAllActions(getContext()); - } - } catch (Exception e) { - log.error("a problem occurs while treating commandline : " + e.getMessage(), e); - //TODO should we stop ? - } - - if (getContext().isQuit() || !getContext().isUseUI()) { - // nothing more to be done here - return; - } - - launch(); - - } - - public static void checkInitContext() { - if (context == null) { - throw new RuntimeException("context is null, you must init first the " + MyContext.class.getName() + " class via init method"); - } - } - - public static void dispose(boolean reload) { - - getContext().getActionFactory().dispose(); - - getContext().disposeUI(); - - //ErrorDialog.disposeUI(); - - if (reload) { - launch(); - } - } - -}

1 0

[Lutinutil-commits] r899 - trunk/commandline/commandline-demo
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:00:46 +0000 (Thu, 24 Jul 2008) New Revision: 899 Modified: trunk/commandline/commandline-demo/run-demo.sh Log: suppression des logs a chaque demarrage Modified: trunk/commandline/commandline-demo/run-demo.sh =================================================================== --- trunk/commandline/commandline-demo/run-demo.sh 2008-07-24 21:00:19 UTC (rev 898) +++ trunk/commandline/commandline-demo/run-demo.sh 2008-07-24 21:00:46 UTC (rev 899) @@ -32,6 +32,7 @@ dir=$(dirname $0) cd $dir +rm -f demo.log 2>&1 ############################################################################### ####### launch appli ########################################################## ###############################################################################

1 0

[Lutinutil-commits] r898 - in trunk/commandline/commandline-demo/src/main: java/org/codelutin/commandline/demo/ui resources
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 21:00:19 +0000 (Thu, 24 Jul 2008) New Revision: 898 Removed: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyActionManager.java Modified: trunk/commandline/commandline-demo/src/main/resources/log4j.properties Log: update from jaxx-swing-action framework Deleted: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyActionManager.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyActionManager.java 2008-07-24 21:00:10 UTC (rev 897) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/MyActionManager.java 2008-07-24 21:00:19 UTC (rev 898) @@ -1,116 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.commandline.demo.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.jaxx.action.ActionFactoryFromProvider; -import org.codelutin.jaxx.action.ActionFactory; -import org.codelutin.commandline.demo.ui.actions.MyAbstractAction; - -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.JComboBox; - -import jaxx.runtime.JAXXObject; - -import java.awt.event.ActionEvent; - -/** @author chemit */ -public class MyActionManager { - - private static final Log log = LogFactory.getLog(MyActionManager.class); - - /** l'usine d'actions */ - private static ActionFactory factory; - - /** - * @param ui l'ui � charger - * @return le tableau des actions instanci�es ou r�cup�r�es du cache de - * la factory - */ - public static AbstractAction[] loadActions(JAXXObject ui) { - AbstractAction[] actions; - actions = getFactory().loadActions(ui); - return actions; - - } - - /** - * Retourne (et instancie la premi�re fois l'usine d'actions) - * - * @return l'usine d'actions - * @see org.codelutin.jaxx.action.ActionFactory - */ - public static ActionFactory getFactory() { - if (factory == null) { - // used a simple factory implementation - factory = new ActionFactoryFromProvider(); - } - return factory; - } - - public static void fireAction(String actionKey, Object source) { - fireAction(actionKey, source, (AbstractButton) null); - } - - - public static AbstractAction newAction(String actionKey) { - return newAction(actionKey, (AbstractButton) null); - } - - public static void resetCache() { - getFactory().resetCache(); - } - - public static void dispose() { - resetCache(); - for (String actionKey : getFactory().getActionNames()) { - MyAbstractAction action = (MyAbstractAction) newAction(actionKey); - if (action != null) { - action.disposeUI(); - } - } - } - - - public static void fireAction(String actionKey, Object source, AbstractButton component) { - AbstractAction action = newAction(actionKey, component); - fireAction0(actionKey, source, action); - } - - public static void fireAction(String actionKey, Object source, JComboBox component) { - AbstractAction action = newAction(actionKey, component); - fireAction0(actionKey, source, action); - } - - protected static AbstractAction newAction(String actionKey, AbstractButton component) { - return getFactory().newAction(actionKey, component); - } - - protected static AbstractAction newAction(String actionKey, JComboBox component) { - return getFactory().newAction(actionKey, component); - } - - protected static void fireAction0(String actionKey, Object source, AbstractAction action) { - if (action == null) { - log.warn("could not find action " + actionKey); - return; - } - ActionEvent event = new ActionEvent(source, ActionEvent.ACTION_FIRST, actionKey); - action.actionPerformed(event); - } - -} Modified: trunk/commandline/commandline-demo/src/main/resources/log4j.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/log4j.properties 2008-07-24 21:00:10 UTC (rev 897) +++ trunk/commandline/commandline-demo/src/main/resources/log4j.properties 2008-07-24 21:00:19 UTC (rev 898) @@ -6,6 +6,6 @@ log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.codelutin.commandline=INFO -log4j.logger.org.codelutin.option=INFO -#log4j.logger.org.codelutin=INFO +log4j.logger.org.codelutin.commandline=DEBUG +#log4j.logger.org.codelutin.option=DEBUG +log4j.logger.org.codelutin.jaxx=DEBUG

1 0

[Lutinutil-commits] r897 - in trunk/commandline/commandline-demo: . src/main/java/org/codelutin/commandline/demo src/main/java/org/codelutin/commandline/demo/ui src/main/java/org/codelutin/commandline/demo/ui/actions
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

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;

1 0