Author: tchemit Date: 2013-10-14 19:42:10 +0200 (Mon, 14 Oct 2013) New Revision: 1297 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1297 Log: refs #3098: Une erreur s'est produite: Column index out of range refs #3502: Row index out of range Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-10-14 17:36:22 UTC (rev 1296) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-10-14 17:42:10 UTC (rev 1297) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; -import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; @@ -264,7 +264,7 @@ stopCellEditing(); // reselect this cell - AbstractSelectTableAction.doSelectCell(table, r, c); + TuttiUIUtil.doSelectCell(table, r, c); table.requestFocus(); } else { @@ -284,7 +284,7 @@ editRow = tableModel.getEntry(rowIndex); // will save the previous row in the species row - AbstractSelectTableAction.doSelectCell(table, rowIndex, c); + TuttiUIUtil.doSelectCell(table, rowIndex, c); // start edit startEdit(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-10-14 17:36:22 UTC (rev 1296) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-10-14 17:42:10 UTC (rev 1297) @@ -41,7 +41,6 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -447,7 +446,7 @@ model.setRows(rows); // select first cell in table (see http://forge.codelutin.com/issues/2496) - AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 1); + TuttiUIUtil.doSelectCell(getUI().getTable(), 0, 1); } public void applyRafaleStep(Float step) { @@ -692,7 +691,7 @@ message); // focus to first error row - AbstractSelectTableAction.doSelectCell(getTable(), index, 0); + TuttiUIUtil.selectFirstCellOnRow(getTable(), index); return; } @@ -733,7 +732,7 @@ message); // focus to first error row - AbstractSelectTableAction.doSelectCell(getTable(), index, 0); + TuttiUIUtil.selectFirstCellOnRow(getTable(), index); return; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-10-14 17:36:22 UTC (rev 1296) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-10-14 17:42:10 UTC (rev 1297) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; -import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; @@ -264,7 +264,7 @@ stopCellEditing(); // reselect this cell - AbstractSelectTableAction.doSelectCell(table, r, c); + TuttiUIUtil.doSelectCell(table, r, c); table.requestFocus(); } else { @@ -284,7 +284,7 @@ editRow = tableModel.getEntry(rowIndex); // will save the previous row in the species row - AbstractSelectTableAction.doSelectCell(table, rowIndex, c); + TuttiUIUtil.doSelectCell(table, rowIndex, c); // start edit startEdit(); 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-10-14 17:36:22 UTC (rev 1296) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-10-14 17:42:10 UTC (rev 1297) @@ -42,7 +42,6 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -444,7 +443,7 @@ model.setRows(rows); // select first cell in table (see http://forge.codelutin.com/issues/2496) - AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 1); + TuttiUIUtil.doSelectCell(getUI().getTable(), 0, 1); } public void applyRafaleStep(Float step) { @@ -690,7 +689,7 @@ message); // focus to first error row - AbstractSelectTableAction.doSelectCell(getTable(), index, 0); + TuttiUIUtil.selectFirstCellOnRow(getTable(), index); return; } @@ -731,7 +730,7 @@ message); // focus to first error row - AbstractSelectTableAction.doSelectCell(getTable(), index, 0); + TuttiUIUtil.selectFirstCellOnRow(getTable(), index); return; }