Author: fdesbois Date: 2012-07-17 16:37:53 +0200 (Tue, 17 Jul 2012) New Revision: 2406 Url: http://nuiton.org/repositories/revision/jaxx/2406 Log: fixes #2195: Null management with NumberCellEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 13:47:19 UTC (rev 2405) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 14:37:53 UTC (rev 2406) @@ -63,10 +63,16 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - // FIXME sletellier 20120105 : we dont need to set modelText - E bd = (E) value; - numberEditor.setModel(bd); - numberEditor.setModelText(String.valueOf(bd)); + // Reset previous text (otherwise the previous value could be keeped) + numberEditor.setModelText(""); + + E number = (E) value; + numberEditor.setModel(number); + + // Check nullity and set the text that will be selected with the current value + if (number != null) { + numberEditor.setModelText(String.valueOf(number)); + } return numberEditor; }