From tchemit@users.nuiton.org Tue Sep  7 12:45:13 2010
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2071 - in trunk/jaxx-widgets/src/main:
	java/jaxx/runtime/swing/editor/bean resources/icons
Date: Tue, 07 Sep 2010 12:45:13 +0200
Message-ID: <20100907104513.B9A71159FB@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3531423488906627920=="

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

Author: tchemit
Date: 2010-09-07 12:45:13 +0200 (Tue, 07 Sep 2010)
New Revision: 2071

Url: http://nuiton.org/repositories/revision/jaxx/2071

Log:
improve bean editors + add missing icons

Added:
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil=
.java
   trunk/jaxx-widgets/src/main/resources/icons/action-combobox-reset.png
   trunk/jaxx-widgets/src/main/resources/icons/action-combobox-sort.png
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/BeanListHe=
ader.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHe=
aderHandler.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	2010-09-07 10:44:52 UTC (rev 2070)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanCombo=
Box.jaxx	2010-09-07 10:45:13 UTC (rev 2071)
@@ -27,6 +27,11 @@
        onFocusGained=3D'combobox.requestFocus()'
        onFocusLost=3D'hidePopup()'>
=20
+  <import>
+    static org.nuiton.i18n.I18n.n_
+    jaxx.runtime.decorator.JXPathDecorator
+  </import>
+ =20
   <!-- auto complete property -->
   <Boolean id=3D'autoComplete' javaBean=3D'false'/>
=20
@@ -97,15 +102,6 @@
   </JPopupMenu>
=20
   <script><![CDATA[
-import static org.nuiton.i18n.I18n.n_;
-import jaxx.runtime.decorator.JXPathDecorator;
-
-public static final String DEFAULT_POPUP_LABEL =3D n_("bean.popup.label");
-
-public static final String DEFAULT_SELECTED_TOOLTIP =3D n_("bean.sort.on");
-
-public static final String DEFAULT_NOT_SELECTED_TOOLTIP =3D n_("bean.sort.of=
f");
-
 public void init(JXPathDecorator<O> decorator, java.util.List<O> data) {
     handler.init(decorator, data);
 }

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	2010-09-07 10:44:52 UTC (rev 2070)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanCombo=
BoxHandler.java	2010-09-07 10:45:13 UTC (rev 2071)
@@ -26,7 +26,6 @@
 package jaxx.runtime.swing.editor.bean;
=20
 import jaxx.runtime.SwingUtil;
-import jaxx.runtime.decorator.Decorator;
 import jaxx.runtime.decorator.DecoratorUtils;
 import jaxx.runtime.decorator.JXPathDecorator;
 import jaxx.runtime.decorator.MultiJXPathDecorator;
@@ -35,32 +34,20 @@
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
-import org.jdesktop.swingx.autocomplete.AutoCompletePropertyChangeListener;
 import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
=20
-import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JToggleButton;
-import javax.swing.SwingUtilities;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
-import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.beans.Introspector;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
-import java.util.Date;
 import java.util.List;
=20
-import static org.nuiton.i18n.I18n._;
-import static org.nuiton.i18n.I18n.n_;
-
 /**
  * Le handler d'un {@link BeanComboBox}.
  * <p/>
@@ -74,14 +61,6 @@
=20
     public static final Log log =3D LogFactory.getLog(BeanComboBoxHandler.cl=
ass);
=20
-    public static final String SELECTED_ITEM_PROPERTY =3D "selectedItem";
-
-    public static final String INDEX_PROPERTY =3D "index";
-
-    public static final String AUTO_COMPLETE_PROPERTY =3D "autoComplete";
-
-    public static final String DATA_PROPERTY =3D "data";
-
     /** ui if the handler */
     protected BeanComboBox<O> ui;
=20
@@ -118,6 +97,19 @@
         }
     };
=20
+    private final BeanUIUtil.PopupHandler popupHandler =3D new BeanUIUtil.Po=
pupHandler() {
+
+        @Override
+        public JPopupMenu getPopup() {
+            return ui.getPopup();
+        }
+
+        @Override
+        public JComponent getInvoker() {
+            return ui.getChangeDecorator();
+        }
+    };
+
     /**
      * Initialise le handler de l'ui
      *
@@ -130,36 +122,30 @@
             throw new IllegalStateException("can not init the handler twice"=
);
         }
         init =3D true;
-        if (decorator =3D=3D null) {
-            throw new NullPointerException("can not have a null decorator as=
 parameter");
-        }
=20
         JAXXButtonGroup indexes =3D ui.getIndexes();
=20
-        MultiJXPathDecorator<O> d;
-        if (decorator instanceof MultiJXPathDecorator<?>) {
-            // should clone decorator ?
-            d =3D (MultiJXPathDecorator<O>) decorator;
-        } else {
-            d =3D DecoratorUtils.newMultiJXPathDecorator(
-                    decorator.getInternalClass(),
-                    decorator.getInitialExpression(),
-                    "??" + new Date().getTime(),
-                    " - ");
-        }
-        this.decorator =3D d;
+        this.decorator =3D BeanUIUtil.createDecorator(decorator);
=20
         // init combobox renderer base on given decorator
-        ui.getCombobox().setRenderer(new DecoratorListCellRenderer(d));
+        ui.getCombobox().setRenderer(new DecoratorListCellRenderer(this.deco=
rator));
=20
-        convertor =3D newDecoratedObjectToStringConverter(d);
+        convertor =3D BeanUIUtil.newDecoratedObjectToStringConverter(this.de=
corator);
=20
         // keep a trace of original document (to make possible reverse autom=
-complete)=20
         JTextComponent editorComponent =3D (JTextComponent) ui.getCombobox()=
.getEditor().getEditorComponent();
         originalDocument =3D editorComponent.getDocument();
=20
         // build popup
-        preparePopup(d);
+        popupHandler.preparePopup(ui.getSelectedToolTipText(),
+                               ui.getNotSelectedToolTipText(),
+                               ui.getI18nPrefix(),
+                               ui.getPopupTitleText(),
+                               indexes,
+                               ui.getPopupLabel(),
+                               ui.getSortUp(),
+                               ui.getSortDown(),
+                               this.decorator);
=20
         ui.autoComplete =3D true;
=20
@@ -174,43 +160,9 @@
=20
     /** Toggle the popup visible state. */
     public void togglePopup() {
-        boolean newValue =3D !ui.getPopup().isVisible();
-
-        if (log.isTraceEnabled()) {
-            log.trace(newValue);
-        }
-
-        if (!newValue) {
-            if (ui.getPopup() !=3D null) {
-                ui.getPopup().setVisible(false);
-            }
-            return;
-        }
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-
-                updatePopup();
-
-                Dimension dim =3D ui.getPopup().getPreferredSize();
-                JToggleButton invoker =3D ui.getChangeDecorator();
-                ui.getPopup().show(
-                        invoker,
-                        (int) (invoker.getPreferredSize().getWidth() - dim.g=
etWidth()),
-                        invoker.getHeight()
-                );
-            }
-        });
+        popupHandler.togglePopup();
     }
=20
-
-    protected void updatePopup() {
-        JPopupMenu popup =3D ui.getPopup();
-        popup.pack();
-
-    }
-
     /**
      * Modifie l'=C3=A9tat autoComplete de l'ui.
      *
@@ -220,7 +172,7 @@
     protected void setAutoComplete(Boolean oldValue, Boolean newValue) {
         oldValue =3D oldValue !=3D null && oldValue;
         newValue =3D newValue !=3D null && newValue;
-        if (oldValue =3D=3D newValue) {
+        if (oldValue.equals(newValue)) {
             return;
         }
         if (log.isDebugEnabled()) {
@@ -229,9 +181,9 @@
         if (!newValue) {
             JTextComponent editorComponent =3D (JTextComponent) ui.getCombob=
ox().getEditor().getEditorComponent();
             editorComponent.removeFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSL=
ISTENER);
-            undecorate(ui.getCombobox(), originalDocument);
+            BeanUIUtil.undecorate(ui.getCombobox(), originalDocument);
         } else {
-            decorate(ui.getCombobox(), convertor);
+            BeanUIUtil.decorate(ui.getCombobox(), convertor);
             JTextComponent editorComponent =3D (JTextComponent) ui.getCombob=
ox().getEditor().getEditorComponent();
             editorComponent.addFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLIST=
ENER);
         }
@@ -250,7 +202,7 @@
         if (log.isDebugEnabled()) {
             log.debug("check state : <" + oldValue + " to " + newValue + ">"=
);
         }
-        updateComboBox(newValue, ui.isReverseSort());
+        updateUI(newValue, ui.isReverseSort());
     }
=20
     /**
@@ -269,11 +221,11 @@
             log.debug("check state : <" + oldValue + " to " + newValue + ">"=
);
         }
=20
-        updateComboBox(ui.getIndex(), newValue);
+        updateUI(ui.getIndex(), newValue);
     }
=20
     @SuppressWarnings({"unchecked"})
-    protected void updateComboBox(int index, boolean reversesort) {
+    protected void updateUI(int index, boolean reversesort) {
=20
         // change decorator context
         decorator.setContextIndex(index);
@@ -301,10 +253,8 @@
                                 reversesort
             );
=20
-        } catch (Exception e) {
-            log.warn(e.getMessage(), e);
-            //System.out.println("newValue :: "+decorator+" : "+newValue);
-            //System.out.println("datas :: "+ui.getData());
+        } catch (Exception eee) {
+            log.warn(eee.getMessage(), eee);
         }
=20
         // reload the model
@@ -370,73 +320,6 @@
         return decorator;
     }
=20
-    /**
-     * Creation de l'ui pour modifier le d=C3=A9corateur.
-     *
-     * @param decorator le decorateur a utiliser
-     */
-    protected void preparePopup(MultiJXPathDecorator<?> decorator) {
-        String selectedTip =3D ui.getSelectedToolTipText();
-        if (selectedTip =3D=3D null) {
-            // use default selected tip text
-            selectedTip =3D BeanComboBox.DEFAULT_SELECTED_TOOLTIP;
-        }
-        String notSelectedTip =3D ui.getNotSelectedToolTipText();
-        if (notSelectedTip =3D=3D null) {
-            // use default selected tip text
-            notSelectedTip =3D BeanComboBox.DEFAULT_NOT_SELECTED_TOOLTIP;
-        }
-        JPopupMenu popup =3D ui.getPopup();
-
-        //Container container =3D ui.getIndexesContainer();
-        for (int i =3D 0, max =3D decorator.getNbContext(); i < max; i++) {
-            String property =3D ui.getI18nPrefix() + decorator.getProperty(i=
);
-            String propertyI18n =3D _(property);
-            JRadioButtonMenuItem button =3D new JRadioButtonMenuItem(propert=
yI18n);
-            button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PRO=
PERTY, ui.getIndexes());
-            button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, =
i);
-            popup.add(button);
-            if (selectedTip !=3D null) {
-                button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT=
_PROPERTY, _(selectedTip, propertyI18n));
-            }
-            if (notSelectedTip !=3D null) {
-                button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CL=
IENT_PROPERTY, _(notSelectedTip, propertyI18n));
-            }
-            button.setSelected(false);
-            ui.getIndexes().add(button);
-        }
-        String title =3D ui.getPopupTitleText();
-        if (title =3D=3D null) {
-            // use default popup title
-            title =3D BeanComboBox.DEFAULT_POPUP_LABEL;
-
-            Class<?> internalClass =3D decorator.getInternalClass();
-            String beanI18nKey;
-            if (internalClass =3D=3D null) {
-                beanI18nKey =3D n_("bean.unknown.type");
-            } else {
-                beanI18nKey =3D ui.getI18nPrefix() + Introspector.decapitali=
ze(internalClass.getSimpleName());
-            }
-            String beanI18n =3D _(beanI18nKey);
-            title =3D _(title, beanI18n);
-        } else {
-            title =3D _(title);
-        }
-
-
-        ui.getSortDown().putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIE=
NT_PROPERTY, _("bean.sort.down.tip"));
-        ui.getSortDown().putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_=
CLIENT_PROPERTY, _("bean.sort.down.toSelect.tip"));
-
-        ui.getSortUp().putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT=
_PROPERTY, _("bean.sort.up.tip"));
-        ui.getSortUp().putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CL=
IENT_PROPERTY, _("bean.sort.up.toSelect.tip"));
-
-        ui.getPopupLabel().setText(title);
-        ui.getPopup().setLabel(title);
-        ui.getPopup().invalidate();
-
-
-    }
-
     public Class<?> getTargetClass() {
         Method m =3D getMutator();
         return m =3D=3D null ? null : m.getParameterTypes()[0];
@@ -466,61 +349,6 @@
         return mutator;
     }
=20
-    /**
-     * Encapsule un {@link Decorator} dans un {@link ObjectToStringConverter=
}.
-     *
-     * @param decorator le decorateur a encapsuler.
-     * @return le converter encapsule dans un {@link ObjectToStringConverter}
-     */
-    public static ObjectToStringConverter newDecoratedObjectToStringConverte=
r(final Decorator<?> decorator) {
-
-        return new ObjectToStringConverter() {
-
-            @Override
-            public String getPreferredStringForItem(Object item) {
-                return item instanceof String ? (String) item : item =3D=3D =
null ? "" : decorator.toString(item);
-            }
-        };
-    }
-
-    /**
-     * Ajout l'auto-compl=C3=A9tion sur une liste d=C3=A9roulante, en utilis=
ant le
-     * converteur donn=C3=A9 pour afficher les donn=C3=A9es.
-     *
-     * @param combo     la combo =C3=A0 d=C3=A9corer
-     * @param convertor le converter utilis=C3=A9 pour afficher les donn=C3=
=A9es.
-     */
-    public static void decorate(JComboBox combo, ObjectToStringConverter con=
vertor) {
-
-        AutoCompleteDecorator.decorate(combo, convertor);
-    }
-
-    /**
-     * D=C3=A9sactive l'aut-compl=C3=A9tion sur une liste d=C3=A9roulante, e=
n y repositionnant
-     * le mod=C3=A8le du document d'=C3=A9dition d'avant auto-compl=C3=A9tio=
n.
-     *
-     * @param combo            la liste d=C3=A9roulante =C3=A0 d=C3=A9corer
-     * @param originalDocument le document original de l'=C3=A9dtieur de la
-     *                         liste d=C3=A9roulante.
-     */
-    public static void undecorate(JComboBox combo, Document originalDocument=
) {
-
-        // has not to be editable
-        combo.setEditable(false);
-
-        // configure the text component=3Deditor component
-        Component c =3D combo.getEditor().getEditorComponent();
-        JTextComponent editorComponent =3D (JTextComponent) c;
-        editorComponent.setDocument(originalDocument);
-        editorComponent.setText(null);
-        //remove old property change listener
-        for (PropertyChangeListener l : c.getPropertyChangeListeners("editor=
")) {
-            if (l instanceof AutoCompletePropertyChangeListener) {
-                c.removePropertyChangeListener("editor", l);
-            }
-        }
-    }
-
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
         String propertyName =3D evt.getPropertyName();

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nListHeader.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/BeanListH=
eader.jaxx	2010-09-07 10:44:52 UTC (rev 2070)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListH=
eader.jaxx	2010-09-07 10:45:13 UTC (rev 2071)
@@ -99,12 +99,6 @@
=20
   <script><![CDATA[
  =20
-public static final String DEFAULT_POPUP_LABEL =3D n_("bean.popup.label");
-
-public static final String DEFAULT_SELECTED_TOOLTIP =3D n_("bean.sort.on");
-
-public static final String DEFAULT_NOT_SELECTED_TOOLTIP =3D n_("bean.sort.of=
f");
-
 public void init(JXPathDecorator<O> decorator, java.util.List<O> data) {
     handler.init(decorator, data);
 }

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	2010-09-07 10:44:52 UTC (rev 2070)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListH=
eaderHandler.java	2010-09-07 10:45:13 UTC (rev 2071)
@@ -35,20 +35,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
=20
+import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JToggleButton;
-import javax.swing.SwingUtilities;
-import java.awt.Dimension;
-import java.beans.Introspector;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.Date;
 import java.util.List;
=20
-import static org.nuiton.i18n.I18n._;
-import static org.nuiton.i18n.I18n.n_;
-
 /**
  * Le handler d'un {@link BeanListHeader}.
  * <p/>
@@ -72,6 +64,19 @@
=20
     protected boolean init;
=20
+    private final BeanUIUtil.PopupHandler popupHandler =3D new BeanUIUtil.Po=
pupHandler() {
+
+        @Override
+        public JPopupMenu getPopup() {
+            return ui.getPopup();
+        }
+
+        @Override
+        public JComponent getInvoker() {
+            return ui.getChangeDecorator();
+        }
+    };
+
     public BeanListHeaderHandler(BeanListHeader<O> ui) {
         this.ui =3D ui;
     }
@@ -88,33 +93,24 @@
             throw new IllegalStateException("can not init the handler twice"=
);
         }
         init =3D true;
-        if (decorator =3D=3D null) {
-            throw new NullPointerException(
-                    "can not have a null decorator as parameter");
-        }
=20
         JAXXButtonGroup indexes =3D ui.getIndexes();
=20
-        MultiJXPathDecorator<O> d;
-        if (decorator instanceof MultiJXPathDecorator<?>) {
+        this.decorator =3D BeanUIUtil.createDecorator(decorator);
=20
-            // should clone decorator ?
-            d =3D (MultiJXPathDecorator<O>) decorator;
-        } else {
-            d =3D DecoratorUtils.newMultiJXPathDecorator(
-                    decorator.getInternalClass(),
-                    decorator.getInitialExpression(),
-                    "??" + new Date().getTime(),
-                    " - "
-            );
-        }
-        this.decorator =3D d;
-
         // init combobox renderer base on given decorator
-        ui.getList().setCellRenderer(new DecoratorListCellRenderer(d));
+        ui.getList().setCellRenderer(new DecoratorListCellRenderer(this.deco=
rator));
=20
         // build popup
-        preparePopup(d);
+        popupHandler.preparePopup(ui.getSelectedToolTipText(),
+                               ui.getNotSelectedToolTipText(),
+                               ui.getI18nPrefix(),
+                               ui.getPopupTitleText(),
+                               indexes,
+                               ui.getPopupLabel(),
+                               ui.getSortUp(),
+                               ui.getSortDown(),
+                               this.decorator);
=20
         ui.addPropertyChangeListener(this);
=20
@@ -127,42 +123,9 @@
=20
     /** Toggle the popup visible state. */
     public void togglePopup() {
-        boolean newValue =3D !ui.getPopup().isVisible();
-
-        if (log.isTraceEnabled()) {
-            log.trace(newValue);
-        }
-
-        if (!newValue) {
-            if (ui.getPopup() !=3D null) {
-                ui.getPopup().setVisible(false);
-            }
-            return;
-        }
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-
-                updatePopup();
-
-                Dimension dim =3D ui.getPopup().getPreferredSize();
-                JToggleButton invoker =3D ui.getChangeDecorator();
-                ui.getPopup().show(
-                        invoker,
-                        (int) (invoker.getPreferredSize().getWidth() - dim.g=
etWidth()),
-                        invoker.getHeight()
-                );
-            }
-        });
+        popupHandler.togglePopup();
     }
=20
-    protected void updatePopup() {
-        JPopupMenu popup =3D ui.getPopup();
-        popup.pack();
-
-    }
-
     /**
      * Modifie l'index du d=C3=A9corateur
      *
@@ -176,7 +139,7 @@
         if (log.isDebugEnabled()) {
             log.debug("check state : <" + oldValue + " to " + newValue + ">"=
);
         }
-        updateComboBox(newValue, ui.isReverseSort());
+        updateUI(newValue, ui.isReverseSort());
     }
=20
     /**
@@ -195,17 +158,20 @@
             log.debug("check state : <" + oldValue + " to " + newValue + ">"=
);
         }
=20
-        updateComboBox(ui.getIndex(), newValue);
+        updateUI(ui.getIndex(), newValue);
     }
=20
     @SuppressWarnings({"unchecked"})
-    protected void updateComboBox(int index, boolean reverseSort) {
+    protected void updateUI(int index, boolean reverseSort) {
=20
         // change decorator context
         decorator.setContextIndex(index);
=20
         String expression =3D decorator.getExpression();
-        log.info("will use expression (index =3D " + index + ") : " + expres=
sion);
+        if (log.isDebugEnabled()) {
+            log.debug("will use expression (index =3D " + index + ") : " +
+                      expression);
+        }
=20
         // get the current selection in list
         Object[] selection =3D ui.getList().getSelectedValues();
@@ -254,71 +220,6 @@
         return decorator;
     }
=20
-    /**
-     * Creation de l'ui pour modifier le d=C3=A9corateur.
-     *
-     * @param decorator le decorateur a utiliser
-     */
-    protected void preparePopup(MultiJXPathDecorator<?> decorator) {
-        String selectedTip =3D ui.getSelectedToolTipText();
-        if (selectedTip =3D=3D null) {
-            // use default selected tip text
-            selectedTip =3D BeanListHeader.DEFAULT_SELECTED_TOOLTIP;
-        }
-        String notSelectedTip =3D ui.getNotSelectedToolTipText();
-        if (notSelectedTip =3D=3D null) {
-            // use default selected tip text
-            notSelectedTip =3D BeanListHeader.DEFAULT_NOT_SELECTED_TOOLTIP;
-        }
-        JPopupMenu popup =3D ui.getPopup();
-
-        //Container container =3D ui.getIndexesContainer();
-        for (int i =3D 0, max =3D decorator.getNbContext(); i < max; i++) {
-            String property =3D ui.getI18nPrefix() + decorator.getProperty(i=
);
-            String propertyI18n =3D _(property);
-            JRadioButtonMenuItem button =3D new JRadioButtonMenuItem(propert=
yI18n);
-            button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PRO=
PERTY, ui.getIndexes());
-            button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, =
i);
-            popup.add(button);
-            if (selectedTip !=3D null) {
-                button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT=
_PROPERTY, _(selectedTip, propertyI18n));
-            }
-            if (notSelectedTip !=3D null) {
-                button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CL=
IENT_PROPERTY, _(notSelectedTip, propertyI18n));
-            }
-            button.setSelected(false);
-            ui.getIndexes().add(button);
-        }
-        String title =3D ui.getPopupTitleText();
-        if (title =3D=3D null) {
-            // use default popup title
-            title =3D BeanListHeader.DEFAULT_POPUP_LABEL;
-
-            Class<O> internalClass =3D ui.getBeanType();
-            String beanI18nKey;
-            if (internalClass =3D=3D null) {
-                beanI18nKey =3D n_("bean.unknown.type");
-            } else {
-                beanI18nKey =3D ui.getI18nPrefix() +
-                              Introspector.decapitalize(internalClass.getSim=
pleName());
-            }
-            String beanI18n =3D _(beanI18nKey);
-            title =3D _(title, beanI18n);
-        } else {
-            title =3D _(title);
-        }
-
-        ui.getSortDown().putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIE=
NT_PROPERTY, _("bean.sort.down.tip"));
-        ui.getSortDown().putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_=
CLIENT_PROPERTY, _("bean.sort.down.toSelect.tip"));
-
-        ui.getSortUp().putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT=
_PROPERTY, _("bean.sort.up.tip"));
-        ui.getSortUp().putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CL=
IENT_PROPERTY, _("bean.sort.up.toSelect.tip"));
-
-        ui.getPopupLabel().setText(title);
-        ui.getPopup().setLabel(title);
-        ui.getPopup().invalidate();
-    }
-
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
         String propertyName =3D evt.getPropertyName();

Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUI=
Util.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/BeanUIUti=
l.java	                        (rev 0)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUti=
l.java	2010-09-07 10:45:13 UTC (rev 2071)
@@ -0,0 +1,266 @@
+/*
+ * #%L
+ * JAXX :: Widgets
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2010 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%
+ */
+package jaxx.runtime.swing.editor.bean;
+
+import jaxx.runtime.decorator.Decorator;
+import jaxx.runtime.decorator.DecoratorUtils;
+import jaxx.runtime.decorator.JXPathDecorator;
+import jaxx.runtime.decorator.MultiJXPathDecorator;
+import jaxx.runtime.swing.JAXXButtonGroup;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+import org.jdesktop.swingx.autocomplete.AutoCompletePropertyChangeListener;
+import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.SwingUtilities;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.beans.Introspector;
+import java.beans.PropertyChangeListener;
+import java.util.Date;
+
+import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ * Class with usefull methods used in bean uis.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 2.2
+ */
+public class BeanUIUtil {
+
+    public static final String DEFAULT_POPUP_LABEL =3D n_("bean.popup.label"=
);
+
+    public static final String DEFAULT_SELECTED_TOOLTIP =3D n_("bean.sort.on=
");
+
+    public static final String DEFAULT_NOT_SELECTED_TOOLTIP =3D n_("bean.sor=
t.off");
+
+    /**
+     * Encapsule un {@link Decorator} dans un {@link ObjectToStringConverter=
}.
+     *
+     * @param decorator le decorateur a encapsuler.
+     * @return le converter encapsule dans un {@link ObjectToStringConverter}
+     */
+    public static ObjectToStringConverter newDecoratedObjectToStringConverte=
r(final Decorator<?> decorator) {
+
+        return new ObjectToStringConverter() {
+
+            @Override
+            public String getPreferredStringForItem(Object item) {
+                return item instanceof String ? (String) item : item =3D=3D =
null ? "" : decorator.toString(item);
+            }
+        };
+    }
+
+    /**
+     * Ajout l'auto-compl=C3=A9tion sur une liste d=C3=A9roulante, en utilis=
ant le
+     * converteur donn=C3=A9 pour afficher les donn=C3=A9es.
+     *
+     * @param combo     la combo =C3=A0 d=C3=A9corer
+     * @param convertor le converter utilis=C3=A9 pour afficher les donn=C3=
=A9es.
+     */
+    public static void decorate(JComboBox combo, ObjectToStringConverter con=
vertor) {
+
+        AutoCompleteDecorator.decorate(combo, convertor);
+    }
+
+    /**
+     * D=C3=A9sactive l'aut-compl=C3=A9tion sur une liste d=C3=A9roulante, e=
n y repositionnant
+     * le mod=C3=A8le du document d'=C3=A9dition d'avant auto-compl=C3=A9tio=
n.
+     *
+     * @param combo            la liste d=C3=A9roulante =C3=A0 d=C3=A9corer
+     * @param originalDocument le document original de l'=C3=A9dtieur de la
+     *                         liste d=C3=A9roulante.
+     */
+    public static void undecorate(JComboBox combo, Document originalDocument=
) {
+
+        // has not to be editable
+        combo.setEditable(false);
+
+        // configure the text component=3Deditor component
+        Component c =3D combo.getEditor().getEditorComponent();
+        JTextComponent editorComponent =3D (JTextComponent) c;
+        editorComponent.setDocument(originalDocument);
+        editorComponent.setText(null);
+        //remove old property change listener
+        for (PropertyChangeListener l : c.getPropertyChangeListeners("editor=
")) {
+            if (l instanceof AutoCompletePropertyChangeListener) {
+                c.removePropertyChangeListener("editor", l);
+            }
+        }
+    }
+
+    public static <O> MultiJXPathDecorator<O> createDecorator(JXPathDecorato=
r<O> decorator) {
+        if (decorator =3D=3D null) {
+            throw new NullPointerException(
+                    "can not have a null decorator as parameter");
+        }
+        String separator;
+        String separatorReplacement;
+
+        if (decorator instanceof MultiJXPathDecorator<?>) {
+
+            separator =3D ((MultiJXPathDecorator<?>) decorator).getSeparator=
();
+            separatorReplacement =3D ((MultiJXPathDecorator<?>) decorator).g=
etSeparatorReplacement();
+
+        } else {
+
+            separator =3D "??" + new Date().getTime();
+            separatorReplacement =3D " - ";
+        }
+
+        return DecoratorUtils.newMultiJXPathDecorator(
+                decorator.getInternalClass(),
+                decorator.getInitialExpression(),
+                separator,
+                separatorReplacement
+        );
+    }
+
+    public static abstract class PopupHandler implements Runnable {
+
+        public static final Log log =3D LogFactory.getLog(PopupHandler.class=
);
+
+        public abstract JPopupMenu getPopup();
+
+        public abstract JComponent getInvoker();
+
+        @Override
+        public void run() {
+
+            updatePopup();
+
+            Dimension dim =3D getPopup().getPreferredSize();
+
+            JComponent invoker =3D getInvoker();
+            getPopup().show(
+                    invoker,
+                    (int) (invoker.getPreferredSize().getWidth() - dim.getWi=
dth()),
+                    invoker.getHeight()
+            );
+        }
+
+        /** Toggle the popup visible state. */
+        public void togglePopup() {
+            boolean newValue =3D !getPopup().isVisible();
+
+            if (log.isTraceEnabled()) {
+                log.trace(newValue);
+            }
+
+            if (!newValue) {
+                if (getPopup() !=3D null) {
+                    getPopup().setVisible(false);
+                }
+                return;
+            }
+            SwingUtilities.invokeLater(this);
+        }
+
+        protected void updatePopup() {
+            getPopup().pack();
+        }
+
+        /**
+         * Creation de l'ui pour modifier le d=C3=A9corateur.
+         *
+         * @param decorator le decorateur a utiliser
+         */
+        protected void preparePopup(String selectedTip,
+                                    String notSelectedTip,
+                                    String i18nPrefix,
+                                    String title,
+                                    ButtonGroup indexes,
+                                    JLabel popupLabel,
+                                    AbstractButton sortUp,
+                                    AbstractButton sortDown,
+                                    MultiJXPathDecorator<?> decorator) {
+            if (selectedTip =3D=3D null) {
+                // use default selected tip text
+                selectedTip =3D DEFAULT_SELECTED_TOOLTIP;
+            }
+            if (notSelectedTip =3D=3D null) {
+                // use default selected tip text
+                notSelectedTip =3D DEFAULT_NOT_SELECTED_TOOLTIP;
+            }
+            JPopupMenu popup =3D getPopup();
+
+            //Container container =3D ui.getIndexesContainer();
+            for (int i =3D 0, max =3D decorator.getNbContext(); i < max; i++=
) {
+                String property =3D i18nPrefix + decorator.getProperty(i);
+                String propertyI18n =3D _(property);
+                JRadioButtonMenuItem button =3D new JRadioButtonMenuItem(pro=
pertyI18n);
+                button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT=
_PROPERTY, indexes);
+                button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPER=
TY, i);
+                popup.add(button);
+                if (selectedTip !=3D null) {
+                    button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CL=
IENT_PROPERTY, _(selectedTip, propertyI18n));
+                }
+                if (notSelectedTip !=3D null) {
+                    button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TI=
P_CLIENT_PROPERTY, _(notSelectedTip, propertyI18n));
+                }
+                button.setSelected(false);
+                indexes.add(button);
+            }
+            if (title =3D=3D null) {
+                // use default popup title
+                title =3D DEFAULT_POPUP_LABEL;
+
+                Class<?> internalClass =3D decorator.getInternalClass();
+                String beanI18nKey;
+                if (internalClass =3D=3D null) {
+                    beanI18nKey =3D n_("bean.unknown.type");
+                } else {
+                    beanI18nKey =3D i18nPrefix + Introspector.decapitalize(i=
nternalClass.getSimpleName());
+                }
+                String beanI18n =3D _(beanI18nKey);
+                title =3D _(title, beanI18n);
+            } else {
+                title =3D _(title);
+            }
+
+            sortDown.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_P=
ROPERTY, _("bean.sort.down.tip"));
+            sortDown.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIE=
NT_PROPERTY, _("bean.sort.down.toSelect.tip"));
+
+            sortUp.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PRO=
PERTY, _("bean.sort.up.tip"));
+            sortUp.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT=
_PROPERTY, _("bean.sort.up.toSelect.tip"));
+
+            popupLabel.setText(title);
+            getPopup().setLabel(title);
+            getPopup().invalidate();
+        }
+    }
+}

Added: trunk/jaxx-widgets/src/main/resources/icons/action-combobox-reset.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-combo=
box-reset.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jaxx-widgets/src/main/resources/icons/action-combobox-sort.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-combo=
box-sort.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


--===============3531423488906627920==--