Author: sletellier Date: 2012-07-06 13:31:51 +0200 (Fri, 06 Jul 2012) New Revision: 2390 Url: http://nuiton.org/repositories/revision/jaxx/2390 Log: refs #2173 : fireStopEditing on actionPerformed Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-06 11:20:36 UTC (rev 2389) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-06 11:31:51 UTC (rev 2390) @@ -128,20 +128,6 @@ return selectedValues.get(0); } - protected void fireContentsChanged(Object source, int index0, int index1) { - Object[] listeners = getListModel().getListDataListeners(); - ListDataEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == ListDataListener.class) { - if (e == null) { - e = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED, index0, index1); - } - ((ListDataListener)listeners[i+1]).contentsChanged(e); - } - } - } - @Override public int getSize() { return getListModel().size(); @@ -162,4 +148,17 @@ getListModel().removeListDataListener(l); } + protected void fireContentsChanged(Object source, int index0, int index1) { + Object[] listeners = getListModel().getListDataListeners(); + ListDataEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == ListDataListener.class) { + if (e == null) { + e = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED, index0, index1); + } + ((ListDataListener)listeners[i+1]).contentsChanged(e); + } + } + } } \ No newline at end of file Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java 2012-07-06 11:20:36 UTC (rev 2389) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java 2012-07-06 11:31:51 UTC (rev 2390) @@ -71,6 +71,7 @@ KeyStroke oldValue = getKeyStroke(); this.keyStroke = keyStroke; firePropertyChange("keyStroke", oldValue, keyStroke); + fireActionPerformed(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 2012-07-06 11:20:36 UTC (rev 2389) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 2012-07-06 11:31:51 UTC (rev 2390) @@ -24,6 +24,8 @@ package jaxx.runtime.swing.editor.cell; import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.KeyStroke; @@ -40,6 +42,13 @@ public KeyStrokeCellEditor() { keyStrokeEditor = new KeyStrokeEditor(); + keyStrokeEditor.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + fireEditingStopped(); + } + }); } @Override