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

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

July 24, 2008

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 July 24, 2008

July 24, 2008

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 July 24, 2008

July 24, 2008

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 July 24, 2008

July 24, 2008

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 July 24, 2008

July 24, 2008

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 July 24, 2008

July 24, 2008

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

[Lutinutil-commits] r896 - trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions
by tchemit＠users.labs.libre-entreprise.org July 24, 2008

July 24, 2008

Author: tchemit Date: 2008-07-24 20:47:24 +0000 (Thu, 24 Jul 2008) New Revision: 896 Added: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java Removed: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/MyAbstractAction.java Log: update from jaxx-swing-action framework Copied: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java (from rev 891, trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/MyAbstractAction.java) =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java (rev 0) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java 2008-07-24 20:47:24 UTC (rev 896) @@ -0,0 +1,112 @@ +/** + * # #% 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.actions; + +import jaxx.runtime.JAXXObject; +import org.apache.commons.logging.LogFactory; +import org.codelutin.commandline.demo.MyContext; +import org.codelutin.commandline.demo.MyMain; + +import javax.swing.AbstractAction; +import javax.swing.JComponent; +import java.awt.event.ActionEvent; + +/** @author chemit */ +public abstract class CommandLineAction extends AbstractAction { + + 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) { + + 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 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; + } + 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(); + } + + +} Deleted: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/MyAbstractAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/MyAbstractAction.java 2008-07-23 17:55:56 UTC (rev 895) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/MyAbstractAction.java 2008-07-24 20:47:24 UTC (rev 896) @@ -1,112 +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.actions; - -import jaxx.runtime.JAXXObject; -import org.apache.commons.logging.LogFactory; -import org.codelutin.commandline.demo.MyContext; -import org.codelutin.commandline.demo.MyMain; - -import javax.swing.AbstractAction; -import javax.swing.JComponent; -import java.awt.event.ActionEvent; - -/** @author chemit */ -public abstract class MyAbstractAction extends AbstractAction { - - static org.apache.commons.logging.Log log = LogFactory.getLog(MyAbstractAction.class); - - private static final long serialVersionUID = -810023044364620841L; - - protected ActionEvent e; - - public void actionPerformed(java.awt.event.ActionEvent e) { - - 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 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; - } - 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 MyAbstractAction(String name) { - super(name); - log.debug("> " + this); - } - - protected MyContext getContext() { - return MyMain.getContext(); - } - - -}

1 0

[Lutinutil-commits] r895 - in trunk/commandline/commandline-demo/src/main: java/org/codelutin/commandline/demo/ui/actions resources/i18n
by tchemit＠users.labs.libre-entreprise.org July 23, 2008

July 23, 2008

Author: tchemit Date: 2008-07-23 17:55:56 +0000 (Wed, 23 Jul 2008) New Revision: 895 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/ChangeLocaleAction.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 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: i18n 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -21,9 +21,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "about", - name = "lima.action.about", - shortDescription = "lima.action.about.tooltip", - longDescription = "lima.action.about.help", + name = "commandlinedemo.action.about", + shortDescription = "commandlinedemo.action.about.tooltip", + longDescription = "commandlinedemo.action.about.help", smallIcon = "action/about.png", mnemonic = 'a', hideActionText = false 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -35,8 +35,8 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "changeLocale", - shortDescription = "lima.action.changeLocale.tooltip", - longDescription = "lima.action.changeLocale.help", + shortDescription = "commandlinedemo.action.changeLocale.tooltip", + longDescription = "commandlinedemo.action.changeLocale.help", hideActionText = false, multiNames = {"i18n_fr", "i18n_en"} ) @@ -66,7 +66,7 @@ @Override public String getI18nToolTipText() { - return "lima.action.changeLocale.tooltip"; + return "commandlinedemo.action.changeLocale.tooltip"; } public String getIcon() { @@ -78,7 +78,7 @@ return true; //TODO Faut-il proposer une confirmation ? //String s = _(locale.getLibelle()); - //int result = JOptionPane.showConfirmDialog(null, _("lima.confirm.changeLanguage", s), "changeLanguage", JOptionPane.YES_NO_OPTION); + //int result = JOptionPane.showConfirmDialog(null, _("commandlinedemo.confirm.changeLanguage", s), "changeLanguage", JOptionPane.YES_NO_OPTION); //return result == JOptionPane.OK_OPTION; } 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -24,9 +24,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "config", - name = "lima.action.config", - shortDescription = "lima.action.config.tooltip", - longDescription = "lima.action.config.help", + name = "commandlinedemo.action.config", + shortDescription = "commandlinedemo.action.config.tooltip", + longDescription = "commandlinedemo.action.config.help", smallIcon = "action/config.png", mnemonic = 'P', hideActionText = false 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -21,9 +21,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "help", - name = "lima.action.help", - shortDescription = "lima.action.help.tooltip", - longDescription = "lima.action.help.help", + name = "commandlinedemo.action.help", + shortDescription = "commandlinedemo.action.help.tooltip", + longDescription = "commandlinedemo.action.help.help", smallIcon = "action/help.png", mnemonic = 'h', hideActionText = false 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -28,9 +28,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "quit", - name = "lima.action.quit", - shortDescription = "lima.action.quit.tooltip", - longDescription = "lima.action.quit.help", + name = "commandlinedemo.action.quit", + shortDescription = "commandlinedemo.action.quit.tooltip", + longDescription = "commandlinedemo.action.quit.help", smallIcon = "action/quit.png", mnemonic = 'q', hideActionText = false @@ -48,10 +48,10 @@ boolean result = super.beforeAction(e); if (result) { - String[] response = {_("lima.yes"), _("lima.no")}; + String[] response = {_("commandlinedemo.yes"), _("commandlinedemo.no")}; int n = JOptionPane.showOptionDialog(null, - _("lima.close_question"), - _("lima.question"), + _("commandlinedemo.close_question"), + _("commandlinedemo.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, //do not use a custom Icon 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -26,9 +26,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "site", - name = "lima.action.site", - shortDescription = "lima.action.site.tooltip", - longDescription = "lima.action.site.help", + name = "commandlinedemo.action.site", + shortDescription = "commandlinedemo.action.site.tooltip", + longDescription = "commandlinedemo.action.site.help", smallIcon = "action/site.png", mnemonic = 's', hideActionText = false 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-23 17:55:56 UTC (rev 895) @@ -1,3 +1,21 @@ +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= @@ -16,6 +34,8 @@ 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= @@ -24,30 +44,10 @@ commandlinedemo.option.description.resetConfig= commandlinedemo.option.description.showConfig= commandlinedemo.option.description.ui= -lima.action.about= -lima.action.about.help= -lima.action.about.tooltip= -lima.action.changeLocale.help= -lima.action.changeLocale.tooltip= -lima.action.config= -lima.action.config.help= -lima.action.config.tooltip= -lima.action.help= -lima.action.help.help= -lima.action.help.tooltip= -lima.action.quit= -lima.action.quit.help= -lima.action.quit.tooltip= -lima.action.site= -lima.action.site.help= -lima.action.site.tooltip= -lima.close_question= -lima.confirm.changeLanguage= -lima.no= -lima.question= -lima.yes= -mainui.menu.edit= -mainui.menu.file= -mainui.menu.help= -mainui.menu.help.i18n= -mainui.title= +commandlinedemo.question=Quit +commandlinedemo.yes=Yes +mainui.menu.edit=Edit +mainui.menu.file=File +mainui.menu.help=Help +mainui.menu.help.i18n=Language +mainui.title=Commandline demo 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-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-23 17:55:56 UTC (rev 895) @@ -1,3 +1,21 @@ +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= @@ -16,6 +34,8 @@ 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= @@ -24,30 +44,10 @@ commandlinedemo.option.description.resetConfig= commandlinedemo.option.description.showConfig= commandlinedemo.option.description.ui= -lima.action.about= -lima.action.about.help= -lima.action.about.tooltip= -lima.action.changeLocale.help= -lima.action.changeLocale.tooltip= -lima.action.config= -lima.action.config.help= -lima.action.config.tooltip= -lima.action.help= -lima.action.help.help= -lima.action.help.tooltip= -lima.action.quit= -lima.action.quit.help= -lima.action.quit.tooltip= -lima.action.site= -lima.action.site.help= -lima.action.site.tooltip= -lima.close_question= -lima.confirm.changeLanguage= -lima.no= -lima.question= -lima.yes= -mainui.menu.edit= -mainui.menu.file= -mainui.menu.help= -mainui.menu.help.i18n= -mainui.title= +commandlinedemo.question=Quitter +commandlinedemo.yes=Oui +mainui.menu.edit=Edit +mainui.menu.file=Fichier +mainui.menu.help=Aide +mainui.menu.help.i18n=Langue +mainui.title=Commandline D\u00E9mo

1 0

[Lutinutil-commits] r894 - trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo
by tchemit＠users.labs.libre-entreprise.org July 23, 2008

July 23, 2008

Author: tchemit Date: 2008-07-23 16:16:51 +0000 (Wed, 23 Jul 2008) New Revision: 894 Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java Log: no launch if no ui 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-23 15:53:12 UTC (rev 893) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/MyMain.java 2008-07-23 16:16:51 UTC (rev 894) @@ -91,7 +91,7 @@ //TODO should we stop ? } - if (getContext().isQuit()) { + if (getContext().isQuit() || !getContext().isUseUI()) { // nothing more to be done here return; }

1 0

[Lutinutil-commits] r893 - trunk/commandline
by tchemit＠users.labs.libre-entreprise.org July 23, 2008

July 23, 2008

Author: tchemit Date: 2008-07-23 15:53:12 +0000 (Wed, 23 Jul 2008) New Revision: 893 Modified: trunk/commandline/pom.xml Log: put back javadoc phase Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-07-23 15:52:17 UTC (rev 892) +++ trunk/commandline/pom.xml 2008-07-23 15:53:12 UTC (rev 893) @@ -95,7 +95,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> - <phase>deploy</phase> + <phase>verify</phase> <goals> <goal>jar</goal> </goals>

1 0