Author: kmorin Date: 2013-07-04 17:37:34 +0200 (Thu, 04 Jul 2013) New Revision: 1115 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1115 Log: fixes #2856 [CAPTURE] erreur ?\195?\160 la saisie d'un poids sous ?\195?\169chantillon : ?\195?\160 analiser fixes #2861 [ERREUR] j'ai remplac?\195?\169 la valeur 20 par 18 dans un lot vrac et l?\195?\160 erreur Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java 2013-07-03 14:26:04 UTC (rev 1114) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java 2013-07-04 15:37:34 UTC (rev 1115) @@ -67,12 +67,11 @@ int rowCount = getRowCount(); - // I commented the part of the code to skip the not editable cells (ref #2704) -// while (currentRow <= rowCount || currentColumn <= columnCount) { if (currentRow <= rowCount || currentColumn <= columnCount) { // go to next cell currentColumn++; + boolean canSelect = true; // select next cell if (currentColumn >= columnCount) { @@ -87,25 +86,17 @@ // create a new row in model addNewRow(); -// } else { -// -// // can not create new row, so do nothing -// break; + } else { + + // can not create new row, so do nothing + canSelect = false; } } } -// if (isCellEditable(currentRow, currentColumn)) { - + if (canSelect) { doSelectCell(currentRow, currentColumn); - -// break; -// } else { -// if (log.isDebugEnabled()) { -// log.debug("Cell not editable at " + -// getCellCoordinate(currentRow, currentColumn)); -// } -// } + } } } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-07-03 14:26:04 UTC (rev 1114) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-07-04 15:37:34 UTC (rev 1115) @@ -69,7 +69,7 @@ if (currentRow < rowCount) { // go to next cell currentRow++; -// boolean canSelect = true; + boolean canSelect = true; // select next cell if (currentRow >= rowCount) { @@ -81,23 +81,15 @@ // create a new row in model addNewRow(); -// } else { -// canSelect = false; + + } else { + canSelect = false; } -// } else { -// canSelect = isCellEditable(currentRow, currentColumn); } -// if (canSelect) { + if (canSelect) { doSelectCell(currentRow, currentColumn); - -// break; -// } else { -// if (log.isDebugEnabled()) { -// log.debug("Cell not editable at " + -// getCellCoordinate(currentRow, currentColumn)); -// } -// } + } } } }