From tchemit@users.nuiton.org Wed May 14 16:16:40 2014
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2830 -
	trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
Date: Wed, 14 May 2014 16:16:40 +0200
Message-ID: <20140514141640.8D3EF181D9F@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3231972392177799013=="

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

Author: tchemit
Date: 2014-05-14 16:16:39 +0200 (Wed, 14 May 2014)
New Revision: 2830

Url: http://forge.nuiton.org/projects/jaxx/repository/revisions/2830

Log:
fixes #3198: Permits to not auto acquire focus in Bean combobox

Modified:
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboB=
ox.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboB=
oxHandler.java
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilter=
ableComboBox.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilter=
ableComboBoxHandler.java

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nComboBox.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/BeanCombo=
Box.jaxx	2014-05-14 12:47:00 UTC (rev 2829)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanCombo=
Box.jaxx	2014-05-14 14:16:39 UTC (rev 2830)
@@ -25,7 +25,7 @@
=20
 <Table fill=3D'both' insets=3D'0' genericType=3D'O'
        implements=3D'jaxx.runtime.bean.BeanTypeAware&lt;O&gt;'
-       onFocusGained=3D'combobox.requestFocus()' onFocusLost=3D'hidePopup()'>
+       onFocusGained=3D'handler.focusCombo()' onFocusLost=3D'hidePopup()'>
=20
   <import>
     jaxx.runtime.swing.model.JaxxDefaultComboBoxModel
@@ -54,6 +54,9 @@
   <!-- sortable combo property -->
   <Boolean id=3D'sortable' javaBean=3D'true'/>
=20
+  <!-- to transmit focus from table to combo property -->
+  <Boolean id=3D'autoFocus' javaBean=3D'true'/>
+
   <!-- bean property linked state -->
   <String id=3D'property' javaBean=3D'""'/>
=20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nComboBoxHandler.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/BeanCombo=
BoxHandler.java	2014-05-14 12:47:00 UTC (rev 2829)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanCombo=
BoxHandler.java	2014-05-14 14:16:39 UTC (rev 2830)
@@ -316,6 +316,17 @@
     }
=20
     /**
+     * Focus combo only if autoFocus ui property is on.
+     *
+     * @since 2.8.5
+     */
+    public void focusCombo() {
+        if (ui.isAutoFocus()) {
+            ui.combobox.requestFocusInWindow();
+        }
+    }
+
+    /**
      * Modifie l'=C3=A9tat autoComplete de l'ui.
      *
      * @param oldValue l'ancienne valeur

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nFilterableComboBox.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/BeanFilte=
rableComboBox.jaxx	2014-05-14 12:47:00 UTC (rev 2829)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilte=
rableComboBox.jaxx	2014-05-14 14:16:39 UTC (rev 2830)
@@ -25,7 +25,7 @@
=20
 <Table fill=3D'both' insets=3D'0' genericType=3D'O'
        implements=3D'jaxx.runtime.bean.BeanTypeAware&lt;O&gt;'
-       onFocusGained=3D'combobox.requestFocus()' onFocusLost=3D'hidePopup()'>
+       onFocusGained=3D'handler.focusCombo()' onFocusLost=3D'hidePopup()'>
=20
   <import>
     jaxx.runtime.swing.model.JaxxFilterableComboBoxModel
@@ -54,6 +54,9 @@
   <!-- sortable combo property -->
   <Boolean id=3D'sortable' javaBean=3D'true'/>
=20
+  <!-- to transmit focus from table to combo property -->
+  <Boolean id=3D'autoFocus' javaBean=3D'true'/>
+
   <!-- to select using enter key when there is only one selection  -->
   <Boolean id=3D'enterToSelectUniqueUniverse' javaBean=3D'true'/>
=20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nFilterableComboBoxHandler.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/BeanFilte=
rableComboBoxHandler.java	2014-05-14 12:47:00 UTC (rev 2829)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilte=
rableComboBoxHandler.java	2014-05-14 14:16:39 UTC (rev 2830)
@@ -441,6 +441,17 @@
     }
=20
     /**
+     * Focus combo only if autoFocus ui property is on.
+     *
+     * @since 2.8.5
+     */
+    public void focusCombo() {
+        if (ui.isAutoFocus()) {
+            ui.combobox.requestFocusInWindow();
+        }
+    }
+
+    /**
      * Modifie l'=C3=A9tat filterable de l'ui.
      *
      * @param oldValue l'ancienne valeur


--===============3231972392177799013==--