From tchemit@users.nuiton.org Mon Sep 30 17:57:57 2013
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2728 - in trunk: .
	jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
Date: Mon, 30 Sep 2013 17:57:57 +0200
Message-ID: <20130930155757.0D79218E72C@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7800682825163542091=="

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

Author: tchemit
Date: 2013-09-30 17:57:56 +0200 (Mon, 30 Sep 2013)
New Revision: 2728

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

Log:
fixes #2859: Updates nuiton-decorator to 3.0-alpha-2
fixes #2863: [BeanDoublieList] Can add a second decorator form selected list


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/pom.xml

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-30 15:38:09 UTC (rev 2727)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eList.jaxx	2013-09-30 15:57:56 UTC (rev 2728)
@@ -147,7 +147,11 @@
   </row>
=20
   <script><![CDATA[
- =20
+
+public void init(JXPathDecorator<O> decorator, JXPathDecorator<O> decorator2=
, List<O> universe, List<O> selected) {
+      handler.init(decorator, decorator2, universe, selected);
+  }
+
 public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> sel=
ected) {
     handler.init(decorator, universe, selected);
 }

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-30 15:38:09 UTC (rev 2727)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubl=
eListHandler.java	2013-09-30 15:57:56 UTC (rev 2728)
@@ -114,6 +114,17 @@
      * @param selected  the list of selected items
      */
     public void init(JXPathDecorator<O> decorator, List<O> universe, List<O>=
 selected) {
+        init(decorator, decorator, universe, selected);
+    }
+    /**
+     * Initializes the handler of the UI
+     *
+     * @param decorator the decorator to use to display the data nicely
+     * @param decorator2 the selected decorator to use to display the select=
ed data nicely (if none, then reuse the first one)
+     * @param universe  the list of all the available items
+     * @param selected  the list of selected items
+     */
+    public void init(JXPathDecorator<O> decorator,JXPathDecorator<O> decorat=
or2, 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
@@ -128,8 +139,14 @@
         final FilteredDecoratorListCellRenderer universeListCellRenderer
                 =3D new FilteredDecoratorListCellRenderer(this.decorator);
         universeList.setCellRenderer(universeListCellRenderer);
-        selectedList.setCellRenderer(new DecoratorListCellRenderer(this.deco=
rator));
=20
+        if (decorator2 !=3D null) {
+            decorator2 =3D BeanUIUtil.createDecorator(decorator2);
+        } else {
+            decorator2 =3D this.decorator;
+        }
+        selectedList.setCellRenderer(new DecoratorListCellRenderer(decorator=
2));
+
         // When universe list selection model changed, update the add button=
 enabled property
         universeList.getSelectionModel().addListSelectionListener(new ListSe=
lectionListener() {
             @Override

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	2013-09-30 15:38:09 UTC (rev 2727)
+++ trunk/pom.xml	2013-09-30 15:57:56 UTC (rev 2728)
@@ -116,7 +116,7 @@
     <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion>
     <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion>
     <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
-    <nuitonDecoratorVersion>3.0-SNAPSHOT</nuitonDecoratorVersion>
+    <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion>
     <nuitonI18nVersion>2.5.1</nuitonI18nVersion>
     <eugeneVersion>2.6.3</eugeneVersion>
     <jxLayerVersion>3.0.4</jxLayerVersion>


--===============7800682825163542091==--