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

[ANN] - JAXX 2.5.27 released
by nuiton.org Release Notification 30 Sep '13

30 Sep '13

The JAXX team is pleased to announce the jaxx-2.5.27 release! JAXX Project Documentation of the project can be found here: http://maven-site.nuiton.org/jaxx Changes ------- Changes in this version include: New features: o [BeanDoubleList] Be able to show or hide the selected list popup Issue: 2857. Thanks to Tony Chemit. Resolved by tchemit. o [BeanDoubleList] Be able to add more than once selected for agiven universe item Issue: 2862. Thanks to Tony Chemit. Resolved by tchemit. o [BeanDoublieList] Can add a second decorator form selected list Issue: 2863. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [BeanFilterableComboBox] Editor still open even if editor is disabled Issue: 2856. Thanks to Tony Chemit. Resolved by tchemit. Changes: o Updates nuiton-decorator to 3.0-alpha-2 Issue: 2859. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.jaxx|jaxx-demo|2.5.27|j… Have fun! -JAXX team

1 0

r2731 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 30 Sep '13

30 Sep '13

Author: maven-release Date: 2013-09-30 18:00:30 +0200 (Mon, 30 Sep 2013) New Revision: 2731 Url: http://nuiton.org/projects/jaxx/repository/revisions/2731 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/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 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-compiler/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-config/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-demo/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-maven-plugin/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-runtime/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-validator/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/jaxx-widgets/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-30 16:00:27 UTC (rev 2730) +++ trunk/pom.xml 2013-09-30 16:00:30 UTC (rev 2731) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.27</version> + <version>2.5.28-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.27</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2730 - tags
by maven-release＠users.nuiton.org 30 Sep '13

30 Sep '13

Author: maven-release Date: 2013-09-30 18:00:27 +0200 (Mon, 30 Sep 2013) New Revision: 2730 Url: http://nuiton.org/projects/jaxx/repository/revisions/2730 Log: [maven-release-plugin] copy for tag jaxx-2.5.27 Added: tags/jaxx-2.5.27/

1 0

r2729 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 30 Sep '13

30 Sep '13

Author: maven-release Date: 2013-09-30 18:00:24 +0200 (Mon, 30 Sep 2013) New Revision: 2729 Url: http://nuiton.org/projects/jaxx/repository/revisions/2729 Log: [maven-release-plugin] prepare release jaxx-2.5.27 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/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 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-compiler/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-config/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-demo/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-maven-plugin/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-runtime/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-validator/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/jaxx-widgets/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) +++ trunk/pom.xml 2013-09-30 16:00:24 UTC (rev 2729) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.27-SNAPSHOT</version> + <version>2.5.27</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,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.27</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.27 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.27</url> </scm> <distributionManagement>

1 0

r2728 - in trunk: . jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 30 Sep '13

30 Sep '13

Author: tchemit Date: 2013-09-30 17:57:56 +0200 (Mon, 30 Sep 2013) New Revision: 2728 Url: http://nuiton.org/projects/jaxx/repository/revisions/2728 Log: fixes #2859: Updates nuiton-decorator to 3.0-alpha-2 fixes #2863: [BeanDoublieList] Can add a second decorator form selected list Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java trunk/pom.xml Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-30 15:38:09 UTC (rev 2727) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-30 15:57:56 UTC (rev 2728) @@ -147,7 +147,11 @@ </row> <script><![CDATA[ - + +public void init(JXPathDecorator<O> decorator, JXPathDecorator<O> decorator2, List<O> universe, List<O> selected) { + handler.init(decorator, decorator2, universe, selected); + } + public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { handler.init(decorator, universe, selected); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-09-30 15:38:09 UTC (rev 2727) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-09-30 15:57:56 UTC (rev 2728) @@ -114,6 +114,17 @@ * @param selected the list of selected items */ public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { + init(decorator, decorator, universe, selected); + } + /** + * Initializes the handler of the UI + * + * @param decorator the decorator to use to display the data nicely + * @param decorator2 the selected decorator to use to display the selected data nicely (if none, then reuse the first one) + * @param universe the list of all the available items + * @param selected the list of selected items + */ + public void init(JXPathDecorator<O> decorator,JXPathDecorator<O> decorator2, List<O> universe, List<O> selected) { this.decorator = BeanUIUtil.createDecorator(decorator); // make sure useMultiSelect is set before filling universe and select lists @@ -128,8 +139,14 @@ final FilteredDecoratorListCellRenderer universeListCellRenderer = new FilteredDecoratorListCellRenderer(this.decorator); universeList.setCellRenderer(universeListCellRenderer); - selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); + if (decorator2 != null) { + decorator2 = BeanUIUtil.createDecorator(decorator2); + } else { + decorator2 = this.decorator; + } + selectedList.setCellRenderer(new DecoratorListCellRenderer(decorator2)); + // When universe list selection model changed, update the add button enabled property universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-30 15:38:09 UTC (rev 2727) +++ trunk/pom.xml 2013-09-30 15:57:56 UTC (rev 2728) @@ -116,7 +116,7 @@ <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> - <nuitonDecoratorVersion>3.0-SNAPSHOT</nuitonDecoratorVersion> + <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <eugeneVersion>2.6.3</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2727 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 30 Sep '13

30 Sep '13

Author: tchemit Date: 2013-09-30 17:38:09 +0200 (Mon, 30 Sep 2013) New Revision: 2727 Url: http://nuiton.org/projects/jaxx/repository/revisions/2727 Log: - make possible to change the model in BeanDoubleList - make possible to referesh a model Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-09-30 15:38:09 UTC (rev 2727) @@ -547,7 +547,12 @@ fireIntervalRemoved(this, fromIndex, toIndex); } + public void refresh() { + if (!isEmpty()) { + fireContentsChanged(this, 0, getSize() - 1); + } + } /* public void addAll(Collection c) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2013-09-30 15:38:09 UTC (rev 2727) @@ -62,12 +62,7 @@ int index, boolean isSelected, boolean cellHasFocus) { - if (value == null) { - value = " "; - } - if (!(value instanceof String) && decorator != null) { - value = decorator.toString(value); - } + value = decorateValue(value, index); return delegate.getListCellRendererComponent(list, value, index, @@ -75,4 +70,14 @@ cellHasFocus ); } + + protected Object decorateValue(Object value,int index) { + if (value == null) { + value = " "; + } + if (!(value instanceof String) && decorator != null) { + value = decorator.toString(value); + } + return value; + } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-09-30 15:38:09 UTC (rev 2727) @@ -31,24 +31,24 @@ } #universeList { - model:{model.getUniverseModel()}; + model:{getModel().getUniverseModel()}; } #addButton { toolTipText:"beandoublelist.button.add"; actionIcon:"bean-doublelist-select"; - enabled:{model.isAddEnabled()}; + enabled:{getModel().isAddEnabled()}; } #selectedList { - model:{model.getSelectedModel()}; + model:{getModel().getSelectedModel()}; componentPopupMenu:{handler.getSelectedListPopup(isShowSelectPopupEnabled())}; } #removeButton { toolTipText:"beandoublelist.button.remove"; actionIcon:"bean-doublelist-unselect"; - enabled:{model.isRemoveEnabled()}; + enabled:{getModel().isRemoveEnabled()}; } #popup { @@ -80,21 +80,21 @@ actionIcon: "bean-doublelist-up"; text: "bean.action.selected.move.up"; toolTipText: "bean.action.selected.move.up.tip"; - enabled:{model.isSelectedUpEnabled()}; + enabled:{getModel().isSelectedUpEnabled()}; } #selectedListMoveDownAction { actionIcon: "bean-doublelist-down"; text: "bean.action.selected.move.down"; toolTipText: "bean.action.selected.move.down.tip"; - enabled:{model.isSelectedDownEnabled()}; + enabled:{getModel().isSelectedDownEnabled()}; } #selectedListRemoveAction { actionIcon: "bean-doublelist-unselect"; text: "bean.action.selected.remove"; toolTipText: "bean.action.selected.remove.tip"; - enabled:{model.isRemoveEnabled()}; + enabled:{getModel().isRemoveEnabled()}; } #toolbarLeft { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-30 15:38:09 UTC (rev 2727) @@ -60,7 +60,7 @@ <String id='i18nPrefix' javaBean='"beanlist.common."'/>  - <BeanDoubleListModel id='model' genericType='O'/> + <BeanDoubleListModel id='model' genericType='O' javaBean='new BeanDoubleListModel<O>()'/>  <BeanDoubleListHandler id='handler' genericType='O' constructorParams='this'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-09-30 15:38:09 UTC (rev 2727) @@ -55,7 +55,7 @@ public static final String PROPERTY_SELECTED_DOWN_ENABLED = "selectedDownEnabled"; - public static final String PROPERTY_USE_MULTI_SELECT= "useMultiSelect"; + public static final String PROPERTY_USE_MULTI_SELECT = "useMultiSelect"; private static final long serialVersionUID = 1L; @@ -209,8 +209,8 @@ public void moveUpSelected(O item) { int i = selected.indexOf(item); selected.remove(item); + selectedModel.removeElement(item); selected.add(i - 1, item); - selectedModel.removeElement(item); selectedModel.insertElementAt(item, i - 1); } @@ -223,8 +223,8 @@ public void moveDownSelected(O item) { int i = selected.indexOf(item); selected.remove(item); + selectedModel.removeElement(item); selected.add(i + 1, item); - selectedModel.removeElement(item); selectedModel.insertElementAt(item, i + 1); }

1 0

r2726 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 29 Sep '13

29 Sep '13

Author: tchemit Date: 2013-09-29 11:42:27 +0200 (Sun, 29 Sep 2013) New Revision: 2726 Url: http://nuiton.org/projects/jaxx/repository/revisions/2726 Log: fixes Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-28 14:31:14 UTC (rev 2725) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-29 09:42:27 UTC (rev 2726) @@ -24,9 +24,7 @@ <Table genericType='O' implements='jaxx.runtime.bean.BeanTypeAware<O>'> <import> - jaxx.runtime.swing.model.JaxxDefaultListModel org.nuiton.decorator.JXPathDecorator - javax.swing.DefaultListModel </import>  @@ -41,6 +39,9 @@  <Boolean id='showReset' javaBean='true'/> +  + <Boolean id='useMultiSelect' javaBean='false'/> +  <Boolean id='showSelectPopupEnabled' javaBean='true'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-09-28 14:31:14 UTC (rev 2725) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-09-29 09:42:27 UTC (rev 2726) @@ -116,6 +116,9 @@ public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { this.decorator = BeanUIUtil.createDecorator(decorator); + // make sure useMultiSelect is set before filling universe and select lists + ui.getModel().setUseMultiSelect(ui.getUseMultiSelect()); + ui.getModel().setUniverse(universe); ui.getModel().setSelected(selected); @@ -446,6 +449,9 @@ } else if (BeanDoubleList.PROPERTY_HIGHLIGHT_FILTER_TEXT.equals(propertyName)) { setHighlightFilterText((Boolean) evt.getNewValue()); + } else if (BeanDoubleList.PROPERTY_USE_MULTI_SELECT.equals(propertyName)) { + + ui.getModel().setUseMultiSelect((Boolean) evt.getNewValue()); } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-09-28 14:31:14 UTC (rev 2725) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-09-29 09:42:27 UTC (rev 2726) @@ -55,6 +55,8 @@ public static final String PROPERTY_SELECTED_DOWN_ENABLED = "selectedDownEnabled"; + public static final String PROPERTY_USE_MULTI_SELECT= "useMultiSelect"; + private static final long serialVersionUID = 1L; /** List of all the available items */ @@ -77,6 +79,8 @@ protected boolean selectedDownEnabled; + protected boolean useMultiSelect; + /** * To get the selected items. * @@ -149,7 +153,9 @@ public void addToSelected(O item) { selected.add(item); selectedModel.addElement(item); - universeModel.removeElement(item); + if (!useMultiSelect) { + universeModel.removeElement(item); + } } /** @@ -161,7 +167,8 @@ selected.addAll(items); for (O item : items) { selectedModel.addElement(item); - universeModel.removeElement(item); + if (!useMultiSelect) + universeModel.removeElement(item); } } @@ -173,7 +180,9 @@ public void removeFromSelected(O item) { selected.remove(item); selectedModel.removeElement(item); - addToUniverseList(item); + if (!useMultiSelect) { + addToUniverseList(item); + } } /** @@ -185,7 +194,9 @@ selected.removeAll(items); for (O item : items) { selectedModel.removeElement(item); - addToUniverseList(item); + if (!useMultiSelect) { + addToUniverseList(item); + } } } @@ -257,6 +268,17 @@ firePropertyChange(PROPERTY_SELECTED_DOWN_ENABLED, oldValue, selectedDownEnabled); } + + public boolean isUseMultiSelect() { + return useMultiSelect; + } + + public void setUseMultiSelect(boolean useMultiSelect) { + boolean oldValue = isUseMultiSelect(); + this.useMultiSelect = useMultiSelect; + firePropertyChange(PROPERTY_USE_MULTI_SELECT, oldValue, useMultiSelect); + } + /** * Adds an item to the available items list at the right index * to keep always the same order.

1 0

r2725 - trunk
by tchemit＠users.nuiton.org 28 Sep '13

28 Sep '13

Author: tchemit Date: 2013-09-28 16:31:14 +0200 (Sat, 28 Sep 2013) New Revision: 2725 Url: http://nuiton.org/projects/jaxx/repository/revisions/2725 Log: refs #2859: Updates nuiton-decorator to 3.0-alpha-2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-27 07:34:43 UTC (rev 2724) +++ trunk/pom.xml 2013-09-28 14:31:14 UTC (rev 2725) @@ -116,7 +116,7 @@ <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> - <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion> + <nuitonDecoratorVersion>3.0-SNAPSHOT</nuitonDecoratorVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <eugeneVersion>2.6.3</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2724 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 27 Sep '13

27 Sep '13

Author: tchemit Date: 2013-09-27 09:34:43 +0200 (Fri, 27 Sep 2013) New Revision: 2724 Url: http://nuiton.org/projects/jaxx/repository/revisions/2724 Log: fixes #2857: [BeanDoubleList] Be able to show or hide the selected list popup Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-09-24 15:41:41 UTC (rev 2723) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-09-27 07:34:43 UTC (rev 2724) @@ -42,6 +42,7 @@ #selectedList { model:{model.getSelectedModel()}; + componentPopupMenu:{handler.getSelectedListPopup(isShowSelectPopupEnabled())}; } #removeButton { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-24 15:41:41 UTC (rev 2723) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-27 07:34:43 UTC (rev 2724) @@ -40,8 +40,11 @@  <Boolean id='showReset' javaBean='true'/> + +  + <Boolean id='showSelectPopupEnabled' javaBean='true'/> -  +  <Boolean id='highlightFilterText' javaBean='false'/>  @@ -137,8 +140,7 @@ <JList id='selectedList' onFocusGained='handler.selectFirstRowIfNoSelection(event)' onMouseClicked='handler.onSelectedListClicked(event)' - onKeyPressed='handler.onKeyPressedOnSelectedList(event)' - componentPopupMenu='{selectedListPopup}'/> + onKeyPressed='handler.onKeyPressedOnSelectedList(event)'/> </JScrollPane> </cell> </row> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-09-24 15:41:41 UTC (rev 2723) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-09-27 07:34:43 UTC (rev 2724) @@ -96,6 +96,16 @@ } }; + public JPopupMenu getSelectedListPopup(boolean showIt) { + JPopupMenu result; + if (showIt) { + result = ui.getSelectedListPopup(); + } else { + result = null; + } + return result; + } + /** * Initializes the handler of the UI * @@ -215,6 +225,9 @@ indexes.setSelectedButton(ui.getIndex()); sortData(); + + // force to reload the showSelectPopup binding + ui.processDataBinding(BeanDoubleList.BINDING_SELECTED_LIST_COMPONENT_POPUP_MENU); } public void setUniverse(List<O> selection) {

1 0

r2723 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 24 Sep '13

24 Sep '13

Author: tchemit Date: 2013-09-24 17:41:41 +0200 (Tue, 24 Sep 2013) New Revision: 2723 Url: http://nuiton.org/projects/jaxx/repository/revisions/2723 Log: fixes #2856: [BeanFilterableComboBox] Editor still open even if editor is disabled Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-09-23 10:19:14 UTC (rev 2722) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-09-24 15:41:41 UTC (rev 2723) @@ -182,7 +182,9 @@ @Override public void mouseClicked(MouseEvent e) { - combobox.showPopup(); + if (ui.isEnabled()) { + combobox.showPopup(); + } } }); @@ -190,7 +192,7 @@ @Override public void keyPressed(KeyEvent e) { - if (!combobox.isPopupVisible()) { + if (ui.isEnabled() && !combobox.isPopupVisible()) { combobox.showPopup(); } }

1 0