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

r2372 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 18:10:23 +0200 (Mon, 02 Jul 2012) New Revision: 2372 Url: http://nuiton.org/repositories/revision/jaxx/2372 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-07-02 16:10:21 UTC (rev 2371) +++ trunk/jaxx-compiler/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-02 16:10:21 UTC (rev 2371) +++ trunk/jaxx-demo/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-02 16:10:21 UTC (rev 2371) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-02 16:10:21 UTC (rev 2371) +++ trunk/jaxx-runtime/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-02 16:10:21 UTC (rev 2371) +++ trunk/jaxx-validator/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-02 16:10:21 UTC (rev 2371) +++ trunk/jaxx-widgets/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 16:10:21 UTC (rev 2371) +++ trunk/pom.xml 2012-07-02 16:10:23 UTC (rev 2372) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -127,11 +127,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5</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 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <distributionManagement>

1 0

r2371 - tags
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 18:10:21 +0200 (Mon, 02 Jul 2012) New Revision: 2371 Url: http://nuiton.org/repositories/revision/jaxx/2371 Log: [maven-release-plugin] copy for tag jaxx-2.5 Added: tags/jaxx-2.5/

1 0

r2370 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 18:10:19 +0200 (Mon, 02 Jul 2012) New Revision: 2370 Url: http://nuiton.org/repositories/revision/jaxx/2370 Log: [maven-release-plugin] prepare release jaxx-2.5 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-07-02 16:07:39 UTC (rev 2369) +++ trunk/jaxx-compiler/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-02 16:07:39 UTC (rev 2369) +++ trunk/jaxx-demo/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-02 16:07:39 UTC (rev 2369) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-02 16:07:39 UTC (rev 2369) +++ trunk/jaxx-runtime/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-02 16:07:39 UTC (rev 2369) +++ trunk/jaxx-validator/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-02 16:07:39 UTC (rev 2369) +++ trunk/jaxx-widgets/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 16:07:39 UTC (rev 2369) +++ trunk/pom.xml 2012-07-02 16:10:19 UTC (rev 2370) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -40,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> <modules> <module>jaxx-runtime</module> @@ -129,11 +127,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</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5</url> </scm> <distributionManagement>

1 0

r2369 - trunk/src/site/rst
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 18:07:39 +0200 (Mon, 02 Jul 2012) New Revision: 2369 Url: http://nuiton.org/repositories/revision/jaxx/2369 Log: add file header Modified: trunk/src/site/rst/tutoriels.rst Modified: trunk/src/site/rst/tutoriels.rst =================================================================== --- trunk/src/site/rst/tutoriels.rst 2012-07-02 15:46:11 UTC (rev 2368) +++ trunk/src/site/rst/tutoriels.rst 2012-07-02 16:07:39 UTC (rev 2369) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * JAXX +.. * $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% +.. - ========= Tutoriels

1 0

r2368 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by sletellier＠users.nuiton.org July 2, 2012

July 2, 2012

Author: sletellier Date: 2012-07-02 17:46:11 +0200 (Mon, 02 Jul 2012) New Revision: 2368 Url: http://nuiton.org/repositories/revision/jaxx/2368 Log: Add getSelectedValue and constructor with values Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-02 15:05:33 UTC (rev 2367) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-02 15:46:11 UTC (rev 2368) @@ -52,6 +52,11 @@ this.selectedValues = Lists.newArrayList(); } + public GenericListModel(Collection values) { + this(); + setElements(values); + } + public void setElements(Collection values) { Collection oldValues = getElements(); Collection oldSelectedValues = getSelectedValues(); @@ -104,6 +109,10 @@ fireValuesAdded(valuesToAdd); } + public B getSelectedValue() { + return selectedValues.get(0); + } + public Collection getSelectedValues() { return Lists.newArrayList(selectedValues); }

1 0

r2367 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org July 2, 2012

July 2, 2012

Author: sletellier Date: 2012-07-02 17:05:33 +0200 (Mon, 02 Jul 2012) New Revision: 2367 Url: http://nuiton.org/repositories/revision/jaxx/2367 Log: Allow to set own ListSelectorModel Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-07-02 14:09:34 UTC (rev 2366) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-07-02 15:05:33 UTC (rev 2367) @@ -22,10 +22,39 @@ #L% --> <ListSelector genericType='B' superGenericType='B'> + + <import> + java.util.Set + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + </import> + + <ListSelectorModel id='model' + genericType='B' + javaBean='new ListSelectorModel()'/> + + <script><![CDATA[ + +protected void $afterCompleteSetup() { + + addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + Set<String> bindings = $bindings.keySet(); + JAXXUtil.applyDataBinding(ComboToListSelector.this, bindings); + JAXXUtil.processDataBinding( + ComboToListSelector.this, bindings.toArray(new String[bindings.size()])); + } + }); +} +]]></script> + <row> <cell fill='horizontal' weightx='1' anchor="west"> <JComboBox id='from' - model='{fromModel}' + model='{model.getFromModel()}' renderer='{getRenderer()}'/> </cell> <cell anchor='east'> @@ -33,14 +62,14 @@ <JButton id="add" toolTipText='{getAddToolTip()}' actionIcon='add' - enabled='{isAddEnabled()}' - onActionPerformed='add()'/> + enabled='{model.isAddEnabled()}' + onActionPerformed='model.add()'/> <JButton id="remove" toolTipText='{getRemoveToolTip()}' actionIcon='remove' - enabled='{isRemoveEnabled()}' - onActionPerformed='remove()'/> + enabled='{model.isRemoveEnabled()}' + onActionPerformed='model.remove()'/> </JToolBar> </cell> @@ -49,10 +78,10 @@ <cell columns='2' fill='both' weightx='1' weighty='1'> <JScrollPane id='listPane'> <JList id='to' - model='{toModel}' - selectionModel='{toModel}' + model='{model.getToModel()}' + selectionModel='{model.getToModel()}' font-size='11' - onMouseClicked='if (event.getClickCount()==2) { remove(); }' + onMouseClicked='if (event.getClickCount()==2) { model.remove(); }' cellRenderer='{getRenderer()}'/> </JScrollPane> </cell> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 14:09:34 UTC (rev 2366) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 15:05:33 UTC (rev 2367) @@ -36,6 +36,7 @@ jaxx.runtime.swing.model.GenericListModel jaxx.runtime.swing.model.GenericListListener java.util.Collection + java.util.Set </import> <String id='addToolTip' javaBean='"+"'/> @@ -46,92 +47,32 @@ genericType='B' javaBean='null'/> - <GenericListModel id='fromModel' - elements='{model.getValues()}' - genericType='B'/> - - <GenericListModel id='toModel' - elements='{model.getSelectedValues()}' - genericType='B'/> - - <Boolean id='addEnabled' javaBean='Boolean.FALSE'/> - <Boolean id='removeEnabled' javaBean='Boolean.FALSE'/> - <ListCellRenderer id='renderer' javaBean='new DefaultListCellRenderer()'/> <script><![CDATA[ -protected void $afterCompleteSetup() { - toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setRemoveEnabled(toModel.hasSelectedIndex()); - } - }); - fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setAddEnabled(fromModel.hasSelectedIndex()); - } - }); -} - -public void addValues(Collection values) { - toModel.removeElements(values); - fromModel.removeElements(values); - fromModel.addElements(values); -} - -public void removeValues(Collection values) { - toModel.removeElements(values); - fromModel.removeElements(values); -} - public void setValues(Collection values) { - toModel.clearElements(); - fromModel.setElements(values); + model.setValues(values); } public Collection getValues() { - return fromModel.getElements(); + return model.getValues(); } public void setSelectedValues(Collection selectedValues) { - fromModel.removeElements(selectedValues); - toModel.setElements(selectedValues); + model.setSelectedValues(selectedValues); } public Collection getSelectedValues() { - return toModel.getElements(); + return model.getSelectedValues(); } -public void add() { - Collection selectedValues = moveSelect(fromModel, toModel); - if (model != null) { - model.add(selectedValues); - } -} - -public void remove() { - Collection selectedValues = moveSelect(toModel, fromModel); - if (model != null) { - model.remove(selectedValues); - } -} - -protected Collection moveSelect(GenericListModel from, GenericListModel to) { - Collection selectedValues = Lists.newArrayList(from.getSelectedValues()); - from.removeElements(selectedValues); - to.addElements(selectedValues); - return selectedValues; -} - public void addGenericListListener(GenericListListener l) { - toModel.addGenericListListener(l); + model.addGenericListListener(l); } public void removeGenericListListener(GenericListListener l) { - toModel.removeGenericListListener(l); + model.removeGenericListListener(l); } ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java 2012-07-02 14:09:34 UTC (rev 2366) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java 2012-07-02 15:05:33 UTC (rev 2367) @@ -23,47 +23,144 @@ */ package jaxx.runtime.swing; +import com.google.common.collect.Lists; +import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.Collection; +import jaxx.runtime.swing.model.GenericListListener; +import jaxx.runtime.swing.model.GenericListModel; /** * @author sletellier <letellier(a)codelutin.com> */ -public abstract class ListSelectorModel { +public class ListSelectorModel { protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + public static final String PROPERTY_ADD_ENABLED = "addEnabled"; + public static final String PROPERTY_REMOVE_ENABLED = "removeEnabled"; + public static final String PROPERTY_SELECTED_VALUES = "selectedValues"; public static final String PROPERTY_VALUES = "values"; - protected Collection values; - protected Collection selectedValues; + protected boolean addEnabled; + protected boolean removeEnabled; + protected GenericListModel fromModel; + protected GenericListModel toModel; + + protected ListSelectorModel() { + + fromModel = new GenericListModel(); + fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + setAddEnabled(fromModel.hasSelectedIndex()); + } + }); + + toModel = new GenericListModel(); + toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + setRemoveEnabled(toModel.hasSelectedIndex()); + } + }); + } + + 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); + } + + public GenericListModel getFromModel() { + return fromModel; + } + + public GenericListModel getToModel() { + return toModel; + } + public Collection getValues() { - return values; + return fromModel.getElements(); } public void setValues(Collection values) { Collection oldValues = getValues(); - this.values = values; + toModel.clearElements(); + fromModel.setElements(values); firePropertyChange(PROPERTY_VALUES, oldValues, values); } + public void addValues(Collection values) { + Collection oldValues = getValues(); + toModel.removeElements(values); + fromModel.removeElements(values); + fromModel.addElements(values); + firePropertyChange(PROPERTY_VALUES, oldValues, values); + } + + public void removeValues(Collection values) { + Collection oldValues = getValues(); + toModel.removeElements(values); + fromModel.removeElements(values); + firePropertyChange(PROPERTY_VALUES, oldValues, values); + } + public Collection getSelectedValues() { - return selectedValues; + return toModel.getElements(); } public void setSelectedValues(Collection selectedValues) { Collection oldValue = getSelectedValues(); - this.selectedValues = selectedValues; + fromModel.removeElements(selectedValues); + toModel.removeElements(selectedValues); + toModel.setElements(selectedValues); firePropertyChange(PROPERTY_SELECTED_VALUES, oldValue, selectedValues); } - public abstract void add(Collection values); + public void add() { + Collection oldValues = getValues(); + Collection oldSelectedValue = getSelectedValues(); + moveSelect(fromModel, toModel); + firePropertyChange(PROPERTY_VALUES, oldValues, getValues()); + firePropertyChange(PROPERTY_SELECTED_VALUES, oldSelectedValue, getSelectedValues()); + } - public abstract void remove(Collection values); + public void remove() { + moveSelect(toModel, fromModel); + } + protected void moveSelect(GenericListModel from, GenericListModel to) { + Collection selectedValues = Lists.newArrayList(from.getSelectedValues()); + from.removeElements(selectedValues); + to.addElements(selectedValues); + } + + public void addGenericListListener(GenericListListener l) { + toModel.addGenericListListener(l); + } + + public void removeGenericListListener(GenericListListener l) { + toModel.removeGenericListListener(l); + } + public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 14:09:34 UTC (rev 2366) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 15:05:33 UTC (rev 2367) @@ -24,14 +24,38 @@ <ListSelector genericType='B' superGenericType='B'> <import> javax.swing.SwingConstants + java.util.Set + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> + <script><![CDATA[ + +protected void $afterCompleteSetup() { + + addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + Set<String> bindings = $bindings.keySet(); + JAXXUtil.applyDataBinding(ListToListSelector.this, bindings); + JAXXUtil.processDataBinding( + ListToListSelector.this, bindings.toArray(new String[bindings.size()])); + } + }); +} +]]></script> + + <ListSelectorModel id='model' + genericType='B' + initializer='new ListSelectorModel()'/> <row> <cell fill='both' weightx='0.5' weighty='1'> <JList id='from' - model='{fromModel}' - selectionModel='{fromModel}' - onMouseClicked='if (event.getClickCount()==2) { add(); }' + model='{model.getFromModel()}' + selectionModel='{model.getFromModel()}' + onMouseClicked='if (event.getClickCount()==2) { model.add(); }' cellRenderer='{getRenderer()}'/> </cell> <cell anchor='north'> @@ -41,22 +65,22 @@ <JButton id="add" toolTipText='{getAddToolTip()}' actionIcon='select' - enabled='{isAddEnabled()}' - onActionPerformed='add()'/> + enabled='{model.isAddEnabled()}' + onActionPerformed='model.add()'/> <JButton id="remove" toolTipText='{getRemoveToolTip()}' actionIcon='unselect' - enabled='{isRemoveEnabled()}' - onActionPerformed='remove()'/> + enabled='{model.isRemoveEnabled()}' + onActionPerformed='model.remove()'/> </JToolBar> </cell> <cell fill='both' weightx='0.5' weighty='1'> <JList id='to' - model='{toModel}' - selectionModel='{toModel}' - onMouseClicked='if (event.getClickCount()==2) { remove(); }' + model='{model.getToModel()}' + selectionModel='{model.getToModel()}' + onMouseClicked='if (event.getClickCount()==2) { model.remove(); }' cellRenderer='{getRenderer()}'/> </cell> </row>

1 0

r2366 - trunk
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-02 16:09:34 +0200 (Mon, 02 Jul 2012) New Revision: 2366 Url: http://nuiton.org/repositories/revision/jaxx/2366 Log: use jrst 2.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 14:09:22 UTC (rev 2365) +++ trunk/pom.xml 2012-07-02 14:09:34 UTC (rev 2366) @@ -116,13 +116,14 @@ <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> - <jrstPluginVersion>2.0.1-SNAPSHOT</jrstPluginVersion> + <jrstPluginVersion>2.0.1</jrstPluginVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> <site.verbose>true</site.verbose> - <pdfGenerationEnabled>true</pdfGenerationEnabled> +  +  </properties>

1 0

r2365 - trunk/src/site/rst
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-02 16:09:22 +0200 (Mon, 02 Jul 2012) New Revision: 2365 Url: http://nuiton.org/repositories/revision/jaxx/2365 Log: add license header Modified: trunk/src/site/rst/tutoriels.rst Modified: trunk/src/site/rst/tutoriels.rst =================================================================== --- trunk/src/site/rst/tutoriels.rst 2012-07-02 12:59:47 UTC (rev 2364) +++ trunk/src/site/rst/tutoriels.rst 2012-07-02 14:09:22 UTC (rev 2365) @@ -1,32 +1,10 @@ -.. - -.. * #%L -.. * JAXX -.. * $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% -.. - + ========= Tutoriels ========= Une série d'articles est en cours d'écriture pour remplacer les anciens tutoriels embarqués. -Vous pourrez les lire dans la version 2.6 sur notre `blog`_. +Vous pourrez les lire dans la version 2.6 sur notre `blog`_ . -:: _blog: http://www.codelutin.com/tag:blogtech?do=showtag&tag=tag%3Ablogtech \ No newline at end of file +:: _blog: http://www.codelutin.com/tag:blogtech?do=showtag&tag=tag%3Ablogtech

1 0

r2364 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org July 2, 2012

July 2, 2012

Author: sletellier Date: 2012-07-02 14:59:47 +0200 (Mon, 02 Jul 2012) New Revision: 2364 Url: http://nuiton.org/repositories/revision/jaxx/2364 Log: Fix layout Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 11:04:41 UTC (rev 2363) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 12:59:47 UTC (rev 2364) @@ -27,7 +27,7 @@ </import> <row> - <cell fill='both' weightx='1' weighty='1'> + <cell fill='both' weightx='0.5' weighty='1'> <JList id='from' model='{fromModel}' selectionModel='{fromModel}' @@ -52,15 +52,12 @@ </JToolBar> </cell> - <cell fill='both' weightx='1' weighty='1'> - <JScrollPane id='listPane'> - <JList id='to' - model='{toModel}' - selectionModel='{toModel}' - font-size='11' - onMouseClicked='if (event.getClickCount()==2) { remove(); }' - cellRenderer='{getRenderer()}'/> - </JScrollPane> + <cell fill='both' weightx='0.5' weighty='1'> + <JList id='to' + model='{toModel}' + selectionModel='{toModel}' + onMouseClicked='if (event.getClickCount()==2) { remove(); }' + cellRenderer='{getRenderer()}'/> </cell> </row> </ListSelector> \ No newline at end of file

1 0

r2363 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org July 2, 2012

July 2, 2012

Author: sletellier Date: 2012-07-02 13:04:41 +0200 (Mon, 02 Jul 2012) New Revision: 2363 Url: http://nuiton.org/repositories/revision/jaxx/2363 Log: Fix list selector Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 10:51:21 UTC (rev 2362) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 11:04:41 UTC (rev 2363) @@ -121,9 +121,7 @@ protected Collection moveSelect(GenericListModel from, GenericListModel to) { Collection selectedValues = Lists.newArrayList(from.getSelectedValues()); - if (model == null) { - from.removeElements(selectedValues); - } + from.removeElements(selectedValues); to.addElements(selectedValues); return selectedValues; }

1 0