[Tutti-commits] 02/02: fix merge

31 Mar 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/8146 in repository tutti.

See https://gitlab.nuiton.org/codelutin/tutti.git

commit c03c4926ca8ef98a516617cc6d7d4a26d9d2c523
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Mar 31 13:55:14 2016 +0200

    fix merge
---
 .../catches/species/frequency/SpeciesFrequencyUIHandler.java  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
index 69a5333..6340b03 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
@@ -43,17 +43,13 @@ import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.persistence.entities.referential.TaxonCache;
 import fr.ifremer.tutti.persistence.entities.referential.TaxonCaches;
 import fr.ifremer.tutti.service.DecoratorService;
+import fr.ifremer.tutti.service.sampling.SamplingCodePrefix;
 import fr.ifremer.tutti.type.WeightUnit;
 import fr.ifremer.tutti.ui.swing.TuttiUIContext;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.SamplingCodeCellEditor;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.SamplingCodeCellRenderer;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.SamplingCodeCellEditor;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeciesBatchPanelUI;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeciesBatchPanelUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchRowModel;
@@ -99,6 +95,7 @@ import org.nuiton.decorator.Decorator;
 import org.nuiton.jaxx.application.ApplicationBusinessException;
 import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler;
 
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -1864,7 +1861,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci
                     Float weight = obsRow.getWeight();
                     if (CopyIndividualObservationMode.ALL == copyMode && weight != null) {
                         // conversion de poids
-                        weight = weightUnit.convertWeight(weight, individualObservationWeightUnit);
+                        weight = Weights.convert(individualObservationWeightUnit, weightUnit, weight);
                         row.addToWeight(weight);
                     }
                 }
@@ -1898,7 +1895,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci
         super.beforeOpenPopup(modelRowIndex, modelColumnIndex);
 
         boolean sampleCodeMenusEnabled = modelRowIndex >= 1 && ui.getObsTable().getSelectedRowCount() == 1
-                                            && getObsTableModel().getRows().get(ui.getObsTable().getSelectedRow()).withSamplingCodeId();
+                                            && getObsTableModel().getRows().get(ui.getObsTable().getSelectedRow()).withSamplingCode();
         ui.getEditSampleCodeMenu().setEnabled(sampleCodeMenusEnabled);
         ui.getDeleteSampleCodeMenu().setEnabled(sampleCodeMenusEnabled);
     }

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 02/02: fix merge

codelutin.com scm