Author: tchemit Date: 2012-12-17 08:39:44 +0100 (Mon, 17 Dec 2012) New Revision: 81 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/81 Log: add null value in comboeditor in tables + can quit frequency dialog via espace stroke Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java 2012-12-17 07:36:36 UTC (rev 80) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java 2012-12-17 07:39:44 UTC (rev 81) @@ -32,6 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.JButton; import javax.swing.JTable; @@ -41,6 +42,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Frame; +import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -143,8 +145,17 @@ ui.editBatch(editRow); // open frequency dialog - TuttiUIUtil.openInDialog(ui, frame, _("tutti.title.frequency"), true, null); + TuttiUIUtil.openInDialog( + ui, frame, _("tutti.title.frequency"), true, + new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().close(); + } + }); + // at close, synch back frequencies editRow.updateTotalFromFrequencies(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2012-12-17 07:36:36 UTC (rev 80) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) @@ -280,6 +280,11 @@ List<B> data) { JComboBox comboBox = new JComboBox(); comboBox.setRenderer(newListCellRender(decorator)); + + // add a null value at first position + if (!data.isEmpty() && data.get(0) != null) { + data.add(0, null); + } SwingUtil.fillComboBox(comboBox, data, null); ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator);