Author: echatellier Date: 2011-11-22 15:46:53 +0100 (Tue, 22 Nov 2011) New Revision: 3538 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3538 Log: Fix binding Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:46:53 UTC (rev 3538) @@ -37,21 +37,19 @@ <JLabel text="isisfish.result.choose.simulation"/> </cell> <cell fill="horizontal" weightx="1"> - <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox"/> + <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox" + onActionPerformed="openButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);removeButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);logButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);"/> </cell> <cell> - <JButton text="isisfish.result.new.window" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="openButton" text="isisfish.result.new.window" onActionPerformed="getHandler().openNewSimulation(this)"/> </cell> <cell> - <JButton text="isisfish.result.remove.simulation" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="removeButton" text="isisfish.result.remove.simulation" onActionPerformed="getHandler().deleteSimulation(this)"/> </cell> <cell> - <JButton text="isisfish.result.show.simulation.log" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="logButton" text="isisfish.result.show.simulation.log" onActionPerformed="getHandler().showLog(this)"/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:00:17 UTC (rev 3537) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:46:53 UTC (rev 3538) @@ -33,6 +33,7 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -70,13 +71,11 @@ protected FilterComboBoxModel filterModel; protected List<ActionListener> actionListeners; - protected List<ItemListener> itemListeners; protected boolean filtering = false; public FilterableComboBox() { actionListeners = new ArrayList<ActionListener>(); - itemListeners = new ArrayList<ItemListener>(); buildLayout(); } @@ -178,20 +177,6 @@ } } } - - class ComboBoxItemListener implements ItemListener { - /* - * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) - */ - @Override - public void itemStateChanged(ItemEvent e) { - if (!filtering) { - for (ItemListener i : itemListeners) { - i.itemStateChanged(e); - } - } - } - } /** * Build layout. @@ -199,7 +184,6 @@ private void buildLayout() { dataBox = new JXComboBox(); dataBox.addActionListener(new ComboBoxActionListener()); - dataBox.addItemListener(new ComboBoxItemListener()); filterField = new JXTextField(_("isisfish.common.filter")); // fix size filterField.setPreferredSize(new Dimension(200, 0)); @@ -242,12 +226,4 @@ public boolean removeActionListener(ActionListener o) { return actionListeners.remove(o); } - - public boolean addItemListener(ItemListener e) { - return itemListeners.add(e); - } - - public boolean removeItemListener(ItemListener o) { - return itemListeners.remove(o); - } } \ No newline at end of file