Author: tchemit Date: 2013-11-26 19:26:35 +0100 (Tue, 26 Nov 2013) New Revision: 1402 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1402 Log: fixes #3883: [DONNEES INDIVIDUELLES] Pas de recopie du poids si un seul d?\195?\169nombrement. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-11-26 17:40:40 UTC (rev 1401) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-11-26 18:26:35 UTC (rev 1402) @@ -24,6 +24,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -35,7 +37,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -56,7 +57,6 @@ import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.table.CaracteristicColumnIdentifier; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -599,6 +599,8 @@ } else { + boolean withOneFrequency = frequencies.size() == 1; + for (SpeciesFrequencyRowModel frequency : frequencies) { // create a row for each frequency @@ -611,12 +613,27 @@ // apply also weight found weight = frequency.getWeight(); + if (weight == null) { + + if (withOneFrequency) { + + // special case : only one frequency + // with one value, can use the batch weight + + weight = TuttiEntities.getValueOrComputedValue( + leaf.getWeight(), + leaf.getFinestCategory().getCategoryWeight()); + } + } + if (weight != null) { // convert weight units weight = speciesWeightUnit.toEntity(weight); weight = weightUnit.fromEntity(weight); } + + } for (int i = 0; i < nbRow; i++) {