From tchemit@users.nuiton.org Sun Sep 29 11:42:27 2013
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2726 -
	trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
Date: Sun, 29 Sep 2013 11:42:27 +0200
Message-ID: <20130929094227.7BDE118E6D1@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6269312438532674789=="

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

Author: tchemit
Date: 2013-09-29 11:42:27 +0200 (Sun, 29 Sep 2013)
New Revision: 2726

Url: http://nuiton.org/projects/jaxx/repository/revisions/2726

Log:
fixes

Modified:
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDouble=
List.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDouble=
ListHandler.java
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDouble=
ListModel.java

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nDoubleList.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/editor/bean/BeanDoubl=
eList.jaxx	2013-09-28 14:31:14 UTC (rev 2725)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eList.jaxx	2013-09-29 09:42:27 UTC (rev 2726)
@@ -24,9 +24,7 @@
 <Table genericType=3D'O' implements=3D'jaxx.runtime.bean.BeanTypeAware&lt;O&=
gt;'>
=20
   <import>
-    jaxx.runtime.swing.model.JaxxDefaultListModel
     org.nuiton.decorator.JXPathDecorator
-    javax.swing.DefaultListModel
   </import>
 =20
  <!-- filterable list property -->
@@ -41,6 +39,9 @@
   <!-- show reset property -->
   <Boolean id=3D'showReset' javaBean=3D'true'/>
=20
+  <!-- to be able to select a same entry more than one time property -->
+  <Boolean id=3D'useMultiSelect' javaBean=3D'false'/>
+
   <!-- show showSelectPopupEnabled property -->
   <Boolean id=3D'showSelectPopupEnabled' javaBean=3D'true'/>
  =20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nDoubleListHandler.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/editor/bean/BeanDoubl=
eListHandler.java	2013-09-28 14:31:14 UTC (rev 2725)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eListHandler.java	2013-09-29 09:42:27 UTC (rev 2726)
@@ -116,6 +116,9 @@
     public void init(JXPathDecorator<O> decorator, List<O> universe, List<O>=
 selected) {
         this.decorator =3D BeanUIUtil.createDecorator(decorator);
=20
+        // make sure useMultiSelect is set before filling universe and selec=
t lists
+        ui.getModel().setUseMultiSelect(ui.getUseMultiSelect());
+
         ui.getModel().setUniverse(universe);
         ui.getModel().setSelected(selected);
=20
@@ -446,6 +449,9 @@
         } else if (BeanDoubleList.PROPERTY_HIGHLIGHT_FILTER_TEXT.equals(prop=
ertyName)) {
=20
             setHighlightFilterText((Boolean) evt.getNewValue());
+        } else if (BeanDoubleList.PROPERTY_USE_MULTI_SELECT.equals(propertyN=
ame)) {
+
+            ui.getModel().setUseMultiSelect((Boolean) evt.getNewValue());
         }
     }
=20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nDoubleListModel.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/editor/bean/BeanDoubl=
eListModel.java	2013-09-28 14:31:14 UTC (rev 2725)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eListModel.java	2013-09-29 09:42:27 UTC (rev 2726)
@@ -55,6 +55,8 @@
=20
     public static final String PROPERTY_SELECTED_DOWN_ENABLED =3D "selectedD=
ownEnabled";
=20
+    public static final String PROPERTY_USE_MULTI_SELECT=3D "useMultiSelect";
+
     private static final long serialVersionUID =3D 1L;
=20
     /** List of all the available items */
@@ -77,6 +79,8 @@
=20
     protected boolean selectedDownEnabled;
=20
+    protected boolean useMultiSelect;
+
     /**
      * To get the selected items.
      *
@@ -149,7 +153,9 @@
     public void addToSelected(O item) {
         selected.add(item);
         selectedModel.addElement(item);
-        universeModel.removeElement(item);
+        if (!useMultiSelect) {
+            universeModel.removeElement(item);
+        }
     }
=20
     /**
@@ -161,7 +167,8 @@
         selected.addAll(items);
         for (O item : items) {
             selectedModel.addElement(item);
-            universeModel.removeElement(item);
+            if (!useMultiSelect)
+                universeModel.removeElement(item);
         }
     }
=20
@@ -173,7 +180,9 @@
     public void removeFromSelected(O item) {
         selected.remove(item);
         selectedModel.removeElement(item);
-        addToUniverseList(item);
+        if (!useMultiSelect) {
+            addToUniverseList(item);
+        }
     }
=20
     /**
@@ -185,7 +194,9 @@
         selected.removeAll(items);
         for (O item : items) {
             selectedModel.removeElement(item);
-            addToUniverseList(item);
+            if (!useMultiSelect) {
+                addToUniverseList(item);
+            }
         }
     }
=20
@@ -257,6 +268,17 @@
         firePropertyChange(PROPERTY_SELECTED_DOWN_ENABLED, oldValue, selecte=
dDownEnabled);
     }
=20
+
+    public boolean isUseMultiSelect() {
+        return useMultiSelect;
+    }
+
+    public void setUseMultiSelect(boolean useMultiSelect) {
+        boolean oldValue =3D isUseMultiSelect();
+        this.useMultiSelect =3D useMultiSelect;
+        firePropertyChange(PROPERTY_USE_MULTI_SELECT, oldValue, useMultiSele=
ct);
+    }
+
     /**
      * Adds an item to the available items list at the right index
      * to keep always the same order.


--===============6269312438532674789==--