From sletellier@users.nuiton.org Mon Jul  2 17:05:33 2012
From: sletellier@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject:
 [Jaxx-commits] r2367 -	trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
Date: Mon, 02 Jul 2012 17:05:33 +0200
Message-ID: <20120702150533.BFE2F158BF@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8765808585291236081=="

--===============8765808585291236081==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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.ja=
xx
   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/ComboToListSele=
ctor.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.j=
axx	2012-07-02 14:09:34 UTC (rev 2366)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.j=
axx	2012-07-02 15:05:33 UTC (rev 2367)
@@ -22,10 +22,39 @@
   #L%
   -->
 <ListSelector genericType=3D'B' superGenericType=3D'B'>
+
+  <import>
+    java.util.Set
+    java.beans.PropertyChangeEvent
+    java.beans.PropertyChangeListener
+  </import>
+
+  <ListSelectorModel id=3D'model'
+                     genericType=3D'B'
+                     javaBean=3D'new ListSelectorModel()'/>
+
+  <script><![CDATA[
+
+protected void $afterCompleteSetup() {
+
+    addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() {
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+
+            Set<String> bindings =3D $bindings.keySet();
+            JAXXUtil.applyDataBinding(ComboToListSelector.this, bindings);
+            JAXXUtil.processDataBinding(
+                    ComboToListSelector.this, bindings.toArray(new String[bi=
ndings.size()]));
+        }
+    });
+}
+]]></script>
+
   <row>
     <cell fill=3D'horizontal' weightx=3D'1' anchor=3D"west">
       <JComboBox id=3D'from'
-                 model=3D'{fromModel}'
+                 model=3D'{model.getFromModel()}'
                  renderer=3D'{getRenderer()}'/>
     </cell>
     <cell anchor=3D'east'>
@@ -33,14 +62,14 @@
         <JButton id=3D"add"
                  toolTipText=3D'{getAddToolTip()}'
                  actionIcon=3D'add'
-                 enabled=3D'{isAddEnabled()}'
-                 onActionPerformed=3D'add()'/>
+                 enabled=3D'{model.isAddEnabled()}'
+                 onActionPerformed=3D'model.add()'/>
=20
         <JButton id=3D"remove"
                  toolTipText=3D'{getRemoveToolTip()}'
                  actionIcon=3D'remove'
-                 enabled=3D'{isRemoveEnabled()}'
-                 onActionPerformed=3D'remove()'/>
+                 enabled=3D'{model.isRemoveEnabled()}'
+                 onActionPerformed=3D'model.remove()'/>
=20
       </JToolBar>
     </cell>
@@ -49,10 +78,10 @@
     <cell columns=3D'2' fill=3D'both' weightx=3D'1' weighty=3D'1'>
       <JScrollPane id=3D'listPane'>
         <JList id=3D'to'
-               model=3D'{toModel}'
-               selectionModel=3D'{toModel}'
+               model=3D'{model.getToModel()}'
+               selectionModel=3D'{model.getToModel()}'
                font-size=3D'11'
-               onMouseClicked=3D'if (event.getClickCount()=3D=3D2) { remove(=
); }'
+               onMouseClicked=3D'if (event.getClickCount()=3D=3D2) { model.r=
emove(); }'
                cellRenderer=3D'{getRenderer()}'/>
       </JScrollPane>
     </cell>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.ja=
xx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx	201=
2-07-02 14:09:34 UTC (rev 2366)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx	201=
2-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>
=20
   <String id=3D'addToolTip' javaBean=3D'"+"'/>
@@ -46,92 +47,32 @@
                      genericType=3D'B'
                      javaBean=3D'null'/>
=20
-  <GenericListModel id=3D'fromModel'
-                    elements=3D'{model.getValues()}'
-                    genericType=3D'B'/>
-
-  <GenericListModel id=3D'toModel'
-                    elements=3D'{model.getSelectedValues()}'
-                    genericType=3D'B'/>
-
-  <Boolean id=3D'addEnabled' javaBean=3D'Boolean.FALSE'/>
-  <Boolean id=3D'removeEnabled' javaBean=3D'Boolean.FALSE'/>
-
   <ListCellRenderer id=3D'renderer' javaBean=3D'new DefaultListCellRenderer(=
)'/>
=20
   <script><![CDATA[
=20
-protected void $afterCompleteSetup() {
-    toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VAL=
UE, new PropertyChangeListener() {
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            setRemoveEnabled(toModel.hasSelectedIndex());
-        }
-    });
-    fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_V=
ALUE, new PropertyChangeListener() {
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            setAddEnabled(fromModel.hasSelectedIndex());
-        }
-    });
-}
-
-public void addValues(Collection<B> values) {
-    toModel.removeElements(values);
-    fromModel.removeElements(values);
-    fromModel.addElements(values);
-}
-
-public void removeValues(Collection<B> values) {
-    toModel.removeElements(values);
-    fromModel.removeElements(values);
-}
-
 public void setValues(Collection<B> values) {
-    toModel.clearElements();
-    fromModel.setElements(values);
+    model.setValues(values);
 }
=20
 public Collection<B> getValues() {
-    return fromModel.getElements();
+    return model.getValues();
 }
=20
 public void setSelectedValues(Collection<B> selectedValues) {
-    fromModel.removeElements(selectedValues);
-    toModel.setElements(selectedValues);
+    model.setSelectedValues(selectedValues);
 }
=20
 public Collection<B> getSelectedValues() {
-    return toModel.getElements();
+    return model.getSelectedValues();
 }
=20
-public void add() {
-    Collection<B> selectedValues =3D moveSelect(fromModel, toModel);
-    if (model !=3D null) {
-        model.add(selectedValues);
-    }
-}
-
-public void remove() {
-    Collection<B> selectedValues =3D moveSelect(toModel, fromModel);
-    if (model !=3D null) {
-        model.remove(selectedValues);
-    }
-}
-
-protected Collection<B> moveSelect(GenericListModel<B> from, GenericListMode=
l<B> to) {
-    Collection<B> selectedValues =3D Lists.newArrayList(from.getSelectedValu=
es());
-    from.removeElements(selectedValues);
-    to.addElements(selectedValues);
-    return selectedValues;
-}
-
 public void addGenericListListener(GenericListListener l) {
-    toModel.addGenericListListener(l);
+    model.addGenericListListener(l);
 }
=20
 public void removeGenericListListener(GenericListListener l) {
-    toModel.removeGenericListListener(l);
+    model.removeGenericListListener(l);
 }
 ]]>
   </script>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorMod=
el.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.jav=
a	2012-07-02 14:09:34 UTC (rev 2366)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.jav=
a	2012-07-02 15:05:33 UTC (rev 2367)
@@ -23,47 +23,144 @@
  */
 package jaxx.runtime.swing;
=20
+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;
=20
 /**
  * @author sletellier <letellier@codelutin.com>
  */
-public abstract class ListSelectorModel<B> {
+public class ListSelectorModel<B> {
=20
     protected final PropertyChangeSupport pcs =3D new PropertyChangeSupport(=
this);
=20
+    public static final String PROPERTY_ADD_ENABLED =3D "addEnabled";
+    public static final String PROPERTY_REMOVE_ENABLED =3D "removeEnabled";
+
     public static final String PROPERTY_SELECTED_VALUES =3D "selectedValues";
     public static final String PROPERTY_VALUES =3D "values";
=20
-    protected Collection<B> values;
-    protected Collection<B> selectedValues;
+    protected boolean addEnabled;
+    protected boolean removeEnabled;
=20
+    protected GenericListModel<B> fromModel;
+    protected GenericListModel<B> toModel;
+
+    protected ListSelectorModel() {
+
+        fromModel =3D new GenericListModel<B>();
+        fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECT=
ED_VALUE, new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                setAddEnabled(fromModel.hasSelectedIndex());
+            }
+        });
+
+        toModel =3D new GenericListModel<B>();
+        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 =3D isAddEnabled();
+        this.addEnabled =3D addEnabled;
+        firePropertyChange(PROPERTY_ADD_ENABLED, oldValue, addEnabled);
+    }
+
+    public boolean isRemoveEnabled() {
+        return removeEnabled;
+    }
+
+    public void setRemoveEnabled(boolean removeEnabled) {
+        boolean oldValue =3D isRemoveEnabled();
+        this.removeEnabled =3D removeEnabled;
+        firePropertyChange(PROPERTY_REMOVE_ENABLED, oldValue, removeEnabled);
+    }
+
+    public GenericListModel<B> getFromModel() {
+        return fromModel;
+    }
+
+    public GenericListModel<B> getToModel() {
+        return toModel;
+    }
+
     public Collection<B> getValues() {
-        return values;
+        return fromModel.getElements();
     }
=20
     public void setValues(Collection<B> values) {
         Collection<B> oldValues =3D getValues();
-        this.values =3D values;
+        toModel.clearElements();
+        fromModel.setElements(values);
         firePropertyChange(PROPERTY_VALUES, oldValues, values);
     }
=20
+    public void addValues(Collection<B> values) {
+        Collection<B> oldValues =3D getValues();
+        toModel.removeElements(values);
+        fromModel.removeElements(values);
+        fromModel.addElements(values);
+        firePropertyChange(PROPERTY_VALUES, oldValues, values);
+    }
+
+    public void removeValues(Collection<B> values) {
+        Collection<B> oldValues =3D getValues();
+        toModel.removeElements(values);
+        fromModel.removeElements(values);
+        firePropertyChange(PROPERTY_VALUES, oldValues, values);
+    }
+
     public Collection<B> getSelectedValues() {
-        return selectedValues;
+        return toModel.getElements();
     }
=20
     public void setSelectedValues(Collection<B> selectedValues) {
         Collection<B> oldValue =3D getSelectedValues();
-        this.selectedValues =3D selectedValues;
+        fromModel.removeElements(selectedValues);
+        toModel.removeElements(selectedValues);
+        toModel.setElements(selectedValues);
         firePropertyChange(PROPERTY_SELECTED_VALUES, oldValue, selectedValue=
s);
     }
=20
-    public abstract void add(Collection<B> values);
+    public void add() {
+        Collection<B> oldValues =3D getValues();
+        Collection<B> oldSelectedValue =3D getSelectedValues();
+        moveSelect(fromModel, toModel);
+        firePropertyChange(PROPERTY_VALUES, oldValues, getValues());
+        firePropertyChange(PROPERTY_SELECTED_VALUES, oldSelectedValue, getSe=
lectedValues());
+    }
=20
-    public abstract void remove(Collection<B> values);
+    public void remove() {
+        moveSelect(toModel, fromModel);
+    }
=20
+    protected void moveSelect(GenericListModel<B> from, GenericListModel<B> =
to) {
+        Collection<B> selectedValues =3D Lists.newArrayList(from.getSelected=
Values());
+        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/ListToListSelec=
tor.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.ja=
xx	2012-07-02 14:09:34 UTC (rev 2366)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.ja=
xx	2012-07-02 15:05:33 UTC (rev 2367)
@@ -24,14 +24,38 @@
 <ListSelector genericType=3D'B' superGenericType=3D'B'>
   <import>
     javax.swing.SwingConstants
+    java.util.Set
+    java.beans.PropertyChangeEvent
+    java.beans.PropertyChangeListener
   </import>
=20
+  <script><![CDATA[
+
+protected void $afterCompleteSetup() {
+
+    addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() {
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+
+            Set<String> bindings =3D $bindings.keySet();
+            JAXXUtil.applyDataBinding(ListToListSelector.this, bindings);
+            JAXXUtil.processDataBinding(
+                    ListToListSelector.this, bindings.toArray(new String[bin=
dings.size()]));
+        }
+    });
+}
+]]></script>
+
+  <ListSelectorModel id=3D'model'
+                     genericType=3D'B'
+                     initializer=3D'new ListSelectorModel()'/>
   <row>
     <cell fill=3D'both' weightx=3D'0.5' weighty=3D'1'>
       <JList id=3D'from'
-             model=3D'{fromModel}'
-             selectionModel=3D'{fromModel}'
-             onMouseClicked=3D'if (event.getClickCount()=3D=3D2) { add(); }'
+             model=3D'{model.getFromModel()}'
+             selectionModel=3D'{model.getFromModel()}'
+             onMouseClicked=3D'if (event.getClickCount()=3D=3D2) { model.add=
(); }'
              cellRenderer=3D'{getRenderer()}'/>
     </cell>
     <cell anchor=3D'north'>
@@ -41,22 +65,22 @@
         <JButton id=3D"add"
                  toolTipText=3D'{getAddToolTip()}'
                  actionIcon=3D'select'
-                 enabled=3D'{isAddEnabled()}'
-                 onActionPerformed=3D'add()'/>
+                 enabled=3D'{model.isAddEnabled()}'
+                 onActionPerformed=3D'model.add()'/>
=20
         <JButton id=3D"remove"
                  toolTipText=3D'{getRemoveToolTip()}'
                  actionIcon=3D'unselect'
-                 enabled=3D'{isRemoveEnabled()}'
-                 onActionPerformed=3D'remove()'/>
+                 enabled=3D'{model.isRemoveEnabled()}'
+                 onActionPerformed=3D'model.remove()'/>
=20
       </JToolBar>
     </cell>
     <cell fill=3D'both' weightx=3D'0.5' weighty=3D'1'>
       <JList id=3D'to'
-             model=3D'{toModel}'
-             selectionModel=3D'{toModel}'
-             onMouseClicked=3D'if (event.getClickCount()=3D=3D2) { remove();=
 }'
+             model=3D'{model.getToModel()}'
+             selectionModel=3D'{model.getToModel()}'
+             onMouseClicked=3D'if (event.getClickCount()=3D=3D2) { model.rem=
ove(); }'
              cellRenderer=3D'{getRenderer()}'/>
     </cell>
   </row>


--===============8765808585291236081==--