Author: kmorin Date: 2013-05-30 16:23:43 +0200 (Thu, 30 May 2013) New Revision: 1046 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1046 Log: fixes #2533 [CAPTURE] - Capture accidentelle / autres caract?\195?\169ristiques : impossible de sauvegarder si une ligne n'a pas de valeur Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-30 13:57:07 UTC (rev 1045) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-30 14:23:43 UTC (rev 1046) @@ -205,15 +205,12 @@ } public void validateEdition(CaracteristicMapEditorUIModel caracteristicMapEditorModel) { - if (caracteristicMapEditorModel.isValid()) { + CaracteristicMap map = caracteristicMapEditorModel.getCaracteristicMap(); + component.setText(map); + component.setToolTipText(map); + editRow.setCaracteristics(map); + caracteristicsUsed.addAll(map.keySet()); - CaracteristicMap map = caracteristicMapEditorModel.getCaracteristicMap(); - component.setText(map); - component.setToolTipText(map); - editRow.setCaracteristics(map); - caracteristicsUsed.addAll(map.keySet()); - } - int r = rowIndex; int c = columnIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-05-30 13:57:07 UTC (rev 1045) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-05-30 14:23:43 UTC (rev 1046) @@ -62,6 +62,5 @@ text: "tutti.editIndividualObservationCaracteristics.action.save"; toolTipText: "tutti.editIndividualObservationCaracteristics.action.save.tip"; i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.save.mnemonic"; - enabled: {model.isValid()}; _help: {"tutti.editIndividualObservationCaracteristics.action.save.help"}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-30 13:57:07 UTC (rev 1045) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-30 14:23:43 UTC (rev 1046) @@ -172,9 +172,6 @@ log.debug("closing: " + ui); } - // when canceling always invalid model (in that way) - getModel().setValid(false); - caracteristicMapCellEditor.closeEditor(); }