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

r2539 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by tchemit＠users.nuiton.org 15 Dec '12

15 Dec '12

Author: tchemit Date: 2012-12-15 01:13:24 +0100 (Sat, 15 Dec 2012) New Revision: 2539 Url: http://nuiton.org/projects/jaxx/repository/revisions/2539 Log: [maven-release-plugin] prepare for next development iteration 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-12-15 00:13:22 UTC (rev 2538) +++ trunk/jaxx-compiler/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-12-15 00:13:22 UTC (rev 2538) +++ trunk/jaxx-demo/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-12-15 00:13:22 UTC (rev 2538) +++ trunk/jaxx-maven-plugin/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-12-15 00:13:22 UTC (rev 2538) +++ trunk/jaxx-runtime/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-12-15 00:13:22 UTC (rev 2538) +++ trunk/jaxx-validator/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-12-15 00:13:22 UTC (rev 2538) +++ trunk/jaxx-widgets/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-15 00:13:22 UTC (rev 2538) +++ trunk/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.8</version> + <version>2.5.9-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -130,11 +130,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.8</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.8 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.8</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2538 - tags
by tchemit＠users.nuiton.org 15 Dec '12

15 Dec '12

Author: tchemit Date: 2012-12-15 01:13:22 +0100 (Sat, 15 Dec 2012) New Revision: 2538 Url: http://nuiton.org/projects/jaxx/repository/revisions/2538 Log: [maven-release-plugin] copy for tag jaxx-2.5.8 Added: tags/jaxx-2.5.8/

1 0

r2537 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by tchemit＠users.nuiton.org 15 Dec '12

15 Dec '12

Author: tchemit Date: 2012-12-15 01:13:19 +0100 (Sat, 15 Dec 2012) New Revision: 2537 Url: http://nuiton.org/projects/jaxx/repository/revisions/2537 Log: [maven-release-plugin] prepare release jaxx-2.5.8 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-12-14 09:22:33 UTC (rev 2536) +++ trunk/jaxx-compiler/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-12-14 09:22:33 UTC (rev 2536) +++ trunk/jaxx-demo/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-12-14 09:22:33 UTC (rev 2536) +++ trunk/jaxx-maven-plugin/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-12-14 09:22:33 UTC (rev 2536) +++ trunk/jaxx-runtime/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-12-14 09:22:33 UTC (rev 2536) +++ trunk/jaxx-validator/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-12-14 09:22:33 UTC (rev 2536) +++ trunk/jaxx-widgets/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 09:22:33 UTC (rev 2536) +++ trunk/pom.xml 2012-12-15 00:13:19 UTC (rev 2537) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.8-SNAPSHOT</version> + <version>2.5.8</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.8</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.8 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.8</url> </scm> <distributionManagement>

1 0

r2536 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 14 Dec '12

14 Dec '12

Author: tchemit Date: 2012-12-14 10:22:33 +0100 (Fri, 14 Dec 2012) New Revision: 2536 Url: http://nuiton.org/projects/jaxx/repository/revisions/2536 Log: fixes #2474: Create a double list widget Modified: 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/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-13 15:37:20 UTC (rev 2535) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-14 09:22:33 UTC (rev 2536) @@ -32,6 +32,8 @@ import javax.swing.JList; import javax.swing.ListSelectionModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.event.MouseEvent; @@ -75,6 +77,8 @@ public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { this.decorator = BeanUIUtil.createDecorator(decorator); + mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); + ui.getModel().setUniverse(universe); ui.getModel().setSelected(selected); @@ -84,6 +88,7 @@ universeList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); + // When universe list selection model changed, update the add button enabled property universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override public void valueChanged(ListSelectionEvent e) { @@ -92,6 +97,7 @@ } }); + // When selected list selection model changed, update the add button enabled property selectedList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override public void valueChanged(ListSelectionEvent e) { @@ -99,8 +105,28 @@ ui.getModel().setRemoveEnabled(!source.isSelectionEmpty()); } }); + + // When selected list model changed, push back selected list to bean + selectedList.getModel().addListDataListener(new ListDataListener() { + public void intervalAdded(ListDataEvent e) { + fireSelectionUpdate(); + } + + public void intervalRemoved(ListDataEvent e) { + fireSelectionUpdate(); + } + + public void contentsChanged(ListDataEvent e) { + fireSelectionUpdate(); + } + }); } + /** + * When universe list was double clicked, move selected items to selected list. + * + * @param event mouse event + */ public void onUniverseListClicked(MouseEvent event) { JList universeList = ui.getUniverseList(); if (event.getClickCount() == 2) { @@ -110,6 +136,12 @@ } } + + /** + * When selected list was double clicked, move selected items to universe list. + * + * @param event mouse event + */ public void onSelectedListClicked(MouseEvent event) { JList selectedList = ui.getSelectedList(); @@ -121,11 +153,13 @@ } } + /** When add button was hit, move selected items (from universe list) to selected list. */ public void select() { List<O> selection = (List<O>) Arrays.asList(ui.getUniverseList().getSelectedValues()); ui.getModel().addToSelected(selection); } + /** When remove button was hit, move selected items (from selected list) to universe list. */ public void unselect() { List<O> selection = (List<O>) Arrays.asList(ui.getSelectedList().getSelectedValues()); ui.getModel().removeFromSelected(selection); @@ -136,20 +170,10 @@ return; } try { - Method mut = getMutator(); - if (mut != null) { - mut.invoke(ui.getBean(), ui.getModel().getSelected()); - } + mutator.invoke(ui.getBean(), ui.getModel().getSelected()); } catch (Exception e) { throw new RuntimeException(e); } } - /** @return le mutateur a utiliser pour modifier le bean associé. */ - protected Method getMutator() { - if (mutator == null) { - mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); - } - return mutator; - } }

1 0

r2535 - in trunk: . jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean jaxx-widgets/src/main/resources/icons
by tchemit＠users.nuiton.org 13 Dec '12

13 Dec '12

Author: tchemit Date: 2012-12-13 16:37:20 +0100 (Thu, 13 Dec 2012) New Revision: 2535 Url: http://nuiton.org/projects/jaxx/repository/revisions/2535 Log: refs #2474: Create a double list widget (improve it but still not perfect :() fixes #2479: Updates mavenpom to 3.4.6 fixes #2480: Updates to nuiton-utils 2.6.5 fixes #2481: Updates Eugene to 2.6 fixes #2482: Updates plexus-utils to 3.0.10 Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.png trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselect.png Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 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 trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/pom.xml Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2012-12-13 09:20:39 UTC (rev 2534) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2012-12-13 15:37:20 UTC (rev 2535) @@ -2,20 +2,20 @@ <import> jaxx.demo.entities.People + jaxx.runtime.swing.editor.bean.BeanDoubleList </import> <BeanDoubleListDemoHandler id='handler' constructorParams='this'/> - + <Table fill='both'> <row> <cell weighty='1' weightx='1'> - <jaxx.runtime.swing.editor.bean.BeanDoubleList id='doubleList' - beanType='{People.class}'/> + <BeanDoubleList id='doubleList' beanType='{People.class}'/> </cell> </row> </Table> - -<script><![CDATA[ + + <script><![CDATA[ protected void $afterCompleteSetup() { handler.init(); Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: 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 (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2012-12-13 15:37:20 UTC (rev 2535) @@ -0,0 +1,47 @@ +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ +#model { + universeModel:{universeList.getModel()}; + selectedModel:{selectedList.getModel()}; +} + +#universeList { + model:{new DefaultListModel()}; +} + +#addButton { + toolTipText:"beandoublelist.button.add"; + actionIcon:"bean-doublelist-select"; + enabled:{model.isAddEnabled()}; +} + +#selectedList { + model:{new DefaultListModel()}; +} + +#removeButton { + toolTipText:"beandoublelist.button.remove"; + actionIcon:"bean-doublelist-unselect"; + enabled:{model.isRemoveEnabled()}; +} \ No newline at end of file Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.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/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2012-12-13 09:20:39 UTC (rev 2534) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2012-12-13 15:37:20 UTC (rev 2535) @@ -1,59 +1,96 @@ + <Table genericType='O'> -<import> + <import> org.nuiton.util.decorator.JXPathDecorator javax.swing.DefaultListModel -</import> + </import> -  +  <Class genericType='O' id='beanType' javaBean='null'/>  <String id='labelText' javaBean='null'/> - +  <String id='property' javaBean='""'/>  <Object id='bean' javaBean='null'/> - + +  + <Boolean id='showReset' javaBean='false'/> + +  +  + +  +  - <BeanDoubleListModel id='model' genericType='O' - universeModel='{universeList.getModel()}' - selectedModel='{selectedList.getModel()}'/> - + <BeanDoubleListModel id='model' genericType='O'/> +  <BeanDoubleListHandler id='handler' genericType='O' constructorParams='this'/> - + <row> - <cell weightx='1' weighty='1' fill='both' rows='2'> - <JScrollPane> + <cell weightx='0.5' weighty='1' fill='both'> + <JScrollPane onFocusGained='universeList.requestFocus()'> +   - <JList id='universeList' model='{new DefaultListModel()}'/> - + <JList id='universeList' + onMouseClicked='handler.onUniverseListClicked(event)'/> +  </JScrollPane> </cell> + <cell anchor='north'> - <JButton id='addButton' toolTipText="beandoublelist.button.add" - actionIcon='select'/> + <JPanel layout='{new GridLayout(0,1)}'> + <JButton id='addButton' onActionPerformed='handler.select()'/> + <JButton id='removeButton' onActionPerformed='handler.unselect()'/> + </JPanel> </cell> - <cell weightx='1' weighty='1' fill='both' rows='2'> - <JScrollPane> + + <cell weightx='0.5' weighty='1' fill='both'> + <JScrollPane onFocusGained='selectedList.requestFocus()'> +   - <JList id='selectedList' model='{new DefaultListModel()}'/> - + <JList id='selectedList' + onMouseClicked='handler.onSelectedListClicked(event)'/> +  </JScrollPane> </cell> </row> - <row> - <cell anchor='north'> - <JButton id='removeButton' toolTipText="beandoublelist.button.remove" - actionIcon='unselect'/> - </cell> - </row> + + <script><![CDATA[ -<script><![CDATA[ - public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { handler.init(decorator, universe, selected); } Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx ___________________________________________________________________ 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/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-13 09:20:39 UTC (rev 2534) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-13 15:37:20 UTC (rev 2535) @@ -1,147 +1,136 @@ package jaxx.runtime.swing.editor.bean; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import javax.swing.event.ListDataEvent; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ + import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; import javax.swing.JList; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyDescriptor; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.event.MouseEvent; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import javax.swing.event.ListDataListener; -import javax.swing.plaf.basic.BasicComboBoxUI.ListDataHandler; -import org.apache.commons.beanutils.PropertyUtils; /** * The handler of a {@link BeanDoubleList}. * <p/> * - * @author kmorin <morin(a)codelutin.com> * @param <O> the type of the objects contained in the list. + * @author kmorin <morin(a)codelutin.com> * @see BeanDoubleList * @since 2.5.8 */ -public class BeanDoubleListHandler<O> implements PropertyChangeListener { - +public class BeanDoubleListHandler<O> { + private static final Log log = LogFactory.getLog(BeanDoubleListHandler.class); - + /** the mutator method on the property of boxed bean in the ui */ protected Method mutator; - + /** ui of the handler */ protected BeanDoubleList<O> ui; - + /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; - + public BeanDoubleListHandler(BeanDoubleList<O> ui) { this.ui = ui; } /** * Initializes the handler of the UI + * * @param decorator the decorator to use to display the data nicely - * @param universe the list of all the available items - * @param selected the list of selected items + * @param universe the list of all the available items + * @param selected the list of selected items */ public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { this.decorator = BeanUIUtil.createDecorator(decorator); - - initModel(universe, selected); - - final JList universeList = ui.getUniverseList(); - universeList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); - final JList selectedList = ui.getSelectedList(); - selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); - initListeners(); - - ui.addPropertyChangeListener(this); - - } - - /** - * Initialize the model of the {@link BeanDoubleList} - * @param universe the list of all the available items - * @param selected the selected items - */ - protected void initModel(List<O> universe, List<O> selected) { ui.getModel().setUniverse(universe); ui.getModel().setSelected(selected); - } - - /** - * Initializes the listeners. - */ - protected void initListeners() { - final JList universeList = ui.getUniverseList(); - final JList selectedList = ui.getSelectedList(); - - universeList.addMouseListener(new MouseAdapter() { - - public void mouseClicked(MouseEvent event) { - if (event.getClickCount() == 2) { - int index = universeList.locationToIndex(event.getPoint()); - O item = (O) universeList.getModel().getElementAt(index); - ui.getModel().addToSelected(item); - } - } - }); - - selectedList.addMouseListener(new MouseAdapter() { - - public void mouseClicked(MouseEvent event) { - if (event.getClickCount() == 2) { - int index = selectedList.locationToIndex(event.getPoint()); - O item = (O) selectedList.getModel().getElementAt(index); - ui.getModel().removeFromSelected(item); - } - } - }); - - selectedList.getModel().addListDataListener(new ListDataListener() { - public void intervalAdded(ListDataEvent e) { - fireSelectionUpdate(); - } + JList universeList = ui.getUniverseList(); + JList selectedList = ui.getSelectedList(); - public void intervalRemoved(ListDataEvent e) { - fireSelectionUpdate(); - } + universeList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); + selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); - public void contentsChanged(ListDataEvent e) { - fireSelectionUpdate(); + universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override + public void valueChanged(ListSelectionEvent e) { + ListSelectionModel source = (ListSelectionModel) e.getSource(); + ui.getModel().setAddEnabled(!source.isSelectionEmpty()); } }); - - ui.getAddButton().addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - List<O> selection = (List<O>) Arrays.asList(universeList.getSelectedValues()); - ui.getModel().addToSelected(selection); + selectedList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override + public void valueChanged(ListSelectionEvent e) { + ListSelectionModel source = (ListSelectionModel) e.getSource(); + ui.getModel().setRemoveEnabled(!source.isSelectionEmpty()); } }); - - ui.getRemoveButton().addActionListener(new ActionListener() { + } - public void actionPerformed(ActionEvent e) { - List<O> selection = (List<O>) Arrays.asList(selectedList.getSelectedValues()); - ui.getModel().removeFromSelected(selection); - } - }); - + public void onUniverseListClicked(MouseEvent event) { + JList universeList = ui.getUniverseList(); + if (event.getClickCount() == 2) { + int index = universeList.locationToIndex(event.getPoint()); + O item = (O) universeList.getModel().getElementAt(index); + ui.getModel().addToSelected(item); + } } - + + public void onSelectedListClicked(MouseEvent event) { + + JList selectedList = ui.getSelectedList(); + + if (event.getClickCount() == 2) { + int index = selectedList.locationToIndex(event.getPoint()); + O item = (O) selectedList.getModel().getElementAt(index); + ui.getModel().removeFromSelected(item); + } + } + + public void select() { + List<O> selection = (List<O>) Arrays.asList(ui.getUniverseList().getSelectedValues()); + ui.getModel().addToSelected(selection); + } + + public void unselect() { + List<O> selection = (List<O>) Arrays.asList(ui.getSelectedList().getSelectedValues()); + ui.getModel().removeFromSelected(selection); + } + protected void fireSelectionUpdate() { if (ui.getBean() == null) { return; @@ -155,7 +144,7 @@ throw new RuntimeException(e); } } - + /** @return le mutateur a utiliser pour modifier le bean associé. */ protected Method getMutator() { if (mutator == null) { @@ -163,9 +152,4 @@ } return mutator; } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - } - } 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 2012-12-13 09:20:39 UTC (rev 2534) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2012-12-13 15:37:20 UTC (rev 2535) @@ -1,38 +1,78 @@ package jaxx.runtime.swing.editor.bean; +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ + import com.google.common.collect.Lists; -import java.util.ArrayList; -import java.util.List; -import javax.swing.DefaultListModel; -import javax.swing.ListModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.beans.AbstractSerializableBean; +import javax.swing.DefaultListModel; +import javax.swing.ListModel; +import java.util.ArrayList; +import java.util.List; + /** * The model of the {@link BeanDoubleList} widget + * * @param <O> the type of the object in the list * @author kmorin <morin(a)codelutin.com> * @see BeanDoubleList - * @since 2.5.8 + * @since 2.5.8 */ -public class BeanDoubleListModel<O> { - +public class BeanDoubleListModel<O> extends AbstractSerializableBean { + private static final Log log = LogFactory.getLog(BeanDoubleListModel.class); - + + + public static final String PROPERTY_ADD_ENABLED = "addEnabled"; + + public static final String PROPERTY_REMOVE_ENABLED = "removeEnabled"; + + private static final long serialVersionUID = 1L; + /** List of all the available items */ protected List<O> universe = new ArrayList<O>(); - + /** Model containing the remaining available items */ protected ListModel universeModel = new DefaultListModel(); - + /** List of the selected items */ protected List<O> selected = new ArrayList<O>(); - + /** Model containing the selected items */ protected ListModel selectedModel = new DefaultListModel(); - + + + protected boolean addEnabled; + + protected boolean removeEnabled; + /** * To get the selected items. + * * @return a list of O */ public List<O> getSelected() { @@ -40,25 +80,27 @@ } /** - * Sets the list of selected items. + * Sets the list of selected items. * It fills the model of the list of the selected items with these items * and removes them from the model of list of the universe. + * * @param selected a list of O */ public void setSelected(List<O> selected) { //reset all the universe in the universe list resetUniverse(); - + if (selected == null) { selected = Lists.newArrayList(); } this.selected.clear(); - ((DefaultListModel)selectedModel).clear(); + ((DefaultListModel) selectedModel).clear(); addToSelected(selected); } /** * To get all the available items. + * * @return a list of O */ public List<O> getUniverse() { @@ -66,8 +108,9 @@ } /** - * Sets the list of the available items. + * Sets the list of the available items. * It fills the model of the universe list with these items. + * * @param universe a list of O */ public void setUniverse(List<O> universe) { @@ -77,11 +120,11 @@ this.universe = Lists.newArrayList(universe); resetUniverse(); } - + protected void resetUniverse() { - ((DefaultListModel)universeModel).clear(); + ((DefaultListModel) universeModel).clear(); for (O item : universe) { - ((DefaultListModel)universeModel).addElement(item); + ((DefaultListModel) universeModel).addElement(item); } } @@ -100,77 +143,103 @@ public void setUniverseModel(ListModel universeModel) { this.universeModel = universeModel; } - + /** * Adds an item to the selected items. + * * @param item the item to select */ public void addToSelected(O item) { selected.add(item); - ((DefaultListModel)selectedModel).addElement(item); - ((DefaultListModel)universeModel).removeElement(item); + ((DefaultListModel) selectedModel).addElement(item); + ((DefaultListModel) universeModel).removeElement(item); } - + /** * Adds a list of items to the selected items. + * * @param items the list of the items to select */ public void addToSelected(List<O> items) { selected.addAll(items); for (O item : items) { - ((DefaultListModel)selectedModel).addElement(item); - ((DefaultListModel)universeModel).removeElement(item); + ((DefaultListModel) selectedModel).addElement(item); + ((DefaultListModel) universeModel).removeElement(item); } } - + /** * Removes an item from the selected items. + * * @param item the item to unselect */ public void removeFromSelected(O item) { selected.remove(item); - ((DefaultListModel)selectedModel).removeElement(item); + ((DefaultListModel) selectedModel).removeElement(item); addToUniverseList(item); } - + /** * Removes a list of items from the list of selected items. + * * @param items the list of the items to unselect */ public void removeFromSelected(List<O> items) { selected.removeAll(items); for (O item : items) { - ((DefaultListModel)selectedModel).removeElement(item); + ((DefaultListModel) selectedModel).removeElement(item); addToUniverseList(item); } } - + + public boolean isAddEnabled() { + return addEnabled; + } + + public void setAddEnabled(boolean addEnabled) { + boolean oldValue = isAddEnabled(); + this.addEnabled = addEnabled; + firePropertyChange(PROPERTY_ADD_ENABLED, oldValue, addEnabled); + } + + public boolean isRemoveEnabled() { + return removeEnabled; + } + + public void setRemoveEnabled(boolean removeEnabled) { + boolean oldValue = isRemoveEnabled(); + this.removeEnabled = removeEnabled; + firePropertyChange(PROPERTY_REMOVE_ENABLED, oldValue, removeEnabled); + } + /** * Adds an item to the available items list at the right index * to keep always the same order. + * * @param item the item to add to the universe list */ protected void addToUniverseList(O item) { - DefaultListModel universeDefaultListModel = (DefaultListModel)universeModel; + DefaultListModel universeDefaultListModel = (DefaultListModel) universeModel; // the maximum index where we should insert the item is its index // in the list of all the available items int index = universe.indexOf(item); // if the index is upper than the size of the list of the remaining available items, // get the size of this list int insertionIndex = Math.min(index, universeDefaultListModel.getSize()); - + // we decrease the index to insert until we meet an item whose index // in the list of all the available index is lower than the one of the item // we want to insert while (insertionIndex > 0) { - O o = (O)universeDefaultListModel.get(--insertionIndex); + O o = (O) universeDefaultListModel.get(--insertionIndex); int oIndex = universe.indexOf(o); if (oIndex < index) { insertionIndex++; break; } - }; - + } + ; + universeDefaultListModel.add(insertionIndex, item); } } Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java ___________________________________________________________________ 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/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2012-12-13 09:20:39 UTC (rev 2534) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2012-12-13 15:37:20 UTC (rev 2535) @@ -35,9 +35,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.DefaultListModel; import javax.swing.JComponent; import javax.swing.JList; import javax.swing.JPopupMenu; +import javax.swing.ListModel; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -199,8 +201,20 @@ try { // reload the model - ui.getList().setListData(datas.toArray(new Object[datas.size()])); + ListModel listModel = ui.getList().getModel(); + if( listModel instanceof DefaultListModel) { + DefaultListModel model = (DefaultListModel) listModel; + model.removeAllElements(); + for (O data : datas) { + model.addElement(data); + } + + } else { + + ui.getList().setListData(datas.toArray(new Object[datas.size()])); + } + // re-apply selection if (selection.length > 0) { Added: trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.png =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselect.png =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselect.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-13 09:20:39 UTC (rev 2534) +++ trunk/pom.xml 2012-12-13 15:37:20 UTC (rev 2535) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4</version> + <version>3.4.6</version> </parent> <artifactId>jaxx</artifactId> @@ -111,13 +111,13 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <eugeneVersion>2.5.6</eugeneVersion> + <eugeneVersion>2.6</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.4</swingXVersion> - <plexusUtilVersion>3.0.9</plexusUtilVersion> + <plexusUtilVersion>3.0.10</plexusUtilVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>

1 0

r2534 - in trunk/jaxx-widgets/src/main: java/jaxx/runtime/swing/editor/bean resources/i18n
by kmorin＠users.nuiton.org 13 Dec '12

13 Dec '12

Author: kmorin Date: 2012-12-13 10:20:39 +0100 (Thu, 13 Dec 2012) New Revision: 2534 Url: http://nuiton.org/projects/jaxx/repository/revisions/2534 Log: refs #2474 Create a double list widget Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 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 2012-12-12 23:04:11 UTC (rev 2533) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2012-12-13 09:20:39 UTC (rev 2534) @@ -1,11 +1,10 @@ package jaxx.runtime.swing.editor.bean; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; import javax.swing.DefaultListModel; import javax.swing.ListModel; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,15 +46,15 @@ * @param selected a list of O */ public void setSelected(List<O> selected) { + //reset all the universe in the universe list + resetUniverse(); + if (selected == null) { - selected = new ArrayList<O>(); + selected = Lists.newArrayList(); } - this.selected = selected; + this.selected.clear(); ((DefaultListModel)selectedModel).clear(); - for (O item : selected) { - ((DefaultListModel)selectedModel).addElement(item); - ((DefaultListModel)universeModel).removeElement(item); - } + addToSelected(selected); } /** @@ -73,9 +72,13 @@ */ public void setUniverse(List<O> universe) { if (universe == null) { - universe = new ArrayList<O>(); + universe = Lists.newArrayList(); } - this.universe = new ArrayList<O>(universe); + this.universe = Lists.newArrayList(universe); + resetUniverse(); + } + + protected void resetUniverse() { ((DefaultListModel)universeModel).clear(); for (O item : universe) { ((DefaultListModel)universeModel).addElement(item); Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2012-12-12 23:04:11 UTC (rev 2533) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2012-12-13 09:20:39 UTC (rev 2534) @@ -13,11 +13,11 @@ bean.sort.up.tip=Clasificación creciente actualmente utilizada bean.sort.up.toSelect.tip=Clic para clasificar según orden creciente bean.unknown.type=Objeto de tipo desconocido -beandoublelist.button.add=Add -beandoublelist.button.remove=Remove beancombobox.action.reset.tip=Reiniciar el valor de la lista desplegable beancombobox.action.sort.tip=Modificar la clasificación de la lista desplegable beancombobox.popup.title=Modificar la clasificación +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove beanlist.action.reset.tip=Eliminar la selección beanlist.action.sort.tip=Modificar la clasificación de la lista despleglable beanlist.popup.title=Modificar la clasificación Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2012-12-12 23:04:11 UTC (rev 2533) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2012-12-13 09:20:39 UTC (rev 2534) @@ -12,12 +12,12 @@ bean.sort.up=Tri croissant bean.sort.up.tip=Tri croissant actuellement utilisé bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant -beandoublelist.button.add=Add -beandoublelist.button.remove=Remove bean.unknown.type=Objet de type inconnu beancombobox.action.reset.tip=Réinitialiser la valeur de la liste déroulante beancombobox.action.sort.tip=Modifier le tri de la liste déroulante beancombobox.popup.title=Modifier le tri +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove beanlist.action.reset.tip=Supprimer la sélection beanlist.action.sort.tip=Modifier le tri de la liste déroulante beanlist.popup.title=Modifier le tri

1 0

r2533 - trunk/jaxx-widgets/src/main/resources/i18n
by tchemit＠users.nuiton.org 12 Dec '12

12 Dec '12

Author: tchemit Date: 2012-12-13 00:04:11 +0100 (Thu, 13 Dec 2012) New Revision: 2533 Url: http://nuiton.org/projects/jaxx/repository/revisions/2533 Log: fix i18n files (do NOT use unicode inside it, but just utf-8 encoding) Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2012-12-12 16:33:34 UTC (rev 2532) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2012-12-12 23:04:11 UTC (rev 2533) @@ -3,66 +3,66 @@ aboutframe.ok=OK aboutframe.thirdparty=Tierce partie bean.popup.label=Objeto '%1$s' -bean.sort.down=Calsificaci\u00c3\u00b3n decreciente -bean.sort.down.tip=Clasificaci\u00c3\u00b3n decreciente actualmente utilizada -bean.sort.down.toSelect.tip=Clic para clasificar seg\u00c3\u00ban orden decreciente -bean.sort.label=Orden de clasificaci\u00c3\u00b3n -bean.sort.off=Click para activar la clasificaci\u00c3\u00b3n de la propiedad '%1$s' -bean.sort.on=Clasificaci\u00c3\u00b3n realizada sobre la propiedad '%1$s' -bean.sort.up=Clasificaci\u00c3\u00b3n creciente -bean.sort.up.tip=Clasificaci\u00c3\u00b3n creciente actualmente utilizada -bean.sort.up.toSelect.tip=Clic para clasificar seg\u00c3\u00ban orden creciente +bean.sort.down=Calsificación decreciente +bean.sort.down.tip=Clasificación decreciente actualmente utilizada +bean.sort.down.toSelect.tip=Clic para clasificar según orden decreciente +bean.sort.label=Orden de clasificación +bean.sort.off=Click para activar la clasificación de la propiedad '%1$s' +bean.sort.on=Clasificación realizada sobre la propiedad '%1$s' +bean.sort.up=Clasificación creciente +bean.sort.up.tip=Clasificación creciente actualmente utilizada +bean.sort.up.toSelect.tip=Clic para clasificar según orden creciente bean.unknown.type=Objeto de tipo desconocido -beancombobox.action.reset.tip=Reiniciar el valor de la lista desplegable -beancombobox.action.sort.tip=Modificar la clasificaci\u00c3\u00b3n de la lista desplegable -beancombobox.popup.title=Modificar la clasificaci\u00c3\u00b3n beandoublelist.button.add=Add beandoublelist.button.remove=Remove -beanlist.action.reset.tip=Eliminar la selecci\u00c3\u00b3n -beanlist.action.sort.tip=Modificar la clasificaci\u00c3\u00b3n de la lista despleglable -beanlist.popup.title=Modificar la clasificaci\u00c3\u00b3n +beancombobox.action.reset.tip=Reiniciar el valor de la lista desplegable +beancombobox.action.sort.tip=Modificar la clasificación de la lista desplegable +beancombobox.popup.title=Modificar la clasificación +beanlist.action.reset.tip=Eliminar la selección +beanlist.action.sort.tip=Modificar la clasificación de la lista despleglable +beanlist.popup.title=Modificar la clasificación config.action.quit=Salir -config.action.quit.tip=Salir del editor de configuraci\u00c3\u00b3n +config.action.quit.tip=Salir del editor de configuración config.action.reset=Cancelar -config.action.reset.tip=Cancelar las modificaciones de esta categor\u00c3\u00ada +config.action.reset.tip=Cancelar las modificaciones de esta categoría config.action.save=Guardar -config.action.save.tip=Guardar las modificaciones de esta categor\u00c3\u00ada +config.action.save.tip=Guardar las modificaciones de esta categoría config.choice.cancel=Cancelar config.choice.continue=Continuar config.choice.doNotSave=No guardar config.choice.save=Guardar config.defaultValue=Valor por defecto -config.defaultValue.tip=Valor por defecto de la opci\u00c3\u00b3n -config.description=Descripci\u00c3\u00b3n +config.defaultValue.tip=Valor por defecto de la opción +config.description=Descripción config.detected.callBack=Acciones detectadas para las opciones modificadas -config.error.category.already.exists=la categor\u00c3\u00ada '%1$s' ya existe\! +config.error.category.already.exists=la categoría '%1$s' ya existe\! config.error.category.not.found=La categoria '%1$s' no existe\! config.key=Clave config.key.tip=Calve de la opcion config.launch.callBack=Lanzar config.launch.callBack.tip=Lanzar las acciones necesarias -config.message.quit.invalid.category=La categor\u00c3\u00ada '%1$s' no es valida\! +config.message.quit.invalid.category=La categoría '%1$s' no es valida\! config.message.quit.valid.and.modified.category=La categoria '%1$s' tiene opciones modificadas \: -config.modified=Opci\u00c3\u00b3n modificada (valor original \: %1$s) +config.modified=Opción modificada (valor original \: %1$s) config.no.option.selected=< No hay opciones seleccionadas > -config.option.final=Opci\u00c3\u00b3n no modificable -config.option.label=Opci\u00c3\u00b3n '%1$s' (%2$s) +config.option.final=Opción no modificable +config.option.label=Opción '%1$s' (%2$s) config.option.modified=Valor modificado < valor anterior \: '%1$s' - nuevo valor \: '%2$s' > config.title=Preferencias -config.title.need.confirm=Se requiere confirmaci\u00c3\u00b3n del usuario... +config.title.need.confirm=Se requiere confirmación del usuario... config.unmodifiable=No puede ser modificado -config.unvalid=Opci\u00c3\u00b3n no valida (valor original \: %1$s, tipo requerido \: %2$s) +config.unvalid=Opción no valida (valor original \: %1$s, tipo requerido \: %2$s) config.value=Valor -config.value.tip=Valor de la opci\u00c3\u00b3n +config.value.tip=Valor de la opción errorUI.action.close=Cerrar errorUI.message=ha habido un error \! errorUI.title=Error... -fontsize.action.default.tip=Volver al tama\u00c3\u00b1o por defecto -fontsize.action.down.tip=Disminuir el tama\u00c3\u00b1o del origen -fontsize.action.up.tip=Aumentar el tama\u00c3\u00b1o de la fuente +fontsize.action.default.tip=Volver al tamaño por defecto +fontsize.action.down.tip=Disminuir el tamaño del origen +fontsize.action.up.tip=Aumentar el tamaño de la fuente hidor.hideTip=Ocultar hidor.showTip=Ver -i18neditor.empty.locales=< Aucune locale \u00c3\u00a0 s\u00c3\u00a9lectionner > +i18neditor.empty.locales=< Aucune locale à sélectionner > i18neditor.popup.title=Cambiar idioma i18neditor.selected=Idioma usado actualmente \: %1$s i18neditor.unselected=Para usar este idioma \: %1$s @@ -81,7 +81,7 @@ numbereditor.8=8 numbereditor.9=9 numbereditor.action.reset.tip=Reinicializar -numbereditor.action.show.tip=Mostar el teclado num\u00c3\u00a9rico +numbereditor.action.show.tip=Mostar el teclado numérico numbereditor.clearAll=C numbereditor.clearOne=CE numbereditor.toggleSign=+/- Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2012-12-12 16:33:34 UTC (rev 2532) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2012-12-12 23:04:11 UTC (rev 2533) @@ -1,70 +1,70 @@ -aboutframe.about=\u00c3\u0080 propos +aboutframe.about=À propos aboutframe.license=Licence aboutframe.ok=OK aboutframe.thirdparty=Tierce partie bean.popup.label=Objet '%1$s' -bean.sort.down=Tri d\u00c3\u00a9croissant -bean.sort.down.tip=Tri d\u00c3\u00a9croissant actuellement utilis\u00c3\u00a9 -bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre d\u00c3\u00a9croissant +bean.sort.down=Tri décroissant +bean.sort.down.tip=Tri décroissant actuellement utilisé +bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre décroissant bean.sort.label=Ordre de tri -bean.sort.off=Cliquer pour activer le tri sur la propri\u00c3\u00a9t\u00c3\u00a9 '%1$s' -bean.sort.on=Le tri est effectu\u00c3\u00a9 sur la propri\u00c3\u00a9t\u00c3\u00a9 '%1$s' +bean.sort.off=Cliquer pour activer le tri sur la propriété '%1$s' +bean.sort.on=Le tri est effectué sur la propriété '%1$s' bean.sort.up=Tri croissant -bean.sort.up.tip=Tri croissant actuellement utilis\u00c3\u00a9 +bean.sort.up.tip=Tri croissant actuellement utilisé bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove bean.unknown.type=Objet de type inconnu -beancombobox.action.reset.tip=R\u00c3\u00a9initialiser la valeur de la liste d\u00c3\u00a9roulante -beancombobox.action.sort.tip=Modifier le tri de la liste d\u00c3\u00a9roulante +beancombobox.action.reset.tip=Réinitialiser la valeur de la liste déroulante +beancombobox.action.sort.tip=Modifier le tri de la liste déroulante beancombobox.popup.title=Modifier le tri -beandoublelist.button.add=Add -beandoublelist.button.remove=Remove -beanlist.action.reset.tip=Supprimer la s\u00c3\u00a9lection -beanlist.action.sort.tip=Modifier le tri de la liste d\u00c3\u00a9roulante +beanlist.action.reset.tip=Supprimer la sélection +beanlist.action.sort.tip=Modifier le tri de la liste déroulante beanlist.popup.title=Modifier le tri config.action.quit=Quitter -config.action.quit.tip=Quitter l'\u00c3\u00a9diteur de configuration +config.action.quit.tip=Quitter l'éditeur de configuration config.action.reset=Annuler -config.action.reset.tip=Annuler les modifications de cette cat\u00c3\u00a9gorie +config.action.reset.tip=Annuler les modifications de cette catégorie config.action.save=Enregistrer -config.action.save.tip=Sauver les modifications de cette cat\u00c3\u00a9gorie +config.action.save.tip=Sauver les modifications de cette catégorie config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer config.choice.save=Enregistrer -config.defaultValue=Valeur par d\u00c3\u00a9faut -config.defaultValue.tip=Valeur par d\u00c3\u00a9faut de l'option +config.defaultValue=Valeur par défaut +config.defaultValue.tip=Valeur par défaut de l'option config.description=Description -config.detected.callBack=Actions d\u00c3\u00a9tect\u00c3\u00a9es pour les options modifi\u00c3\u00a9es -config.error.category.already.exists=La cat\u00c3\u00a9gorie de nom '%1$s' existe d\u00c3\u00a9j\u00c3\u00a0\! -config.error.category.not.found=La cat\u00c3\u00a9gorie de nom '%1$s' n'existe pas\! +config.detected.callBack=Actions détectées pour les options modifiées +config.error.category.already.exists=La catégorie de nom '%1$s' existe déjà\! +config.error.category.not.found=La catégorie de nom '%1$s' n'existe pas\! config.key=Clef config.key.tip=Clef de l'option config.launch.callBack=Lancer -config.launch.callBack.tip=Lancer les actions n\u00c3\u00a9cessaires -config.message.quit.invalid.category=La cat\u00c3\u00a9gorie '%1$s' n'est pas valide\! -config.message.quit.valid.and.modified.category=La cat\u00c3\u00a9gorie '%1$s' poss\u00c3\u00a8dent des options modifi\u00c3\u00a9es \: -config.modified=Option modifi\u00c3\u00a9e (valeur originale \: %1$s) -config.no.option.selected=< Pas d'option s\u00c3\u00a9lectionn\u00c3\u00a9e > +config.launch.callBack.tip=Lancer les actions nécessaires +config.message.quit.invalid.category=La catégorie '%1$s' n'est pas valide\! +config.message.quit.valid.and.modified.category=La catégorie '%1$s' possèdent des options modifiées \: +config.modified=Option modifiée (valeur originale \: %1$s) +config.no.option.selected=< Pas d'option sélectionnée > config.option.final=Option non modifiable config.option.label=Option '%1$s' (%2$s) -config.option.modified=Valeur modifi\u00c3\u00a9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > -config.title=Pr\u00c3\u00a9f\u00c3\u00a9rences +config.option.modified=Valeur modifiée < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > +config.title=Préférences config.title.need.confirm=Une confirmation de votre part est requise... -config.unmodifiable=Ne peut pas \u00c3\u00aatre modifi\u00c3\u00a9 +config.unmodifiable=Ne peut pas être modifié config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) config.value=Valeur config.value.tip=Valeur de l'option errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -fontsize.action.default.tip=Retour sur la taille par d\u00c3\u00a9faut +fontsize.action.default.tip=Retour sur la taille par défaut fontsize.action.down.tip=Diminuer la taille de la police fontsize.action.up.tip=Augmenter la taille de la police hidor.hideTip=Cacher hidor.showTip=Voir -i18neditor.empty.locales=< Aucune locale \u00c3\u00a0 s\u00c3\u00a9lectionner > +i18neditor.empty.locales=< Aucune locale à sélectionner > i18neditor.popup.title=Changer de langue -i18neditor.selected=Langue actuellement utilis\u00c3\u00a9e \: %1$s +i18neditor.selected=Langue actuellement utilisée \: %1$s i18neditor.unselected=Pour utiliser cette langue \: %1$s listSelector.hideList=Cacher la liste listSelector.showList=Afficher la liste @@ -80,8 +80,8 @@ numbereditor.7=7 numbereditor.8=8 numbereditor.9=9 -numbereditor.action.reset.tip=R\u00c3\u00a9initialiser -numbereditor.action.show.tip=Afficher le pav\u00c3\u00a9 num\u00c3\u00a9rique +numbereditor.action.reset.tip=Réinitialiser +numbereditor.action.show.tip=Afficher le pavé numérique numbereditor.clearAll=C numbereditor.clearOne=CE numbereditor.toggleSign=+/-

1 0

r2532 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor: . bean
by kmorin＠users.nuiton.org 12 Dec '12

12 Dec '12

Author: kmorin Date: 2012-12-12 17:33:34 +0100 (Wed, 12 Dec 2012) New Revision: 2532 Url: http://nuiton.org/projects/jaxx/repository/revisions/2532 Log: refs #2474 Create a double list widget Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 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 trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-12-12 16:33:34 UTC (rev 2532) @@ -25,6 +25,7 @@ package jaxx.runtime.swing.editor; +import jaxx.runtime.swing.editor.bean.BeanUIUtil; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -573,29 +574,7 @@ protected Method getMutator() { if (mutator == null) { - Object bean = editor.getBean(); - if (bean == null) { - throw new NullPointerException("could not find bean in " + editor); - } - String property = editor.getProperty(); - if (property == null) { - throw new NullPointerException("could not find property in " + editor); - } - if (log.isDebugEnabled()) { - log.debug("searching mutator for property " + property + " on bean of type " + bean.getClass()); - } - if (log.isTraceEnabled()) { - PropertyDescriptor[] descriptors = PropertyUtils.getPropertyDescriptors(bean); - for (PropertyDescriptor p : descriptors) { - log.trace("property discover " + p.getName() + " writer = " + p.getWriteMethod()); - } - } - try { - PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); - mutator = descriptor.getWriteMethod(); - } catch (Exception e) { - throw new RuntimeException(e); - } + mutator = BeanUIUtil.getMutator(editor.getBean(), editor.getProperty()); } return mutator; } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java 2012-12-12 16:33:34 UTC (rev 2532) @@ -44,6 +44,7 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.Map; +import jaxx.runtime.swing.editor.bean.BeanUIUtil; /** @author tchemit <chemit(a)codelutin.com> */ public class TimeEditorHandler { @@ -326,21 +327,7 @@ protected Method getMutator() { if (mutator == null) { - Object bean = editor.getBean(); - if (bean == null) { - throw new NullPointerException("could not find bean in " + editor); - } - String property = editor.getProperty(); - if (property == null) { - throw new NullPointerException("could not find property in " + editor); - } - - try { - PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); - mutator = descriptor.getWriteMethod(); - } catch (Exception e) { - throw new RuntimeException(e); - } + mutator = BeanUIUtil.getMutator(editor.getBean(), editor.getProperty()); } return mutator; } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-12-12 16:33:34 UTC (rev 2532) @@ -329,23 +329,7 @@ /** @return le mutateur a utiliser pour modifier le bean associé. */ protected Method getMutator() { if (mutator == null) { - Object bean = ui.getBean(); - if (bean == null) { - throw new NullPointerException("could not find bean in " + ui); - } - String property = ui.getProperty(); - if (property == null) { - throw new NullPointerException("could not find property in " + ui); - } - - try { - PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); - if (descriptor != null) { - mutator = descriptor.getWriteMethod(); - } - } catch (Exception e) { - throw new RuntimeException(e); - } + mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); } return mutator; } 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 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2012-12-12 16:33:34 UTC (rev 2532) @@ -11,6 +11,12 @@  <String id='labelText' javaBean='null'/> +  + <String id='property' javaBean='""'/> + +  + <Object id='bean' javaBean='null'/> +  <BeanDoubleListModel id='model' genericType='O' universeModel='{universeList.getModel()}' @@ -18,22 +24,20 @@  <BeanDoubleListHandler id='handler' genericType='O' constructorParams='this'/> - - <row weightx='1' fill='both'> - <cell weightx='0.5' weighty='1' fill='both'> + + <row> + <cell weightx='1' weighty='1' fill='both' rows='2'> <JScrollPane>  <JList id='universeList' model='{new DefaultListModel()}'/>  </JScrollPane> </cell> - <cell weighty='1'> - <VBox> - <JButton id='addButton' text="beandoublelist.button.add"/> - <JButton id='removeButton' text="beandoublelist.button.remove"/> - </VBox> + <cell anchor='north'> + <JButton id='addButton' toolTipText="beandoublelist.button.add" + actionIcon='select'/> </cell> - <cell weightx='0.5' weighty='1' fill='both'> + <cell weightx='1' weighty='1' fill='both' rows='2'> <JScrollPane>  <JList id='selectedList' model='{new DefaultListModel()}'/> @@ -41,6 +45,12 @@ </JScrollPane> </cell> </row> + <row> + <cell anchor='north'> + <JButton id='removeButton' toolTipText="beandoublelist.button.remove" + actionIcon='unselect'/> + </cell> + </row> <script><![CDATA[ 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 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-12 16:33:34 UTC (rev 2532) @@ -4,6 +4,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import javax.swing.event.ListDataEvent; import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; @@ -13,8 +14,13 @@ import javax.swing.JList; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; +import javax.swing.event.ListDataListener; +import javax.swing.plaf.basic.BasicComboBoxUI.ListDataHandler; +import org.apache.commons.beanutils.PropertyUtils; /** * The handler of a {@link BeanDoubleList}. @@ -29,6 +35,9 @@ private static final Log log = LogFactory.getLog(BeanDoubleListHandler.class); + /** the mutator method on the property of boxed bean in the ui */ + protected Method mutator; + /** ui of the handler */ protected BeanDoubleList<O> ui; @@ -100,6 +109,21 @@ } }); + selectedList.getModel().addListDataListener(new ListDataListener() { + + public void intervalAdded(ListDataEvent e) { + fireSelectionUpdate(); + } + + public void intervalRemoved(ListDataEvent e) { + fireSelectionUpdate(); + } + + public void contentsChanged(ListDataEvent e) { + fireSelectionUpdate(); + } + }); + ui.getAddButton().addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -115,7 +139,30 @@ ui.getModel().removeFromSelected(selection); } }); + } + + protected void fireSelectionUpdate() { + if (ui.getBean() == null) { + return; + } + try { + Method mut = getMutator(); + if (mut != null) { + mut.invoke(ui.getBean(), ui.getModel().getSelected()); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** @return le mutateur a utiliser pour modifier le bean associé. */ + protected Method getMutator() { + if (mutator == null) { + mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); + } + return mutator; + } @Override public void propertyChange(PropertyChangeEvent evt) { 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 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2012-12-12 16:33:34 UTC (rev 2532) @@ -4,6 +4,8 @@ import java.util.List; import javax.swing.DefaultListModel; import javax.swing.ListModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,7 +50,7 @@ if (selected == null) { selected = new ArrayList<O>(); } - this.selected = new ArrayList<O>(selected); + this.selected = selected; ((DefaultListModel)selectedModel).clear(); for (O item : selected) { ((DefaultListModel)selectedModel).addElement(item); @@ -124,7 +126,6 @@ */ public void removeFromSelected(O item) { selected.remove(item); - log.info(selectedModel.getClass()); ((DefaultListModel)selectedModel).removeElement(item); addToUniverseList(item); } @@ -169,5 +170,4 @@ universeDefaultListModel.add(insertionIndex, item); } - } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2012-12-12 09:22:25 UTC (rev 2531) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2012-12-12 16:33:34 UTC (rev 2532) @@ -24,6 +24,9 @@ */ package jaxx.runtime.swing.editor.bean; +import org.apache.commons.beanutils.PropertyUtils; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Method; import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorUtil; import org.nuiton.util.decorator.JXPathDecorator; @@ -273,7 +276,28 @@ separatorReplacement ); } + + public static Method getMutator(Object bean, String property) { + Method mutator = null; + if (bean == null) { + throw new NullPointerException("could not find bean"); + } + if (property == null) { + throw new NullPointerException("could not find property"); + } + try { + PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); + if (descriptor != null) { + mutator = descriptor.getWriteMethod(); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + + return mutator; + } + public static abstract class PopupHandler implements Runnable { public static final Log log = LogFactory.getLog(PopupHandler.class);

1 0

r2531 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by kmorin＠users.nuiton.org 12 Dec '12

12 Dec '12

Author: kmorin Date: 2012-12-12 10:22:25 +0100 (Wed, 12 Dec 2012) New Revision: 2531 Url: http://nuiton.org/projects/jaxx/repository/revisions/2531 Log: refs #2474 Create a double list widget Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 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 2012-12-11 17:03:01 UTC (rev 2530) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2012-12-12 09:22:25 UTC (rev 2531) @@ -21,7 +21,7 @@ <row weightx='1' fill='both'> <cell weightx='0.5' weighty='1' fill='both'> - <JScrollPane columnHeaderView="{universeListHeader}"> + <JScrollPane>  <JList id='universeList' model='{new DefaultListModel()}'/>  @@ -34,7 +34,7 @@ </VBox> </cell> <cell weightx='0.5' weighty='1' fill='both'> - <JScrollPane columnHeaderView="{selectedListHeader}"> + <JScrollPane>  <JList id='selectedList' model='{new DefaultListModel()}'/>

1 0

r2530 - trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor
by kmorin＠users.nuiton.org 11 Dec '12

11 Dec '12

Author: kmorin Date: 2012-12-11 18:03:01 +0100 (Tue, 11 Dec 2012) New Revision: 2530 Url: http://nuiton.org/projects/jaxx/repository/revisions/2530 Log: refs #2474 Create a double list widget Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2012-12-11 16:51:04 UTC (rev 2529) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2012-12-11 17:03:01 UTC (rev 2530) @@ -27,7 +27,7 @@ public void init() { List<People> data = new DemoDataProvider().getPeoples(); JXPathDecorator<People> decorator = (JXPathDecorator<People>) new DemoDecoratorProvider().getDecoratorByType(People.class); - this.ui.getDoubleList().init(decorator, data); + this.ui.getDoubleList().init(decorator, data, data.subList(0, 1)); } }

1 0