Author: tchemit Date: 2011-05-12 23:30:14 +0200 (Thu, 12 May 2011) New Revision: 2275 Url: http://nuiton.org/repositories/revision/jaxx/2275 Log: improve beanList and combobox managment of selected value Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2011-05-04 16:07:30 UTC (rev 2274) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2011-05-12 21:30:14 UTC (rev 2275) @@ -277,7 +277,7 @@ * @param oldValue l'ancienne valeur * @param newValue la nouvelle valeur */ - protected void setSelectedItem(Object oldValue, Object newValue) { + protected void setSelectedItem(O oldValue, O newValue) { if (ui.getBean() == null) { return; } @@ -354,7 +354,7 @@ String propertyName = evt.getPropertyName(); if (BeanComboBox.PROPERTY_SELECTED_ITEM.equals(propertyName)) { - setSelectedItem(evt.getOldValue(), evt.getNewValue()); + setSelectedItem((O)evt.getOldValue(), (O)evt.getNewValue()); return; } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2011-05-04 16:07:30 UTC (rev 2274) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2011-05-12 21:30:14 UTC (rev 2275) @@ -103,6 +103,10 @@ handler.init(decorator, data); } +public O getSelectedValue() { + return handler.getSelectedValue(); +} + ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2011-05-04 16:07:30 UTC (rev 2274) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2011-05-12 21:30:14 UTC (rev 2275) @@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; +import javax.swing.JList; import javax.swing.JPopupMenu; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -265,4 +266,9 @@ ui.applyDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); } } + + public O getSelectedValue() { + JList list = ui.getList(); + return list==null?null: (O) list.getSelectedValue(); + } }