From tchemit@users.nuiton.org Thu Dec 13 16:37:20 2012
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] 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
Date: Thu, 13 Dec 2012 16:37:20 +0100
Message-ID: <20121213153720.916DD15954@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8333241581665021593=="

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

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/BeanDouble=
List.css
   trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.=
png
   trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselec=
t.png
Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleLi=
stDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleLi=
stDemoHandler.java
   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
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHe=
aderHandler.java
   trunk/pom.xml

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanD=
oubleListDemo.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-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleL=
istDemo.jaxx	2012-12-13 09:20:39 UTC (rev 2534)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleL=
istDemo.jaxx	2012-12-13 15:37:20 UTC (rev 2535)
@@ -2,20 +2,20 @@
=20
   <import>
     jaxx.demo.entities.People
+    jaxx.runtime.swing.editor.bean.BeanDoubleList
   </import>
=20
   <BeanDoubleListDemoHandler id=3D'handler' constructorParams=3D'this'/>
- =20
+
   <Table fill=3D'both'>
     <row>
       <cell weighty=3D'1' weightx=3D'1'>
-        <jaxx.runtime.swing.editor.bean.BeanDoubleList id=3D'doubleList'
-                                            beanType=3D'{People.class}'/>
+        <BeanDoubleList id=3D'doubleList' beanType=3D'{People.class}'/>
       </cell>
     </row>
   </Table>
-                                           =20
-<script><![CDATA[
+
+  <script><![CDATA[
  =20
 protected void $afterCompleteSetup() {
     handler.init();


Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/e=
ditor/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/e=
ditor/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/BeanDo=
ubleList.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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.css	                        (rev 0)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eList.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=20
+ * published by the Free Software Foundation, either version 3 of the=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Lesser Public=20
+ * 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/edit=
or/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/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	2012-12-13 09:20:39 UTC (rev 2534)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eList.jaxx	2012-12-13 15:37:20 UTC (rev 2535)
@@ -1,59 +1,96 @@
+<!--
+  #%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=20
+  published by the Free Software Foundation, either version 3 of the=20
+  License, or (at your option) any later version.
+ =20
+  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.
+ =20
+  You should have received a copy of the GNU General Lesser Public=20
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  #L%
+  -->
 <Table genericType=3D'O'>
=20
-<import>
+  <import>
     org.nuiton.util.decorator.JXPathDecorator
     javax.swing.DefaultListModel
-</import>
+  </import>
=20
-  <!-- bean property -->
+  <!-- bean type -->
   <Class genericType=3D'O' id=3D'beanType' javaBean=3D'null'/>
=20
   <!-- label -->
   <String id=3D'labelText' javaBean=3D'null'/>
- =20
+
   <!-- bean property linked state -->
   <String id=3D'property' javaBean=3D'""'/>
=20
   <!-- bean property -->
   <Object id=3D'bean' javaBean=3D'null'/>
- =20
+
+  <!-- show reset property -->
+  <Boolean id=3D'showReset' javaBean=3D'false'/>
+
+  <!-- show decorator property -->
+  <!--Boolean id=3D'showDecorator' javaBean=3D'true'/-->
+
+  <!--String id=3D'i18nPrefix' javaBean=3D'"beanlist.common."'/-->
+
   <!-- model -->
-  <BeanDoubleListModel id=3D'model' genericType=3D'O'=20
-                       universeModel=3D'{universeList.getModel()}'=20
-                       selectedModel=3D'{selectedList.getModel()}'/>
- =20
+  <BeanDoubleListModel id=3D'model' genericType=3D'O'/>
+
   <!-- handler -->
   <BeanDoubleListHandler id=3D'handler' genericType=3D'O' constructorParams=
=3D'this'/>
- =20
+
   <row>
-    <cell weightx=3D'1' weighty=3D'1' fill=3D'both' rows=3D'2'>
-      <JScrollPane>
+    <cell weightx=3D'0.5' weighty=3D'1' fill=3D'both'>
+      <JScrollPane onFocusGained=3D'universeList.requestFocus()'>
+                   <!--columnHeaderView=3D'{universeListHeader}'-->
         <!-- List of all the remaining available elements -->
-        <JList id=3D'universeList' model=3D'{new DefaultListModel()}'/>
-<!--        <BeanListHeader id=3D'universeListHeader' genericType=3D'O' list=
=3D'{universeList}'/>-->
+        <JList id=3D'universeList'
+               onMouseClicked=3D'handler.onUniverseListClicked(event)'/>
+        <!--BeanListHeader id=3D'universeListHeader' genericType=3D'O'
+                        list=3D'{universeList}' i18nPrefix=3D"{getI18nPrefix=
()}"
+                        showReset=3D"{isShowReset()}"
+                        showDecorator=3D"{isShowDecorator()}"/-->
       </JScrollPane>
     </cell>
+
     <cell anchor=3D'north'>
-      <JButton id=3D'addButton' toolTipText=3D"beandoublelist.button.add"=20
-               actionIcon=3D'select'/>
+      <JPanel layout=3D'{new GridLayout(0,1)}'>
+        <JButton id=3D'addButton' onActionPerformed=3D'handler.select()'/>
+        <JButton id=3D'removeButton' onActionPerformed=3D'handler.unselect()=
'/>
+      </JPanel>
     </cell>
-    <cell weightx=3D'1' weighty=3D'1' fill=3D'both' rows=3D'2'>
-      <JScrollPane>
+
+    <cell weightx=3D'0.5' weighty=3D'1' fill=3D'both'>
+      <JScrollPane onFocusGained=3D'selectedList.requestFocus()'>
+                   <!--columnHeaderView=3D'{selectedListHeader}'-->
         <!-- List of the selected elements -->
-        <JList id=3D'selectedList' model=3D'{new DefaultListModel()}'/>
-<!--        <BeanListHeader id=3D'selectedListHeader' genericType=3D'O' list=
=3D'{selectedList}'/>-->
+        <JList id=3D'selectedList'
+               onMouseClicked=3D'handler.onSelectedListClicked(event)'/>
+        <!--BeanListHeader id=3D'selectedListHeader' genericType=3D'O'
+                        list=3D'{selectedList}' i18nPrefix=3D"{getI18nPrefix=
()}"
+                        showReset=3D"{isShowReset()}"
+                        showDecorator=3D"{isShowDecorator()}"/-->
       </JScrollPane>
     </cell>
   </row>
-  <row>
-    <cell anchor=3D'north'>
-      <JButton id=3D'removeButton' toolTipText=3D"beandoublelist.button.remo=
ve"
-               actionIcon=3D'unselect'/>
-    </cell>
-  </row>
+
+  <script><![CDATA[
  =20
-<script><![CDATA[
- =20
 public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> sel=
ected) {
     handler.init(decorator, universe, selected);
 }


Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/edit=
or/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/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	2012-12-13 09:20:39 UTC (rev 2534)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eListHandler.java	2012-12-13 15:37:20 UTC (rev 2535)
@@ -1,147 +1,136 @@
 package jaxx.runtime.swing.editor.bean;
=20
-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=20
+ * published by the Free Software Foundation, either version 3 of the=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Lesser Public=20
+ * 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;
=20
 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;
=20
 /**
  * The handler of a {@link BeanDoubleList}.
  * <p/>
  *
- * @author kmorin <morin@codelutin.com>
  * @param <O> the type of the objects contained in the list.
+ * @author kmorin <morin@codelutin.com>
  * @see BeanDoubleList
  * @since 2.5.8
  */
-public class BeanDoubleListHandler<O> implements PropertyChangeListener {
-   =20
+public class BeanDoubleListHandler<O> {
+
     private static final Log log =3D LogFactory.getLog(BeanDoubleListHandler=
.class);
-   =20
+
     /** the mutator method on the property of boxed bean in the ui */
     protected Method mutator;
-   =20
+
     /** ui of the handler */
     protected BeanDoubleList<O> ui;
-   =20
+
     /** the decorator of data */
     protected MultiJXPathDecorator<O> decorator;
-   =20
+
     public BeanDoubleListHandler(BeanDoubleList<O> ui) {
         this.ui =3D ui;
     }
=20
     /**
      * 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 =3D BeanUIUtil.createDecorator(decorator);
-       =20
-        initModel(universe, selected);
-       =20
-        final JList universeList =3D ui.getUniverseList();
-        universeList.setCellRenderer(new DecoratorListCellRenderer(this.deco=
rator));
-        final JList selectedList =3D ui.getSelectedList();
-        selectedList.setCellRenderer(new DecoratorListCellRenderer(this.deco=
rator));
=20
-        initListeners();
-       =20
-        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);
-    }
-   =20
-    /**
-     * Initializes the listeners.
-     */
-    protected void initListeners() {
-        final JList universeList =3D ui.getUniverseList();
-        final JList selectedList =3D ui.getSelectedList();
-       =20
-        universeList.addMouseListener(new MouseAdapter() {
-           =20
-            public void mouseClicked(MouseEvent event) {
-                if (event.getClickCount() =3D=3D 2) {
-                    int index =3D universeList.locationToIndex(event.getPoin=
t());
-                    O item =3D (O) universeList.getModel().getElementAt(inde=
x);
-                    ui.getModel().addToSelected(item);
-                }
-            }
-        });
-       =20
-        selectedList.addMouseListener(new MouseAdapter() {
-           =20
-            public void mouseClicked(MouseEvent event) {
-                if (event.getClickCount() =3D=3D 2) {
-                    int index =3D selectedList.locationToIndex(event.getPoin=
t());
-                    O item =3D (O) selectedList.getModel().getElementAt(inde=
x);
-                    ui.getModel().removeFromSelected(item);
-                }
-            }
-        });
-       =20
-        selectedList.getModel().addListDataListener(new ListDataListener() {
=20
-            public void intervalAdded(ListDataEvent e) {
-                fireSelectionUpdate();
-            }
+        JList universeList =3D ui.getUniverseList();
+        JList selectedList =3D ui.getSelectedList();
=20
-            public void intervalRemoved(ListDataEvent e) {
-                fireSelectionUpdate();
-            }
+        universeList.setCellRenderer(new DecoratorListCellRenderer(this.deco=
rator));
+        selectedList.setCellRenderer(new DecoratorListCellRenderer(this.deco=
rator));
=20
-            public void contentsChanged(ListDataEvent e) {
-                fireSelectionUpdate();
+        universeList.getSelectionModel().addListSelectionListener(new ListSe=
lectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                ListSelectionModel source =3D (ListSelectionModel) e.getSour=
ce();
+                ui.getModel().setAddEnabled(!source.isSelectionEmpty());
             }
         });
-       =20
-        ui.getAddButton().addActionListener(new ActionListener() {
=20
-            public void actionPerformed(ActionEvent e) {
-                List<O> selection =3D (List<O>) Arrays.asList(universeList.g=
etSelectedValues());
-                ui.getModel().addToSelected(selection);
+        selectedList.getSelectionModel().addListSelectionListener(new ListSe=
lectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                ListSelectionModel source =3D (ListSelectionModel) e.getSour=
ce();
+                ui.getModel().setRemoveEnabled(!source.isSelectionEmpty());
             }
         });
-       =20
-        ui.getRemoveButton().addActionListener(new ActionListener() {
+    }
=20
-            public void actionPerformed(ActionEvent e) {
-                List<O> selection =3D (List<O>) Arrays.asList(selectedList.g=
etSelectedValues());
-                ui.getModel().removeFromSelected(selection);
-            }
-        });
-       =20
+    public void onUniverseListClicked(MouseEvent event) {
+        JList universeList =3D ui.getUniverseList();
+        if (event.getClickCount() =3D=3D 2) {
+            int index =3D universeList.locationToIndex(event.getPoint());
+            O item =3D (O) universeList.getModel().getElementAt(index);
+            ui.getModel().addToSelected(item);
+        }
     }
-   =20
+
+    public void onSelectedListClicked(MouseEvent event) {
+
+        JList selectedList =3D ui.getSelectedList();
+
+        if (event.getClickCount() =3D=3D 2) {
+            int index =3D selectedList.locationToIndex(event.getPoint());
+            O item =3D (O) selectedList.getModel().getElementAt(index);
+            ui.getModel().removeFromSelected(item);
+        }
+    }
+
+    public void select() {
+        List<O> selection =3D (List<O>) Arrays.asList(ui.getUniverseList().g=
etSelectedValues());
+        ui.getModel().addToSelected(selection);
+    }
+
+    public void unselect() {
+        List<O> selection =3D (List<O>) Arrays.asList(ui.getSelectedList().g=
etSelectedValues());
+        ui.getModel().removeFromSelected(selection);
+    }
+
     protected void fireSelectionUpdate() {
         if (ui.getBean() =3D=3D null) {
             return;
@@ -155,7 +144,7 @@
             throw new RuntimeException(e);
         }
     }
-   =20
+
     /** @return le mutateur a utiliser pour modifier le bean associ=C3=A9. */
     protected Method getMutator() {
         if (mutator =3D=3D null) {
@@ -163,9 +152,4 @@
         }
         return mutator;
     }
-
-    @Override
-    public void propertyChange(PropertyChangeEvent evt) {
-    }
-   =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	2012-12-13 09:20:39 UTC (rev 2534)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eListModel.java	2012-12-13 15:37:20 UTC (rev 2535)
@@ -1,38 +1,78 @@
 package jaxx.runtime.swing.editor.bean;
=20
+/*
+ * #%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=20
+ * published by the Free Software Foundation, either version 3 of the=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Lesser Public=20
+ * 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;
=20
+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@codelutin.com>
  * @see BeanDoubleList
- * @since 2.5.8=20
+ * @since 2.5.8
  */
-public class BeanDoubleListModel<O> {
-   =20
+public class BeanDoubleListModel<O> extends AbstractSerializableBean {
+
     private static final Log log =3D LogFactory.getLog(BeanDoubleListModel.c=
lass);
-   =20
+
+
+    public static final String PROPERTY_ADD_ENABLED =3D "addEnabled";
+
+    public static final String PROPERTY_REMOVE_ENABLED =3D "removeEnabled";
+
+    private static final long serialVersionUID =3D 1L;
+
     /** List of all the available items */
     protected List<O> universe =3D new ArrayList<O>();
-   =20
+
     /** Model containing the remaining available items */
     protected ListModel universeModel =3D new DefaultListModel();
-   =20
+
     /** List of the selected items */
     protected List<O> selected =3D new ArrayList<O>();
-   =20
+
     /** Model containing the selected items */
     protected ListModel selectedModel =3D new DefaultListModel();
-   =20
+
+
+    protected boolean addEnabled;
+
+    protected boolean removeEnabled;
+
     /**
      * To get the selected items.
+     *
      * @return a list of O
      */
     public List<O> getSelected() {
@@ -40,25 +80,27 @@
     }
=20
     /**
-     * Sets the list of selected items.=20
+     * 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();
-       =20
+
         if (selected =3D=3D null) {
             selected =3D Lists.newArrayList();
         }
         this.selected.clear();
-        ((DefaultListModel)selectedModel).clear();
+        ((DefaultListModel) selectedModel).clear();
         addToSelected(selected);
     }
=20
     /**
      * To get all the available items.
+     *
      * @return a list of O
      */
     public List<O> getUniverse() {
@@ -66,8 +108,9 @@
     }
=20
     /**
-     * Sets the list of the available items.=20
+     * 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 =3D Lists.newArrayList(universe);
         resetUniverse();
     }
-   =20
+
     protected void resetUniverse() {
-        ((DefaultListModel)universeModel).clear();
+        ((DefaultListModel) universeModel).clear();
         for (O item : universe) {
-            ((DefaultListModel)universeModel).addElement(item);
+            ((DefaultListModel) universeModel).addElement(item);
         }
     }
=20
@@ -100,77 +143,103 @@
     public void setUniverseModel(ListModel universeModel) {
         this.universeModel =3D universeModel;
     }
-   =20
+
     /**
      * 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);
     }
-   =20
+
     /**
      * 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);
         }
     }
-   =20
+
     /**
      * 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);
     }
-   =20
+
     /**
      * 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);
         }
     }
-   =20
+
+    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);
+    }
+
     /**
      * 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 =3D (DefaultListModel)univ=
erseModel;
+        DefaultListModel universeDefaultListModel =3D (DefaultListModel) uni=
verseModel;
         // the maximum index where we should insert the item is its index=20
         // in the list of all the available items=20
         int index =3D 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 =3D Math.min(index, universeDefaultListModel.getS=
ize());
-       =20
+
         // 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 t=
he item
         // we want to insert
         while (insertionIndex > 0) {
-            O o =3D (O)universeDefaultListModel.get(--insertionIndex);
+            O o =3D (O) universeDefaultListModel.get(--insertionIndex);
             int oIndex =3D universe.indexOf(o);
             if (oIndex < index) {
                 insertionIndex++;
                 break;
             }
-        };
-       =20
+        }
+        ;
+
         universeDefaultListModel.add(insertionIndex, item);
     }
 }


Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/edit=
or/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/Bea=
nListHeaderHandler.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/BeanListH=
eaderHandler.java	2012-12-13 09:20:39 UTC (rev 2534)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListH=
eaderHandler.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;
=20
+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 {
=20
             // reload the model
-            ui.getList().setListData(datas.toArray(new Object[datas.size()])=
);
+            ListModel listModel =3D ui.getList().getModel();
=20
+            if( listModel instanceof DefaultListModel) {
+                DefaultListModel model =3D (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) {
=20

Added: trunk/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-sel=
ect.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(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-uns=
elect.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/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>
=20
   <artifactId>jaxx</artifactId>
@@ -111,13 +111,13 @@
=20
     <!-- pour un muli module on doit fixer le projectId -->
     <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>
=20
     <!-- i18n configuration -->
     <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>


--===============8333241581665021593==--