Author: kmorin Date: 2013-05-30 14:50:05 +0200 (Thu, 30 May 2013) New Revision: 1038 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1038 Log: fixes #2498 [MENSURATION] perte de la saisie bis 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/BenthosFrequencyTableModel.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/SpeciesFrequencyTableModel.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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -177,7 +177,10 @@ // transfer rows to editor for (BenthosFrequencyRowModel row : frequencyModel.getRows()) { - if (row.isValid()) { + // the row is valid even if there is no data (just for the highlighter) + // but we save it only if there is data + if (row.isValid() + && !(row.getNumber() == null && row.getWeight() == null)) { // can keep this row frequency.add(row); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -105,7 +105,6 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); - result.setValid(false); return result; } 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -113,8 +113,9 @@ protected boolean isRowValid(BenthosFrequencyRowModel row) { return row.getLengthStepCaracteristic() != null && row.getLengthStep() != null && - row.getNumber() != null && row.getNumber() > 0 && - (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0); + ((row.getNumber() == null && row.getWeight() == null) || + (row.getNumber() != null && row.getNumber() > 0 && + (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0))); } @Override 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -177,7 +177,10 @@ // transfer rows to editor for (SpeciesFrequencyRowModel row : frequencyModel.getRows()) { - if (row.isValid()) { + // the row is valid even if there is no data (just for the highlighter) + // but we save it only if there is data + if (row.isValid() + && !(row.getNumber() == null && row.getWeight() == null)) { // can keep this row frequency.add(row); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -105,7 +105,6 @@ }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); - result.setValid(false); return result; } 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-05-30 12:39:31 UTC (rev 1037) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-30 12:50:05 UTC (rev 1038) @@ -114,8 +114,9 @@ protected boolean isRowValid(SpeciesFrequencyRowModel row) { return row.getLengthStepCaracteristic() != null && row.getLengthStep() != null && - row.getNumber() != null && row.getNumber() > 0 && - (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0); + ((row.getNumber() == null && row.getWeight() == null) || + (row.getNumber() != null && row.getNumber() > 0 && + (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0))); } @Override