Author: kmorin Date: 2013-02-05 21:06:05 +0100 (Tue, 05 Feb 2013) New Revision: 340 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/340 Log: debug frequency edition Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.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/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-02-05 18:41:42 UTC (rev 339) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-02-05 20:06:05 UTC (rev 340) @@ -33,13 +33,6 @@ showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; } -#splitPane { - orientation: {JSplitPane.VERTICAL_SPLIT}; - resizeWeight: 0.2; - oneTouchExpandable: true; - continuousLayout: true; -} - #stepLabel { text: "tutti.label.frequencyConfiguration.step"; labelFor: {stepField}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-05 18:41:42 UTC (rev 339) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-05 20:06:05 UTC (rev 340) @@ -58,6 +58,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import javax.swing.JTextField; /** * @author tchemit <chemit@codelutin.com> @@ -122,12 +123,6 @@ Object newValue) { recomputeRowValidState(row); - - if (SpeciesFrequencyRowModel.PROPERTY_NUMBER.equals(propertyName)) { - - // Need to recompute the computedWeight - computeComputedWeight(row); - } } @Override @@ -215,6 +210,10 @@ Float step = (Float) ui.getRafaleStepField().getModel(); applyRafaleStep(step); + + //select text + JTextField field = (JTextField) e.getSource(); + field.selectAll(); } } }); @@ -366,6 +365,7 @@ row = tableModel.createNewRow(); row.setLengthStep(aroundLengthStep); row.setNumber(1); + row.setValid(true); // get new index List<Float> steps = Lists.newArrayList(rowsByStep.keySet()); @@ -500,11 +500,4 @@ //-- Internal methods --// //------------------------------------------------------------------------// - protected void computeComputedWeight(SpeciesFrequencyRowModel row) { - - if (log.isInfoEnabled()) { - log.info("Will recompute computed weight for frequency: " + row); - } - } - } \ No newline at end of file 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 2013-02-05 18:41:42 UTC (rev 339) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 20:06:05 UTC (rev 340) @@ -533,14 +533,14 @@ } protected void installTableKeyListener(TableColumnModel columnModel, - JTable table) { + final JTable table) { Preconditions.checkState( keyAdapter == null, "There is already a tableSelectionListener registred, " + "remove it before invoking this method."); - AbstractTuttiTableModel<R> model = getTableModel(); + final AbstractTuttiTableModel<R> model = getTableModel(); final MoveToNextEditableCellAction nextCellAction = MoveToNextEditableCellAction.newAction(model, table); final MoveToPreviousEditableCellAction previousCellAction = @@ -555,22 +555,35 @@ @Override public void keyPressed(KeyEvent e) { - + TableCellEditor editor = table.getCellEditor(); + int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_LEFT || (keyCode == KeyEvent.VK_TAB && e.isShiftDown())) { e.consume(); + if (editor != null) { + editor.stopCellEditing(); + } previousCellAction.actionPerformed(null); } else if (//e.getKeyCode() == KeyEvent.VK_ENTER || keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_TAB) { e.consume(); + if (editor != null) { + editor.stopCellEditing(); + } nextCellAction.actionPerformed(null); } else if (keyCode == KeyEvent.VK_UP) { e.consume(); + if (editor != null) { + editor.stopCellEditing(); + } previousRowAction.actionPerformed(null); } else if (keyCode == KeyEvent.VK_DOWN) { e.consume(); + if (editor != null) { + editor.stopCellEditing(); + } nextRowAction.actionPerformed(null); } }