- Jaxx-commits - mailman.cloud.codelutin.com

r2524 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by tchemit＠users.nuiton.org Nov. 23, 2012

Nov. 23, 2012

Author: tchemit Date: 2012-11-23 11:19:03 +0100 (Fri, 23 Nov 2012) New Revision: 2524 Url: http://nuiton.org/repositories/revision/jaxx/2524 Log: [maven-release-plugin] prepare release jaxx-2.5.7 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/jaxx-compiler/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/jaxx-demo/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/jaxx-maven-plugin/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/jaxx-runtime/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/jaxx-validator/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/jaxx-widgets/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-23 10:17:34 UTC (rev 2523) +++ trunk/pom.xml 2012-11-23 10:19:03 UTC (rev 2524) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.7-SNAPSHOT</version> + <version>2.5.7</version> <modules> <module>jaxx-runtime</module> @@ -130,11 +130,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.7</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.7 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.7</url> </scm> <distributionManagement>

1 0

r2523 - trunk/jaxx-maven-plugin/src/license
by tchemit＠users.nuiton.org Nov. 23, 2012

Nov. 23, 2012

Author: tchemit Date: 2012-11-23 11:17:34 +0100 (Fri, 23 Nov 2012) New Revision: 2523 Url: http://nuiton.org/repositories/revision/jaxx/2523 Log: optimize third parties Modified: trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties 2012-11-21 14:06:50 UTC (rev 2522) +++ trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties 2012-11-23 10:17:34 UTC (rev 2523) @@ -2,7 +2,6 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License -# - Apache Public License 2.0 # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -22,7 +21,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Oct 07 18:56:35 CEST 2012 +#Mon Nov 12 04:54:01 CET 2012 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 @@ -33,4 +32,3 @@ org.slf4j--slf4j-api--1.5.6=MIT license org.slf4j--slf4j-jdk14--1.5.6=MIT license org.slf4j--slf4j-nop--1.5.3=MIT license -oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r2522 - trunk
by tchemit＠users.nuiton.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 15:06:50 +0100 (Wed, 21 Nov 2012) New Revision: 2522 Url: http://nuiton.org/repositories/revision/jaxx/2522 Log: fixes #2454: Updates to plexus-util 3.0.9 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-21 11:43:40 UTC (rev 2521) +++ trunk/pom.xml 2012-11-21 14:06:50 UTC (rev 2522) @@ -117,6 +117,7 @@ <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.4</swingXVersion> + <plexusUtilVersion>3.0.9</plexusUtilVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -372,11 +373,10 @@ </exclusions> </dependency> -  <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.8</version> + <version>${plexusUtilVersion}</version> <scope>compile</scope> </dependency>

1 0

r2521 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 12:43:40 +0100 (Wed, 21 Nov 2012) New Revision: 2521 Url: http://nuiton.org/repositories/revision/jaxx/2521 Log: fixes #2453: Use css for bean widgets Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css 2012-11-21 11:43:40 UTC (rev 2521) @@ -0,0 +1,93 @@ +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +#indexes { + useToolTipText:true; +} + +#sortGroup { + useToolTipText:true; + selectedValue:{isReverseSort()}; +} + +#popup { + border:{new TitledBorder(_("beancombobox.popup.title"))}; +} + +#popupSortLabel { + actionIcon:"bean-sort"; + text:"bean.sort.label"; +} + +#sortUp { + buttonGroup:"sortGroup"; + value:{false}; + actionIcon:"bean-sort-up"; + text:"bean.sort.up"; + selected:{!isReverseSort()}; +} + +#sortDown { + buttonGroup:"sortGroup"; + value:{true}; + actionIcon:"bean-sort-down"; + text:"bean.sort.down"; + selected:{isReverseSort()}; +} + +#toolbarLeft { + floatable:false; + borderPainted:false; + visible:{isShowReset()}; +} + +#resetButton { + actionIcon:"combobox-reset"; + toolTipText:"beancombobox.action.reset.tip"; + focusable:false; + focusPainted:false; + enabled:{isEditable() && isEnabled()}; +} + +#combobox { + selectedItem:{getSelectedItem()}; + enabled:{isEnabled()}; + editable:{isEditable()}; + focusable:{isEnabled() && isEditable()}; +} + +#toolbarRight { + floatable:false; + borderPainted:false; + visible:{isShowDecorator()}; +} + +#changeDecorator { + actionIcon:"combobox-sort"; + toolTipText:"beancombobox.action.sort.tip"; + focusable:false; + focusPainted:false; +} + + + Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-11-20 21:16:20 UTC (rev 2520) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-11-21 11:43:40 UTC (rev 2521) @@ -63,11 +63,10 @@ <java.util.List id='data' genericType='O' javaBean='null'/>  - <ButtonGroup id='indexes' useToolTipText='true' + <ButtonGroup id='indexes' onStateChanged='setIndex((Integer)indexes.getSelectedValue())'/> - <ButtonGroup id='sortGroup' useToolTipText='true' - selectedValue='{isReverseSort()}' + <ButtonGroup id='sortGroup' onStateChanged='setReverseSort((Boolean)sortGroup.getSelectedValue())'/>  @@ -83,18 +82,13 @@  <JPopupMenu id='popup' - border='{new TitledBorder(_("beancombobox.popup.title"))}' onPopupMenuWillBecomeInvisible='getChangeDecorator().setSelected(false)' onPopupMenuCanceled='getChangeDecorator().setSelected(false)'> - <JLabel id='popupSortLabel' actionIcon="bean-sort" text="bean.sort.label"/> + <JLabel id='popupSortLabel'/> - <JRadioButtonMenuItem id='sortUp' buttonGroup="sortGroup" value='{false}' - actionIcon="bean-sort-up" text='bean.sort.up' - selected='{!isReverseSort()}'/> + <JRadioButtonMenuItem id='sortUp'/> - <JRadioButtonMenuItem id='sortDown' buttonGroup="sortGroup" value='{true}' - actionIcon="bean-sort-down" text='bean.sort.down' - selected='{isReverseSort()}'/> + <JRadioButtonMenuItem id='sortDown'/> <JSeparator id='popupSeparator'/> <JLabel id='popupLabel'/> @@ -116,36 +110,21 @@ <row> <cell anchor='west'>  - <JToolBar floatable='false' borderPainted='false' - visible='{isShowReset()}'> - <JButton actionIcon='combobox-reset' - toolTipText='beancombobox.action.reset.tip' - focusable='false' - focusPainted='false' - enabled='{isEditable() && isEnabled()}' - onActionPerformed='setSelectedItem(null)'/> + <JToolBar id='toolbarLeft'> + <JButton id='resetButton' onActionPerformed='setSelectedItem(null)'/> </JToolBar> </cell> <cell weightx='1'>  <JComboBox id='combobox' - selectedItem='{getSelectedItem()}' - enabled='{isEnabled()}' - editable='{isEditable()}' - focusable='{isEnabled() && isEditable()}' onFocusGained='hidePopup()' onItemStateChanged='setSelectedItem(combobox.getSelectedItem())'/> </cell> <cell anchor='east' fill='both' insets='0'>  - <JToolBar floatable='false' borderPainted='false' - visible='{isShowDecorator()}'> + <JToolBar id='toolbarRight'> <JToggleButton id='changeDecorator' - actionIcon='combobox-sort' - toolTipText='beancombobox.action.sort.tip' - focusable='false' - focusPainted='false' onActionPerformed='getHandler().togglePopup()'/> </JToolBar> </cell> Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css 2012-11-21 11:43:40 UTC (rev 2521) @@ -0,0 +1,89 @@ +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +#indexes { + useToolTipText:true; +} + +#sortGroup { + useToolTipText:true; + selectedValue:{isReverseSort()}; +} + +#popup { + border:{new TitledBorder(_("beanlist.popup.title"))}; +} + +#popupSortLabel { + actionIcon:"bean-sort"; + text:"bean.sort.label"; +} + +#sortUp { + buttonGroup:"sortGroup"; + value:{false}; + actionIcon:"bean-sort-up"; + text:"bean.sort.up"; + selected:{!isReverseSort()}; +} + +#sortDown { + buttonGroup:"sortGroup"; + value:{true}; + actionIcon:"bean-sort-down"; + text:"bean.sort.down"; + selected:{isReverseSort()}; +} + +#label { + opaque:false; + text:{SwingUtil.getStringValue(getLabelText())}; +} + +#toolbar { + floatable:false; + borderPainted:false; +} + +#resetSelection { + actionIcon:"combobox-reset"; + toolTipText:"beanlist.action.reset.tip"; + focusable:false; + focusPainted:false; + visible:{isShowReset()}; + enabled:{isEnabled() && getList().getSelectedValue() != null}; +} + +#changeDecorator { + actionIcon:"combobox-sort"; + toolTipText:"beanlist.action.sort.tip"; + focusable:false; + focusPainted:false; + visible:{isShowDecorator()}; +} + + + + + + Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2012-11-20 21:16:20 UTC (rev 2520) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2012-11-21 11:43:40 UTC (rev 2521) @@ -55,11 +55,10 @@ <java.util.List id='data' genericType='O' javaBean='null'/>  - <ButtonGroup id='indexes' useToolTipText='true' + <ButtonGroup id='indexes' onStateChanged='setIndex((Integer)indexes.getSelectedValue())'/> - <ButtonGroup id='sortGroup' useToolTipText='true' - selectedValue='{isReverseSort()}' + <ButtonGroup id='sortGroup' onStateChanged='setReverseSort((Boolean)sortGroup.getSelectedValue())'/>  @@ -75,19 +74,14 @@  <JPopupMenu id='popup' - border='{new TitledBorder(_("beanlist.popup.title"))}' onPopupMenuWillBecomeInvisible='getChangeDecorator().setSelected(false)' onPopupMenuCanceled='getChangeDecorator().setSelected(false)'> - <JLabel id='popupSortLabel' actionIcon="bean-sort" text="bean.sort.label"/> + <JLabel id='popupSortLabel'/> - <JRadioButtonMenuItem id='sortUp' buttonGroup="sortGroup" value='{false}' - actionIcon="bean-sort-up" text='bean.sort.up' - selected='{!isReverseSort()}'/> + <JRadioButtonMenuItem id='sortUp'/> - <JRadioButtonMenuItem id='sortDown' buttonGroup="sortGroup" value='{true}' - actionIcon="bean-sort-down" text='bean.sort.down' - selected='{isReverseSort()}'/> + <JRadioButtonMenuItem id='sortDown'/> <JSeparator id='popupSeparator'/> <JLabel id='popupLabel'/> @@ -109,29 +103,16 @@ ]]> </script> - <JLabel id="label" constraints='BorderLayout.CENTER' opaque='false' - text='{SwingUtil.getStringValue(getLabelText())}'/> + <JLabel id="label" constraints='BorderLayout.CENTER'/> - <JToolBar floatable='false' borderPainted='false' - constraints='BorderLayout.EAST'> + <JToolBar id='toolbar' constraints='BorderLayout.EAST'>  <JButton id='resetSelection' - actionIcon='combobox-reset' - toolTipText='beanlist.action.reset.tip' - focusable='false' - focusPainted='false' - visible='{isShowReset()}' - enabled='{isEnabled() && getList().getSelectedValue() != null}' onActionPerformed='getList().getSelectionModel().clearSelection()'/>  <JToggleButton id='changeDecorator' - actionIcon='combobox-sort' - toolTipText='beanlist.action.sort.tip' - focusable='false' - focusPainted='false' - visible='{isShowDecorator()}' onActionPerformed='getHandler().togglePopup()'/> </JToolBar> </JPanel>

1 0

r2520 - trunk
by tchemit＠users.nuiton.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-20 22:16:20 +0100 (Tue, 20 Nov 2012) New Revision: 2520 Url: http://nuiton.org/repositories/revision/jaxx/2520 Log: fixes #2450: Updates to eugene 2.5.6 fixes #2449: Updates to nuiton-utils 2.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-20 21:09:53 UTC (rev 2519) +++ trunk/pom.xml 2012-11-20 21:16:20 UTC (rev 2520) @@ -111,9 +111,9 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <eugeneVersion>2.5</eugeneVersion> + <eugeneVersion>2.5.6</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.4</swingXVersion>

1 0

r2519 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-20 22:09:53 +0100 (Tue, 20 Nov 2012) New Revision: 2519 Url: http://nuiton.org/repositories/revision/jaxx/2519 Log: fixes #2448: Can not use enabled binding on TabInfo Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java 2012-11-16 16:15:05 UTC (rev 2518) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java 2012-11-20 21:09:53 UTC (rev 2519) @@ -63,6 +63,8 @@ tabs.setDisabledIconAt(tabIndex, (Icon) e.getNewValue()); } else if (name.equals(TabInfo.TAB_COMPONENT_PROPERTY)) { tabs.setTabComponentAt(tabIndex, (Component) e.getNewValue()); + } else if (name.equals(TabInfo.ENABLED_PROPERTY)) { + tabs.setEnabledAt(tabIndex, (Boolean) e.getNewValue()); } } }

1 0

r2518 - trunk
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 17:15:05 +0100 (Fri, 16 Nov 2012) New Revision: 2518 Url: http://nuiton.org/repositories/revision/jaxx/2518 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 15:33:35 UTC (rev 2517) +++ trunk/pom.xml 2012-11-16 16:15:05 UTC (rev 2518) @@ -133,7 +133,7 @@ <developerConnection> scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2517 - trunk
by tchemit＠users.nuiton.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 16:33:35 +0100 (Fri, 16 Nov 2012) New Revision: 2517 Url: http://nuiton.org/repositories/revision/jaxx/2517 Log: fixes #2428: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 19:54:31 UTC (rev 2516) +++ trunk/pom.xml 2012-11-16 15:33:35 UTC (rev 2517) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4-SNAPSHOT</version> + <version>3.4.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2516 - in trunk: . jaxx-compiler/src/main/java/jaxx/compiler/css jaxx-compiler/src/main/java/jaxx/compiler/tags jaxx-compiler/src/main/java/jaxx/compiler/tags/swing jaxx-maven-plugin
by tchemit＠users.nuiton.org Nov. 11, 2012

Nov. 11, 2012

Author: tchemit Date: 2012-11-11 20:54:31 +0100 (Sun, 11 Nov 2012) New Revision: 2516 Url: http://nuiton.org/repositories/revision/jaxx/2516 Log: fixes #2429: Updates to helper-m-p 2.0 refs #2428: Updates to mavenpom 3.4.4 Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java trunk/jaxx-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java 2012-10-30 07:43:45 UTC (rev 2515) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java 2012-11-11 19:54:31 UTC (rev 2516) @@ -27,6 +27,7 @@ import jaxx.compiler.CompiledObject; import jaxx.compiler.CompilerException; +import jaxx.compiler.I18nHelper; import jaxx.compiler.JAXXCompiler; import jaxx.compiler.binding.DataBinding; import jaxx.compiler.binding.DataBindingHelper; @@ -38,6 +39,7 @@ import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.reflect.MethodDescriptor; +import jaxx.compiler.tags.DefaultComponentHandler; import jaxx.compiler.tags.DefaultObjectHandler; import jaxx.compiler.tags.TagManager; import jaxx.compiler.types.TypeManager; @@ -257,8 +259,13 @@ value.equals(Rule.DATA_BINDING)) { continue; } + + if (handler instanceof DefaultComponentHandler) handler.setAttribute(object, e.getKey(), e.getValue(), false, compiler); + else { + handler.setAttributeFromCss(object, e.getKey(), value, compiler); + } } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2012-10-30 07:43:45 UTC (rev 2515) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2012-11-11 19:54:31 UTC (rev 2516) @@ -28,6 +28,7 @@ import jaxx.compiler.CompiledObject; import jaxx.compiler.CompiledObjectDecorator; import jaxx.compiler.CompilerException; +import jaxx.compiler.I18nHelper; import jaxx.compiler.JAXXCompiler; import jaxx.compiler.UnsupportedAttributeException; import jaxx.compiler.beans.JAXXBeanInfo; @@ -759,6 +760,76 @@ * @param object the object on which to set the property * @param propertyName the name of the property to set * @param stringValue the raw string value of the property from the XML + * @param compiler the current <code>JAXXCompiler</code> + */ + public void setAttributeFromCss(CompiledObject object, + String propertyName, + String stringValue, + JAXXCompiler compiler) { + + try { + + object.addProperty(propertyName, stringValue); + ClassDescriptor type = getPropertyType(object, propertyName, compiler); + String binding = DataBindingHelper.processDataBindings(stringValue); + boolean withBinding = binding != null; + + if (!withBinding) { + // no bindings, convert from string + + // add support for i18n attributes (otherwise already done in DefaultComponentHandler) + if (I18nHelper.isI18nableAttribute(propertyName, compiler)) { + stringValue = I18nHelper.addI18nInvocation(object.getId(), propertyName, stringValue, compiler); + } + + try { + Class<?> typeClass = type != null ? + ClassDescriptorHelper.getClass(type.getName(), type.getClassLoader()) : + null; + Object value = convertFromString(propertyName, + stringValue, + typeClass + ); + setProperty(object, propertyName, value, compiler); + return; + } catch (NumberFormatException e) { + compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); + } catch (IllegalArgumentException e) { + compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); + } catch (ClassNotFoundException e) { + compiler.reportError("could not find class " + type.getName()); + } + } + String setPropertyCode = getSetPropertyCode(object.getJavaCode(), propertyName, binding, compiler); + if (propertyName.equals(LAYOUT_ATTRIBUTE)) { + + // try to add the layout class in imports + if (setPropertyCode.contains(BORDER_LAYOUT_PREFIX)) { + compiler.addImport(BorderLayout.class); + } else if (setPropertyCode.contains(GRID_LAYOUT_PREFIX)) { + compiler.addImport(GridLayout.class); + } + // handle containerDelegate (e.g. contentPane on JFrame) + // have to set layout early, before children are added + object.appendInitializationCode(setPropertyCode); + } + compiler.getBindingHelper().registerDataBinding( + object.getId() + "." + propertyName, + binding, + setPropertyCode + ); + } catch (UnsupportedAttributeException e) { + compiler.reportError("class " + object.getObjectClass().getName() + " does not support attribute '" + propertyName + "'"); + } + } + + /** + * Set a single property on an object. The value may be either a simple value or contain data binding expressions. + * Simple values are first converted to the property's type using {@link #convertFromString(String, String, Class)}. + * + * @param object the object on which to set the property + * @param propertyName the name of the property to set + * @param stringValue the raw string value of the property from the XML * @param inline <code>true</code> if the value was directly specified as an inline class tag attribute, <code>false</code> otherwise (a default value, specified in CSS, etc.) * @param compiler the current <code>JAXXCompiler</code> */ @@ -1108,7 +1179,7 @@ StringBuilder message = new StringBuilder("value of '" + - key + "' must be one of: ["); + key + "' must be one of: ["); for (int j = 0; j < values.length - 2; j += 3) { if (j != 0) { message.append(", "); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java 2012-10-30 07:43:45 UTC (rev 2515) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java 2012-11-11 19:54:31 UTC (rev 2516) @@ -93,16 +93,7 @@ // id = compiler.getAutoId(ClassDescriptorHelper.getClassDescriptor(TabInfo.class)); } TabInfo tabInfo = new TabInfo(id); - CompiledObject compiledTabInfo = new CompiledObject(id, ClassDescriptorHelper.getClassDescriptor(TabInfo.class), compiler) { - - @Override - public void addProperty(String property, String value) { - if (I18nHelper.isI18nableAttribute(property, compiler)) { - value = I18nHelper.addI18nInvocation(getId(), property, value, compiler); - } - super.addProperty(property, value); - } - }; + CompiledObject compiledTabInfo = new CompiledObject(id, ClassDescriptorHelper.getClassDescriptor(TabInfo.class), compiler); compiler.registerCompiledObject(compiledTabInfo); //id = tabInfo.getId(); tabs.tabInfo = tabInfo; Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-10-30 07:43:45 UTC (rev 2515) +++ trunk/jaxx-maven-plugin/pom.xml 2012-11-11 19:54:31 UTC (rev 2516) @@ -87,7 +87,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> </dependency> <dependency> @@ -147,7 +147,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> <classifier>tests</classifier> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:43:45 UTC (rev 2515) +++ trunk/pom.xml 2012-11-11 19:54:31 UTC (rev 2516) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -199,80 +199,27 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> <scope>compile</scope> <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> - - <exclusion> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> </exclusion> <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> <scope>test</scope> <classifier>tests</classifier> @@ -284,40 +231,10 @@ </exclusion> <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> - </exclusions> </dependency>

1 0

r2515 - trunk
by tchemit＠users.nuiton.org Oct. 30, 2012

Oct. 30, 2012

Author: tchemit Date: 2012-10-30 08:43:45 +0100 (Tue, 30 Oct 2012) New Revision: 2515 Url: http://nuiton.org/repositories/revision/jaxx/2515 Log: Update mavenpom4redmineAndCentral to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:43:24 UTC (rev 2514) +++ trunk/pom.xml 2012-10-30 07:43:45 UTC (rev 2515) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <artifactId>jaxx</artifactId>

1 0