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

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

25 Jul '08

Author: tchemit Date: 2008-07-25 21:46:07 +0000 (Fri, 25 Jul 2008) New Revision: 916 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/ConfigUIHandler.java Log: introduce Context as a real contract renmae old Context to AbstractContext add in ConfigUI#init method the possibility to not pass the config to used : will use all the configs of the context 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-25 21:38:49 UTC (rev 915) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUI.java 2008-07-25 21:46:07 UTC (rev 916) @@ -17,11 +17,14 @@ * ##% */ package org.codelutin.option.ui; -import org.codelutin.option.AbstractContext; import org.codelutin.option.Config; +import org.codelutin.option.Context; -import javax.swing.*; -import java.awt.*; +import javax.swing.DefaultListCellRenderer; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import java.awt.Component; import java.util.ArrayList; import java.util.List; @@ -66,7 +69,13 @@ } } - public ConfigUI init(AbstractContext context, Config... configs) { + public ConfigUI init(Context context, Config... configs) { + if (configs.length == 0) { + configs = context.getConfigs(); + if (configs == null || configs.length == 0) { + throw new IllegalStateException("no config is defined in context " + context); + } + } for (Config config : configs) { add(context, config); } @@ -76,7 +85,7 @@ return this; } - public boolean add(AbstractContext context, Config config) { + public boolean add(Context context, Config config) { int index = getConfigs().indexOf(config); if (index > -1) { return false; Modified: trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java =================================================================== --- trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java 2008-07-25 21:38:49 UTC (rev 915) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java 2008-07-25 21:46:07 UTC (rev 916) @@ -18,8 +18,8 @@ * ##% */ package org.codelutin.option.ui; -import org.codelutin.option.AbstractContext; import org.codelutin.option.Config; +import org.codelutin.option.Context; import javax.swing.*; import javax.swing.event.TableModelEvent; @@ -37,13 +37,13 @@ protected ConfigTableModel tableModel; protected TableModelListener tableModelListener; - protected AbstractContext context; + protected Context context; public ConfigUIHandler(ConfigTab ui) { this.ui = ui; } - public void init(AbstractContext context, Config config) { + public void init(Context context, Config config) { this.config = config; this.context = context; tableModel = new ConfigTableModel(config);

1 0

[Lutinutil-commits] r915 - 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:38:49 +0000 (Fri, 25 Jul 2008) New Revision: 915 Added: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java Log: introduce ContextProvider which lookup for the commandline unique context as service (using java ServiceLoader mecanism). in that way we can use the context in some module which does not known the Context real implementation. Added: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java (rev 0) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java 2008-07-25 21:38:49 UTC (rev 915) @@ -0,0 +1,58 @@ +/** + * # #% 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.util.Iterator; +import java.util.ServiceLoader; + +/** + * Cette classe permet de trouver dynamiquement le contexte Commandline en utilisant le + * m�canisme java de {@link java.util.ServiceLoader}. + * + * Le contexte trouv� lors du premier appel � la m�thode {@link #getContext()} est cach�� dans le champ {@link #context}. + * + * Il est possible de supprimer un context charg� via la m�thode {@link #reset()}. + * + * Note : Attention, un seul contexte commandline peut �tre d�fini. + * + * @author chemit + */ +public class ContextProvider { + /** + * share instance of the context + */ + private static Context context; + + public static synchronized Context getContext() { + if (context == null) { + ServiceLoader<Context> loader = ServiceLoader.load(Context.class); + Iterator<Context> iterator = loader.iterator(); + if (!iterator.hasNext()) { + throw new IllegalStateException("could not find a " + Context.class + " service"); + } + context = iterator.next(); + if (iterator.hasNext()) { + // not authorized! + reset(); + throw new IllegalStateException("only one " + Context.class + " service can be defined in classpath"); + } + } + return context; + } + + public static void reset() { + context = null; + } +}

1 0

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

25 Jul '08

Author: tchemit Date: 2008-07-25 21:36:41 +0000 (Fri, 25 Jul 2008) New Revision: 914 Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java Log: introduce Context as a real contract renmae old Context to AbstractContext Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java 2008-07-25 21:36:41 UTC (rev 914) @@ -8,7 +8,7 @@ /** * A simple empty action for an option. * - * Use method {@link #doRun(AbstractContext,Option[])} to launch action for the given options. + * Use method {@link #doRun(Context, Option[])} to launch action for the given options. * * This method offers some hooks to use for controling running : * @@ -23,7 +23,7 @@ * @author chemit */ -public abstract class OptionAction<O extends Option, P extends OptionParser, C extends AbstractContext> { +public abstract class OptionAction<O extends Option, P extends OptionParser, C extends Context> { protected final Log log = LogFactory.getLog(getClass()); @@ -43,7 +43,7 @@ * Method to implement logic of the action for the current option. * * This method will never by directly called, you have to use - * {@link #doRun(AbstractContext,Option[])} method instead which offers some hooks to control actions. + * {@link #doRun(Context ,Option[])} method instead which offers some hooks to control actions. * * @throws Exception if any problem while action */ Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,13 +16,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.Config; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.Option; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; /** * OptionAction to change a property in a config. @@ -37,7 +37,7 @@ Option option = action.getOption(); - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); String category = getCategory(context, action.getOption()); @@ -75,7 +75,7 @@ * @param option the option to test * @return the category of an IsisOptionConfig */ - protected String getCategory(AbstractContext context, Option option) { + protected String getCategory(Context context, Option option) { String value = option.getConstantArgumentValue(-1); if (value == null) { // used by default main category Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -20,6 +20,7 @@ import org.codelutin.option.ConfigKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; /** @author chemit */ public class OptionActionEditConfigRunnable implements OptionActionRunnable { @@ -30,7 +31,7 @@ public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); Config[] configs = new Config[context.getConfigKeys().size()]; int i = 0; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,11 +16,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; import static org.codelutin.option.ParserUtil.addTitle; import org.codelutin.util.ReflectUtil; @@ -34,7 +34,7 @@ protected final Log log = LogFactory.getLog(getClass()); public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); String category = action.getOption().getConstantArgumentValue(0); log.info("required showConfig pour category [" + category + "]"); Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,12 +16,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; import org.codelutin.option.OptionKey; +import org.codelutin.option.Context; import static org.codelutin.option.ParserUtil.addTitle; import org.codelutin.option.def.OptionDefinition; import org.codelutin.util.ReflectUtil; @@ -38,7 +38,7 @@ public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); StringWriter writer = new StringWriter(); String title = "TODO Add project name v " + context.getMainConfig().getPropertyKey("version").getCurrentValue(); @@ -56,7 +56,7 @@ * @param name title @throws java.io.IOException if any io pb while writing * @throws java.io.IOException if any pb while writing */ - public void printUsage(AbstractContext<?> context, Writer w, String name) throws IOException { + public void printUsage(Context<?> context, Writer w, String name) throws IOException { //TODO Use a Visitor in context try { @@ -71,7 +71,7 @@ } } - public void toString(AbstractContext<?> context, Writer w, String head, String prefix, String prefixOption, String prefixConfig) throws IOException { + public void toString(Context<?> context, Writer w, String head, String prefix, String prefixOption, String prefixConfig) throws IOException { w.append(addTitle(head, '=', true)).append("\n\n"); w.append(addTitle(prefixOption, '-', false)).append("\n"); for (OptionKey key : context.getParser().getOptionKeys()) { Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; import java.io.File; @@ -28,7 +28,7 @@ protected final Log log = LogFactory.getLog(getClass()); public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); File property = (File) context.getMainConfig().getProperty("configFileName"); property.delete(); Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -15,11 +15,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.option.AbstractContext; import org.codelutin.option.ConfigKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; import org.codelutin.option.ParserUtil; +import org.codelutin.option.Context; import java.io.StringWriter; @@ -29,7 +29,7 @@ protected final Log log = LogFactory.getLog(getClass()); public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); String category = action.getOption().getConstantArgumentValue(0); log.info("required showConfig pour category [" + category + "]"); Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -15,9 +15,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.option.AbstractContext; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; /** @author chemit */ public class OptionActionUiRunnable implements OptionActionRunnable { @@ -27,7 +27,7 @@ protected boolean init = false; public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); Boolean bool = action.getOption().getValuedArgumentValue(0, Boolean.class, "flag", false); boolean launchUI = bool != null && bool; log.info(action.getOption().getUsedAlias() + ", value:" + bool);

1 0

[Lutinutil-commits] r913 - 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:36:09 +0000 (Fri, 25 Jul 2008) New Revision: 913 Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Config.java Log: add a dynamic setProperty method using only the property's name to be used when we do not know real implementation of the Config Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Config.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Config.java 2008-07-25 21:34:18 UTC (rev 912) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Config.java 2008-07-25 21:36:09 UTC (rev 913) @@ -524,6 +524,21 @@ } /** + * Set the value for a given property using his <code>def</code> key. + * + * @param def the given key to use + * @param value the given valuer to set + */ + public void setProperty(String def, Object value) { + ConfigPropertyKey<?> property = getKey(def); + if (property == null) { + throw new IllegalArgumentException("no property found with the key " + def); + } + setProperty(property, value); + + } + + /** * Set the value for a given property using his <code>def</code>. * * @param def the given key to use

1 0

[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 implements ContextVisitable { +public abstract class AbstractContext implements Context { /** 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 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