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

[Lutinutil-commits] r912 - trunk/commandline/commandline-core/src/main/java/org/codelutin/option
by tchemit＠users.labs.libre-entreprise.org 25 Jul '08

25 Jul '08

Author: tchemit Date: 2008-07-25 21:34:18 +0000 (Fri, 25 Jul 2008) New Revision: 912 Added: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java Log: introduce Context as a real contract renmae old Context to AbstractContext Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java 2008-07-25 16:21:31 UTC (rev 911) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java 2008-07-25 21:34:18 UTC (rev 912) @@ -33,7 +33,7 @@ * * @author chemit */ -public abstract class AbstractContext<P extends OptionParser> implements ContextVisitable { +public abstract class AbstractContext<P extends OptionParser> implements Context<P> { /** logger non statique pour �pouser la cat�gorie de l'implantation */ protected final Log log = LogFactory.getLog(getClass()); @@ -200,12 +200,6 @@ } - /** initialisation i18n apr�s init du parser et des configs. */ - public abstract void initI18n(); - - /** @return la configuration principale de l'application */ - public abstract Config getMainConfig(); - /** * @return le parseur utilis� pour parser les options de la ligne de * commande. Added: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java (rev 0) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java 2008-07-25 21:34:18 UTC (rev 912) @@ -0,0 +1,77 @@ +/** + * # #% 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.option; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +/** @author chemit */ +public interface Context<P extends OptionParser> extends ContextVisitable { + void init(String[] args) throws Exception; + + long getStartingTime(); + + long getElapsedTime(); + + String getElapsedTimeAsString(); + + /** initialisation i18n apr�s init du parser et des configs. */ + void initI18n(); + + /** @return la configuration principale de l'application */ + Config getMainConfig(); + + P getParser(); + + <C extends Config> C getConfig(ConfigKey<C> key); + + boolean isQuit(); + + boolean isUseUI(); + + boolean isLaunchUI(); + + boolean isFirstLaunch(); + + void setQuit(boolean quit); + + void setLaunchUI(boolean launchUI); + + void setFirstLaunch(boolean firstLaunch); + + void save() throws IOException, IllegalStateException; + + void saveSafely(); + + void setSource(File source); + + File getSource(); + + List<ConfigKey<?>> getConfigKeys(); + + Config[] getConfigs(); + + ConfigKey<?> getConfigKey(String key); + + Config getConfig(String key); + + @SuppressWarnings({"unchecked"}) + <C extends Config> void registerConfig(Class<? extends C> aClass); + + void accept(ContextVisitor visitor); + + void dispose(boolean reload); +}

1 0

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

25 Jul '08

Author: tchemit Date: 2008-07-25 16:21:31 +0000 (Fri, 25 Jul 2008) New Revision: 911 Modified: trunk/commandline/commandline-demo/pom.xml Log: renommage action en CommandLineDemoBaseAction car ce n'est plus une classe abstraite Modified: trunk/commandline/commandline-demo/pom.xml =================================================================== --- trunk/commandline/commandline-demo/pom.xml 2008-07-25 16:21:18 UTC (rev 910) +++ trunk/commandline/commandline-demo/pom.xml 2008-07-25 16:21:31 UTC (rev 911) @@ -170,7 +170,7 @@ </goals> <configuration> <fqn>org.codelutin.commandline.demo.ui.MyActionProvider</fqn> - <fqnAction>org.codelutin.commandline.demo.ui.actions.CommandLineAction</fqnAction> + <fqnAction>org.codelutin.commandline.demo.ui.actions.CommandLineDemoBaseAction</fqnAction> <providerName>commandlinedemo</providerName> </configuration> </execution>

1 0

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

25 Jul '08

Author: tchemit Date: 2008-07-25 16:21:18 +0000 (Fri, 25 Jul 2008) New Revision: 910 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/ui/DemoMainUI.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/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: renommage action en CommandLineDemoBaseAction car ce n'est plus une classe abstraite Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-25 16:21:18 UTC (rev 910) @@ -16,7 +16,7 @@ import org.codelutin.commandline.demo.ui.DemoMainUI; import org.codelutin.commandline.demo.ui.JDemoMainUI; -import org.codelutin.commandline.demo.ui.actions.CommandLineAction; +import org.codelutin.commandline.demo.ui.actions.CommandLineDemoBaseAction; import org.codelutin.i18n.I18n; import org.codelutin.jaxx.action.factory.ActionFactory; import org.codelutin.jaxx.action.factory.ActionFactoryFromProvider; @@ -28,15 +28,15 @@ protected JDemoMainUI mainUI; /** l'usine d'actions */ - private ActionFactory<CommandLineAction> actionFactory; + private ActionFactory<CommandLineDemoBaseAction> actionFactory; public DemoContext() throws Exception { super(); } - public ActionFactory<CommandLineAction> getActionFactory() { + public ActionFactory<CommandLineDemoBaseAction> getActionFactory() { if (actionFactory == null) { - actionFactory = ActionFactoryFromProvider.newInstance(CommandLineAction.class); + actionFactory = ActionFactoryFromProvider.newInstance(CommandLineDemoBaseAction.class); } return actionFactory; } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-25 16:21:18 UTC (rev 910) @@ -19,7 +19,7 @@ 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 org.codelutin.commandline.demo.ui.actions.CommandLineDemoBaseAction; import static org.codelutin.i18n.I18n._; import javax.swing.AbstractButton; @@ -99,7 +99,7 @@ if (!enabled) { button.setToolTipText(null); } else { - CommandLineAction action = (CommandLineAction) button.getAction(); + CommandLineDemoBaseAction action = (CommandLineDemoBaseAction) 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-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java 2008-07-25 16:21:18 UTC (rev 910) @@ -28,7 +28,7 @@ mnemonic = 'a', hideActionText = false ) -public class AboutAction extends CommandLineAction { +public class AboutAction extends CommandLineDemoBaseAction { 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-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-25 16:21:18 UTC (rev 910) @@ -41,7 +41,7 @@ multiNames = {"i18n_fr", "i18n_en"} ) @org.codelutin.i18n.I18nable -public class ChangeLocaleAction extends CommandLineAction { +public class ChangeLocaleAction extends CommandLineDemoBaseAction { 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/ConfigAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-25 16:21:18 UTC (rev 910) @@ -31,7 +31,7 @@ mnemonic = 'P', hideActionText = false ) -public class ConfigAction extends CommandLineAction { +public class ConfigAction extends CommandLineDemoBaseAction { 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-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java 2008-07-25 16:21:18 UTC (rev 910) @@ -28,7 +28,7 @@ mnemonic = 'h', hideActionText = false ) -public class HelpAction extends CommandLineAction { +public class HelpAction extends CommandLineDemoBaseAction { 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-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-25 16:21:18 UTC (rev 910) @@ -35,7 +35,7 @@ mnemonic = 'q', hideActionText = false ) -public class QuitAction extends CommandLineAction { +public class QuitAction extends CommandLineDemoBaseAction { 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-25 16:21:09 UTC (rev 909) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-25 16:21:18 UTC (rev 910) @@ -33,7 +33,7 @@ mnemonic = 's', hideActionText = false ) -public class SiteAction extends CommandLineAction { +public class SiteAction extends CommandLineDemoBaseAction { private static final long serialVersionUID = 9050439968144935986L; protected URL siteUrl;

1 0

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

25 Jul '08

Author: tchemit Date: 2008-07-25 16:21:09 +0000 (Fri, 25 Jul 2008) New Revision: 909 Added: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java Removed: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java Log: renommage action en CommandLineDemoBaseAction car ce n'est plus une classe abstraite Deleted: 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 22:21:18 UTC (rev 908) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineAction.java 2008-07-25 16:21:09 UTC (rev 909) @@ -1,53 +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 org.codelutin.commandline.demo.DemoContext; -import org.codelutin.commandline.demo.DemoMain; -import org.codelutin.jaxx.action.MyAbstractAction; - -import java.awt.event.ActionEvent; - -/** @author chemit */ -public class CommandLineAction extends MyAbstractAction { - - private static final long serialVersionUID = -810023044364620841L; - - protected ActionEvent e; - - protected String getPrefix() { - return "commandlinedemo"; - } - - protected CommandLineAction(String name) { - super(name); - if (log.isTraceEnabled()) { - log.trace("> " + this); - } - } - - public CommandLineAction(MyAbstractAction delegate) { - super(delegate); - if (log.isTraceEnabled()) { - log.trace("> " + this); - } - } - - protected DemoContext getContext() { - return DemoMain.getContext(); - } - - -} Copied: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java (from rev 903, 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/CommandLineDemoBaseAction.java (rev 0) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-07-25 16:21:09 UTC (rev 909) @@ -0,0 +1,53 @@ +/** + * # #% 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 org.codelutin.commandline.demo.DemoContext; +import org.codelutin.commandline.demo.DemoMain; +import org.codelutin.jaxx.action.MyAbstractAction; + +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class CommandLineDemoBaseAction extends MyAbstractAction { + + private static final long serialVersionUID = -810023044364620841L; + + protected ActionEvent e; + + protected String getPrefix() { + return "commandlinedemo"; + } + + protected CommandLineDemoBaseAction(String name) { + super(name); + if (log.isTraceEnabled()) { + log.trace("> " + this); + } + } + + public CommandLineDemoBaseAction(MyAbstractAction delegate) { + super(delegate); + if (log.isTraceEnabled()) { + log.trace("> " + this); + } + } + + protected DemoContext getContext() { + return DemoMain.getContext(); + } + + +}

1 0

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

24 Jul '08

Author: tchemit Date: 2008-07-24 22:21:18 +0000 (Thu, 24 Jul 2008) New Revision: 908 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/SiteAction.java trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUI.java Log: override anno 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:09:44 UTC (rev 907) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-24 22:21:18 UTC (rev 908) @@ -43,6 +43,7 @@ super(name); } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { boolean result = super.beforeAction(e); 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 21:09:44 UTC (rev 907) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-24 22:21:18 UTC (rev 908) @@ -42,6 +42,7 @@ super(name); } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e) && !Desktop.isDesktopSupported() && !Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { return false; Modified: trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUI.java =================================================================== --- trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUI.java 2008-07-24 21:09:44 UTC (rev 907) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUI.java 2008-07-24 22:21:18 UTC (rev 908) @@ -41,6 +41,7 @@ return configs; } + @Override public ListCellRenderer getListener() { return new DefaultListCellRenderer() { @Override @@ -56,6 +57,7 @@ }; } + @Override public void onValueChanged() { Object value = list.getSelectedValue(); if (value instanceof Config) {

1 0

[Lutinutil-commits] r907 - 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:09:44 +0000 (Thu, 24 Jul 2008) New Revision: 907 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/ui/DemoMainUI.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:08:20 UTC (rev 906) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-07-24 21:09:44 UTC (rev 907) @@ -14,8 +14,8 @@ */ package org.codelutin.commandline.demo; -import org.codelutin.commandline.demo.ui.JMainUI; import org.codelutin.commandline.demo.ui.DemoMainUI; +import org.codelutin.commandline.demo.ui.JDemoMainUI; import org.codelutin.commandline.demo.ui.actions.CommandLineAction; import org.codelutin.i18n.I18n; import org.codelutin.jaxx.action.factory.ActionFactory; @@ -25,7 +25,7 @@ public class DemoContext extends CommandLineDemoAbstractContext { /** main UI */ - protected JMainUI mainUI; + protected JDemoMainUI mainUI; /** l'usine d'actions */ private ActionFactory<CommandLineAction> actionFactory; @@ -45,7 +45,7 @@ I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding()); } - public JMainUI getMainUI() { + public JDemoMainUI getMainUI() { if (mainUI == null) { mainUI = new DemoMainUI(); } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-24 21:08:20 UTC (rev 906) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-24 21:09:44 UTC (rev 907) @@ -31,7 +31,7 @@ import java.util.regex.Matcher; /** @author chemit */ -public class DemoMainUI extends JMainUI { +public class DemoMainUI extends JDemoMainUI { /** log */ private static final Log log = LogFactory.getLog(DemoMainUI.class);

1 0

[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