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;