Author: tchemit Date: 2008-07-28 12:22:08 +0000 (Mon, 28 Jul 2008) New Revision: 933 Modified: trunk/commandline/commandline-demo/pom.xml 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/CommandLineDemoBaseAction.java trunk/commandline/commandline-demo/src/main/resources/commandline.properties trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst Log: mise en place action About ajout de proprietes obligatoires supplementaires fix bug sur l'action Quit Modified: trunk/commandline/commandline-demo/pom.xml =================================================================== --- trunk/commandline/commandline-demo/pom.xml 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/pom.xml 2008-07-28 12:22:08 UTC (rev 933) @@ -139,8 +139,12 @@ <concreteConfig>true</concreteConfig> <concreteContextFQN>org.codelutin.commandline.demo.DemoContext</concreteContextFQN> <_projectName>CommandlineDemo</_projectName> + <_projectURL>http://commandline.labs.libre-entreprise.org</_projectURL> <_configFileName>.commandlineDemo-1</_configFileName> <_version>${current.version}</_version> + <_organisationName>Codelutin</_organisationName> + <_organisationURL>http://codelutin.com</_organisationURL> + <_copyright>Copyright Codelutin 2008</_copyright> </configuration> </execution> <execution> @@ -204,7 +208,6 @@ </plugin> - <!-- Package phase --> <plugin> <groupId>org.apache.maven.plugins</groupId> 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-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-07-28 12:22:08 UTC (rev 933) @@ -22,6 +22,8 @@ import javax.swing.KeyStroke; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.WindowEvent; /** @author chemit */ public class DemoMainUI extends JDemoMainUI { @@ -34,16 +36,25 @@ } - protected void finalizeInit(DemoContext context) { + protected void finalizeInit(final DemoContext context) { + // chargement dans l'ui des actions context.getActionFactory().loadActions(this); + addMouseListener(new MouseAdapter() { + }); 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)); + addWindowListener(new java.awt.event.WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + context.getActionFactory().fireAction("quit", this); + } + }); // repaint i18n actions - ActionHelper.refreshI18nActions(context, context.getActionFactory(), this); + ActionHelper.refreshI18nActions(context, context.getActionFactory(), get$JFrame0()); } } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-07-28 12:22:08 UTC (rev 933) @@ -18,15 +18,11 @@ 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"; } Modified: trunk/commandline/commandline-demo/src/main/resources/commandline.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/commandline.properties 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/main/resources/commandline.properties 2008-07-28 12:22:08 UTC (rev 933) @@ -16,9 +16,6 @@ main.config.definition.debugMode=java.lang.Boolean:false main.config.modifiers.debugMode=mandatory -main.config.definition.siteURL=java.net.URL:http://commandline.labs.libre-entreprise.org -main.config.modifiers.siteURL=final,static,mandatory - ### ### user properties ### Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-28 12:22:08 UTC (rev 933) @@ -1,10 +1,13 @@ commandlinedemo.config.main.configFileName.description= +commandlinedemo.config.main.copyright.description= commandlinedemo.config.main.debugMode.description= commandlinedemo.config.main.description= commandlinedemo.config.main.encoding.description= commandlinedemo.config.main.locale.description= +commandlinedemo.config.main.organisationName.description= +commandlinedemo.config.main.organisationURL.description= commandlinedemo.config.main.projectName.description= -commandlinedemo.config.main.siteURL.description= +commandlinedemo.config.main.projectURL.description= commandlinedemo.config.main.userFirstName.description= commandlinedemo.config.main.userLastName.description= commandlinedemo.config.main.userMail.description= Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-28 12:22:08 UTC (rev 933) @@ -1,10 +1,13 @@ commandlinedemo.config.main.configFileName.description= +commandlinedemo.config.main.copyright.description= commandlinedemo.config.main.debugMode.description= commandlinedemo.config.main.description= commandlinedemo.config.main.encoding.description= commandlinedemo.config.main.locale.description= +commandlinedemo.config.main.organisationName.description= +commandlinedemo.config.main.organisationURL.description= commandlinedemo.config.main.projectName.description= -commandlinedemo.config.main.siteURL.description= +commandlinedemo.config.main.projectURL.description= commandlinedemo.config.main.userFirstName.description= commandlinedemo.config.main.userLastName.description= commandlinedemo.config.main.userMail.description= Modified: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx =================================================================== --- trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-07-28 12:22:08 UTC (rev 933) @@ -1,11 +1,11 @@ -<JFrame title="mainui.title" width="1024" height="768" defaultCloseOperation="dispose_on_close"> +<JFrame title="mainui.title" width="1024" height="768" defaultCloseOperation="do_nothing_on_close"> <JMenuBar> - <JMenu text="mainui.menu.file"> + <JMenu text="mainui.menu.file"> <JMenuItem id="quit"/> </JMenu> <JMenu text="mainui.menu.edit"> <JMenuItem id="config"/> - </JMenu> + </JMenu> <JMenu text="mainui.menu.help" mnemonic="{'H'}"> <JMenuItem id="help"/> <JMenuItem id="site"/> Modified: trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst 2008-07-28 12:22:08 UTC (rev 933) @@ -46,6 +46,10 @@ commandlinedemo.config.main.configFileName.description +#. copyright (String) <defaultValue:Copyright Codelutin 2008> + commandlinedemo.config.main.copyright.description + + #. debugMode (Boolean) <defaultValue:false> commandlinedemo.config.main.debugMode.description @@ -58,12 +62,20 @@ commandlinedemo.config.main.locale.description +#. organisationName (String) <defaultValue:Codelutin> + commandlinedemo.config.main.organisationName.description + + +#. organisationURL (URL) <defaultValue:http://codelutin.com> + commandlinedemo.config.main.organisationURL.description + + #. projectName (String) <defaultValue:CommandlineDemo> commandlinedemo.config.main.projectName.description -#. siteURL (URL) <defaultValue:http://commandline.labs.libre-entreprise.org> - commandlinedemo.config.main.siteURL.description +#. projectURL (URL) <defaultValue:http://commandline.labs.libre-entreprise.org> + commandlinedemo.config.main.projectURL.description #. userFirstName (String) Modified: trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-07-28 12:21:47 UTC (rev 932) +++ trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-07-28 12:22:08 UTC (rev 933) @@ -46,6 +46,10 @@ commandlinedemo.config.main.configFileName.description +#. copyright (String) <defaultValue:Copyright Codelutin 2008> + commandlinedemo.config.main.copyright.description + + #. debugMode (Boolean) <defaultValue:false> commandlinedemo.config.main.debugMode.description @@ -58,12 +62,20 @@ commandlinedemo.config.main.locale.description +#. organisationName (String) <defaultValue:Codelutin> + commandlinedemo.config.main.organisationName.description + + +#. organisationURL (URL) <defaultValue:http://codelutin.com> + commandlinedemo.config.main.organisationURL.description + + #. projectName (String) <defaultValue:CommandlineDemo> commandlinedemo.config.main.projectName.description -#. siteURL (URL) <defaultValue:http://commandline.labs.libre-entreprise.org> - commandlinedemo.config.main.siteURL.description +#. projectURL (URL) <defaultValue:http://commandline.labs.libre-entreprise.org> + commandlinedemo.config.main.projectURL.description #. userFirstName (String)