Author: tchemit Date: 2009-01-21 04:35:05 +0000 (Wed, 21 Jan 2009) New Revision: 1309 Added: commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx commandline/trunk/commandline-ui-action/src/main/java/org/codelutin/option/ui/JAboutUI.jaxx commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTab.jaxx commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JConfigUI.jaxx commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JLoginUI.jaxx Removed: commandline/trunk/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/ commandline/trunk/commandline-ui-action/src/main/uimodel/org/codelutin/option/ui/ commandline/trunk/commandline-ui/src/main/uimodel/org/codelutin/option/ui/ Modified: commandline/trunk/ commandline/trunk/changelog.txt commandline/trunk/commandline-core/changelog.txt commandline/trunk/commandline-demo/changelog.txt commandline/trunk/commandline-demo/pom.xml commandline/trunk/commandline-ui-action/changelog.txt commandline/trunk/commandline-ui-action/pom.xml commandline/trunk/commandline-ui/changelog.txt commandline/trunk/commandline-ui/pom.xml commandline/trunk/maven-commandline-plugin/changelog.txt commandline/trunk/maven-commandline-plugin/pom.xml commandline/trunk/pom.xml Log: - refactor pom for sibling module dependencies - use Jaxx 1.1-SNAPSHOT (no use anylonger uimodel directory, but src/main/java instead) - use lutinutil 1.0.2 - use lutinwidget 0.12 - use lutinproject 3.3 Property changes on: commandline/trunk ___________________________________________________________________ Name: svn:ignore - *.iws *.ipr *.iml + *.iws *.ipr *.iml *.log Modified: commandline/trunk/changelog.txt =================================================================== --- commandline/trunk/changelog.txt 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/changelog.txt 2009-01-21 04:35:05 UTC (rev 1309) @@ -1,2 +1,7 @@ -1.0 chemit 200812?? +1.0 chemit 200901?? + * 20090121 [chemit] - refactor pom for sibling module dependencies + - use Jaxx 1.1-SNAPSHOT (no use anylonger uimodel directory, but src/main/java instead) + - use lutinutil 1.0.2 + - use lutinwidget 0.12 + - use lutinproject 3.3 * 20081205 [chemit] use lutinproject 3.2 Modified: commandline/trunk/commandline-core/changelog.txt =================================================================== --- commandline/trunk/commandline-core/changelog.txt 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-core/changelog.txt 2009-01-21 04:35:05 UTC (rev 1309) @@ -1,2 +1,3 @@ -1.0 chemit 200812?? +1.0 chemit 200901?? + * 20090121 [chemit] - refactor pom for sibling module dependencies * 20081205 [chemit] use lutinproject 3.2 Modified: commandline/trunk/commandline-demo/changelog.txt =================================================================== --- commandline/trunk/commandline-demo/changelog.txt 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-demo/changelog.txt 2009-01-21 04:35:05 UTC (rev 1309) @@ -1,2 +1,6 @@ -1.0 chemit 200812?? +1.0 chemit 200901?? + * 20090121 [chemit] - refactor pom for sibling module dependencies + - use Jaxx 1.1-SNAPSHOT (no use anylonger uimodel directory, but src/main/java instead) + - use lutinutil 1.0.2 + - use lutinwidget 0.12 * 20081205 [chemit] use lutinproject 3.2 Modified: commandline/trunk/commandline-demo/pom.xml =================================================================== --- commandline/trunk/commandline-demo/pom.xml 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-demo/pom.xml 2009-01-21 04:35:05 UTC (rev 1309) @@ -24,20 +24,23 @@ <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-ui</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-ui-action</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> </dependency> @@ -73,13 +76,14 @@ <plugins> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> </plugin> <plugin> <groupId>org.codelutin.commandline</groupId> <artifactId>maven-commandline-plugin</artifactId> + <version>${project.version}</version> <configuration> <prefix>CommandLineDemo</prefix> <packageName>org.codelutin.commandline.demo</packageName> @@ -148,8 +152,7 @@ </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> Copied: commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx (from rev 1296, commandline/trunk/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx) =================================================================== --- commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx (rev 0) +++ commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2009-01-21 04:35:05 UTC (rev 1309) @@ -0,0 +1,31 @@ +<JFrame title="commandlinedemo.mainui.title" width="1024" height="768" defaultCloseOperation="do_nothing_on_close"> + <JMenuBar> + <JMenu text="commandlinedemo.mainui.menu.file"> + <JMenuItem id="quit"/> + </JMenu> + <JMenu text="commandlinedemo.mainui.menu.edit"> + <JMenuItem id="config"/> + </JMenu> + <JMenu text="commandlinedemo.mainui.menu.help" mnemonic="{'H'}"> + <JMenuItem id="help"/> + <JMenuItem id="site"/> + <JMenuItem id="about"/> + <!-- dynamic i18nMenu filled by ActionHelper --> + <JMenu id="i18nMenu"/> + </JMenu> + </JMenuBar> + <Table insets='0,0,0,0'> + <!-- le panel principal à surcharger selon le context --> + <row fill="both" weightx="1" weighty="1"> + <cell> + <JTabbedPane id="contentTabbedPane"/> + </cell> + </row> + <!-- la barre de status --> + <row> + <cell fill="both"> + <org.codelutin.widget.StatusBar id='statusBar'/> + </cell> + </row> + </Table> +</JFrame> \ No newline at end of file Modified: commandline/trunk/commandline-ui/changelog.txt =================================================================== --- commandline/trunk/commandline-ui/changelog.txt 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-ui/changelog.txt 2009-01-21 04:35:05 UTC (rev 1309) @@ -1,4 +1,8 @@ -1.0 chemit 200812?? +1.0 chemit 200901?? + * 20090121 [chemit] - refactor pom for sibling module dependencies + - use Jaxx 1.1-SNAPSHOT (no use anylonger uimodel directory, but src/main/java instead) + - use lutinutil 1.0.2 + - use lutinwidget 0.12 * 20081205 [chemit] use lutinproject 3.2 ver-0-5 chemit 07-2008 Modified: commandline/trunk/commandline-ui/pom.xml =================================================================== --- commandline/trunk/commandline-ui/pom.xml 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-ui/pom.xml 2009-01-21 04:35:05 UTC (rev 1309) @@ -21,14 +21,15 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing</artifactId> <scope>compile</scope> </dependency> <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-core</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> </dependencies> @@ -52,7 +53,7 @@ <!-- jaxx --> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> </plugin> Copied: commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTab.jaxx (from rev 1296, commandline/trunk/commandline-ui/src/main/uimodel/org/codelutin/option/ui/ConfigTab.jaxx) =================================================================== --- commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTab.jaxx (rev 0) +++ commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTab.jaxx 2009-01-21 04:35:05 UTC (rev 1309) @@ -0,0 +1,50 @@ +<Table weightx="1"> + <script> + protected ConfigUIHandler handler; + + public ConfigUIHandler getHandler() { + if (handler == null) handler = new ConfigUIHandler(this); + return handler; + } + + public void dispose() { + getHandler().dispose(); + } + + protected void doSave() { getHandler().doSave(); } + protected void doReset() { getHandler().doReset(); } + protected void doSelectNormal() { if (normal.isSelected()) + getHandler().getTableModel().setType(ConfigTableModel.TypeModel.nontech); } + protected void doSelectAll() { if (all.isSelected()) + getHandler().getTableModel().setType(ConfigTableModel.TypeModel.all); } + protected void doSelectTechnical() { if (onlytech.isSelected()) + getHandler().getTableModel().setType(ConfigTableModel.TypeModel.tech); } + </script> + <row> + <cell weighty="1" weightx='1' fill='both'> + <JScrollPane id='scroll' verticalScrollBarPolicy='20' horizontalScrollBarPolicy='31'> + <JTable id="main" rowSelectionAllowed="false" autoResizeMode='auto_resize_last_column'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JRadioButton id='normal' selected='true' buttonGroup='type' text='lutinutil.common.toggle.normal' + onActionPerformed='doSelectNormal()'/> + <JRadioButton id='onlytech' selected='false' buttonGroup='type' text='lutinutil.common.toggle.technical' + onActionPerformed='doSelectTechnical()'/> + <JRadioButton id='all' selected='false' buttonGroup='type' text='lutinutil.common.toggle.all' + onActionPerformed='doSelectAll()'/> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='save' text='lutinutil.common.save' onActionPerformed='doSave()'/> + <JButton id='reset' text='lutinutil.common.reset' onActionPerformed='doReset()'/> + </JPanel> + </cell> + </row> +</Table> Property changes on: commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTab.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JConfigUI.jaxx (from rev 1296, commandline/trunk/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JConfigUI.jaxx) =================================================================== --- commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JConfigUI.jaxx (rev 0) +++ commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JConfigUI.jaxx 2009-01-21 04:35:05 UTC (rev 1309) @@ -0,0 +1,47 @@ +<JDialog title='lutinutil.config.title' modal='true' + defaultCloseOperation='DISPOSE_ON_CLOSE' width='500' height='300'> + <script> + public ListCellRenderer getListener() { return null; } + + public void onValueChanged() {} + + Action quitAction ; + + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(quit); + quitAction = new AbstractAction(quit.getText()) { + private static final long serialVersionUID = -869095664995763057L; + public void actionPerformed(ActionEvent e) { + dispose(); + } + }; + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"quit"); + rootPane.getActionMap().put("quit", quitAction); + </script> + <DefaultListModel id='listModel'/> + <java.awt.CardLayout id='cardLayout'/> + <Table> + <row fill='both'> + <cell weighty='1' fill='both' weightx='1'> + <Table> + <row> + <cell weighty='1' fill='both' weightx='1'> + <JScrollPane> + <JList id='list' onValueChanged='onValueChanged()' cellRenderer='{getListener()}' + model='{listModel}'/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weighty='1' weightx='2'> + <JPanel id='preview' layout='{cardLayout}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both'> + <JButton id='quit' text='lutinutil.common.quit' action='{quitAction}'/> + </cell> + </row> + </Table> +</JDialog> Property changes on: commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JConfigUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JLoginUI.jaxx (from rev 1296, commandline/trunk/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JLoginUI.jaxx) =================================================================== --- commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JLoginUI.jaxx (rev 0) +++ commandline/trunk/commandline-ui/src/main/java/org/codelutin/option/ui/JLoginUI.jaxx 2009-01-21 04:35:05 UTC (rev 1309) @@ -0,0 +1,79 @@ +<JDialog title="lutinutil.connexion" modal='true' locationRelativeTo="{null}" defaultCloseOperation="dispose_on_close"> + <script> + protected LoginUIHandler handler; + + public boolean launch(String login,String password) { + if (login != null) { + this.getLogin().setText(login); + } + if (password!=null) { + this.getPassword().setText(password); + } + check(); + setVisible(true); + return !handler.cancel; + } + + public JLoginUI(JFrame instance, LoginUIHandler handler) { + super(instance); + this.handler = handler; + this.handler.setUi(this); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(ok); + } + + protected void doConnect() { + handler.doConnect(); + if (handler.isCancel()) { + doCancel(); + } + } + + protected void doCancel() { + handler.doCancel(); + dispose(); + } + + protected void check() { + ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0); + } + + + </script> + <Table insets='5,5,5,5'> + <row> + <cell> + <JLabel text="lutinutil.login"/> + </cell> + <cell> + <JTextField id="login" onKeyReleased='check()' onActionPerformed='check()'/> + </cell> + </row> + <row> + <cell> + <JLabel text="lutinutil.password"/> + </cell> + <cell> + <JPasswordField id="password" onKeyReleased='check()' onActionPerformed='check()'/> + </cell> + </row> + <row> + <cell> + <JCheckBox id="rememberCheckBox"/> + </cell> + <cell> + <JLabel text="lutinutil.remember_password"/> + </cell> + </row> + <row> + <cell> + <JButton id='ok' text='lutinutil.common.apply' onActionPerformed="doConnect()" enabled='false'/> + </cell> + <cell> + <JButton text='lutinutil.common.cancel' onActionPerformed="doCancel()"/> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Modified: commandline/trunk/commandline-ui-action/changelog.txt =================================================================== --- commandline/trunk/commandline-ui-action/changelog.txt 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-ui-action/changelog.txt 2009-01-21 04:35:05 UTC (rev 1309) @@ -1,2 +1,6 @@ -1.0 chemit 200812?? +1.0 chemit 200901?? + * 20090121 [chemit] - refactor pom for sibling module dependencies + - use Jaxx 1.1-SNAPSHOT + - use lutinutil 1.0.2 + - use lutinwidget 0.12 * 20081205 [chemit] use lutinproject 3.2 Modified: commandline/trunk/commandline-ui-action/pom.xml =================================================================== --- commandline/trunk/commandline-ui-action/pom.xml 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/commandline-ui-action/pom.xml 2009-01-21 04:35:05 UTC (rev 1309) @@ -22,10 +22,11 @@ <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-ui</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> </dependency> @@ -50,7 +51,7 @@ <!-- jaxx --> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> </plugin> Copied: commandline/trunk/commandline-ui-action/src/main/java/org/codelutin/option/ui/JAboutUI.jaxx (from rev 1296, commandline/trunk/commandline-ui-action/src/main/uimodel/org/codelutin/option/ui/JAboutUI.jaxx) =================================================================== --- commandline/trunk/commandline-ui-action/src/main/java/org/codelutin/option/ui/JAboutUI.jaxx (rev 0) +++ commandline/trunk/commandline-ui-action/src/main/java/org/codelutin/option/ui/JAboutUI.jaxx 2009-01-21 04:35:05 UTC (rev 1309) @@ -0,0 +1,41 @@ +<JDialog title="commandline.action.about" undecorated='false' resizable='false' modal='true' locationRelativeTo="{null}" + defaultCloseOperation="dispose_on_close" width="300" height="300" onMouseClicked="dispose()"> + + <Table insets='5,5,5,5'> + <row> + <cell> + <JLabel id="applicationName"/> + </cell> + </row> + <row> + <cell> + <JEditorPane id="applicationWebsite" contentType="text/html" editable='false' opaque='false'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JSeparator orientation='horizontal'/> + </cell> + </row> + <row> + <cell> + <JLabel id="organisationName"/> + </cell> + </row> + <row> + <cell> + <JEditorPane id="organisationWebsite" contentType="text/html" editable='false'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JSeparator orientation='horizontal'/> + </cell> + </row> + <row> + <cell> + <JLabel id="copyright"/> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Modified: commandline/trunk/maven-commandline-plugin/changelog.txt =================================================================== --- commandline/trunk/maven-commandline-plugin/changelog.txt 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/maven-commandline-plugin/changelog.txt 2009-01-21 04:35:05 UTC (rev 1309) @@ -1,2 +1,3 @@ -1.0 chemit 200812?? +1.0 chemit 200901?? + * 20090121 [chemit] - refactor pom for sibling module dependencies * 20081205 [chemit] use lutinproject 3.2 Modified: commandline/trunk/maven-commandline-plugin/pom.xml =================================================================== --- commandline/trunk/maven-commandline-plugin/pom.xml 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/maven-commandline-plugin/pom.xml 2009-01-21 04:35:05 UTC (rev 1309) @@ -22,6 +22,7 @@ <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-core</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -80,7 +81,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> </plugin> @@ -92,7 +92,6 @@ <!--Site report's plugin--> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> </plugin> Modified: commandline/trunk/pom.xml =================================================================== --- commandline/trunk/pom.xml 2009-01-11 21:33:42 UTC (rev 1308) +++ commandline/trunk/pom.xml 2009-01-21 04:35:05 UTC (rev 1309) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.2</version> + <version>3.3</version> </parent> <groupId>org.codelutin</groupId> @@ -52,9 +52,9 @@ <plugins> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -80,13 +80,13 @@ <properties> <!-- jaxx version --> - <jaxx.version>0.7-SNAPSHOT</jaxx.version> + <jaxx.version>1.1-SNAPSHOT</jaxx.version> <!-- lutinwidget version --> - <lutinwidget.version>0.10</lutinwidget.version> + <lutinwidget.version>0.12</lutinwidget.version> <!-- lutinutil version --> - <lutinutil.version>1.0-SNAPSHOT</lutinutil.version> + <lutinutil.version>1.0.2</lutinutil.version> <!-- id du projet du labs --> <labs.id>12</labs.id> @@ -119,41 +119,24 @@ <!-- jaxx library --> <dependency> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-util</artifactId> <version>${jaxx.version}</version> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing</artifactId> <version>${jaxx.version}</version> </dependency> <dependency> - <groupId>org.codelutin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> <version>${jaxx.version}</version> </dependency> <dependency> - <groupId>org.codelutin.commandline</groupId> - <artifactId>commandline-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.codelutin.commandline</groupId> - <artifactId>commandline-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.codelutin.commandline</groupId> - <artifactId>commandline-ui-action</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>2.0.4</version>