From scm@users.codelutin.com Tue Jan  6 12:01:46 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] branch develop updated (bd797e8 -> 8e7c2bf)
Date: Tue, 06 Jan 2015 12:01:45 +0000
Message-ID: <20150106120145.4113.6695@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4033334684255138236=="

--===============4033334684255138236==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

New change to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

      from  bd797e8   optimize imports
       new  8e7c2bf   optimize imports

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 8e7c2bf263be924782b51efab36cbb8f55cf85bd
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Jan 6 13:01:42 2015 +0100

    optimize imports

Summary of changes:
 .../tutti/service/AbstractTuttiService.java        |  2 +-
 .../fr/ifremer/tutti/service/DecoratorService.java |  5 ++--
 .../ifremer/tutti/service/PdfGeneratorService.java |  2 --
 .../fr/ifremer/tutti/service/TuttiCsvUtil.java     |  7 ++---
 .../fr/ifremer/tutti/service/TuttiDataContext.java |  2 +-
 .../tutti/service/bigfin/BigfinDataRow.java        | 17 ++++++++++-
 .../tutti/service/bigfin/BigfinDataRowModel.java   | 34 ++++++--------------=
--
 .../tutti/service/bigfin/BigfinImportResult.java   |  2 --
 .../tutti/service/bigfin/BigfinImportService.java  | 33 ++++++++++++---------
 .../fr/ifremer/tutti/service/bigfin/Signs.java     | 13 ++++-----
 .../service/catches/WeightCleaningService.java     |  2 +-
 .../service/catches/WeightComputingService.java    |  4 +--
 .../catches/multipost/FishingOperationRow.java     |  2 --
 .../multipost/FishingOperationRowModel.java        |  2 --
 .../service/export/generic/CatchExportRow.java     |  1 -
 .../tutti/service/protocol/CaracteristicRow.java   |  2 +-
 .../service/protocol/CaracteristicRowModel.java    |  2 +-
 .../protocol/ProtocolImportExportService.java      | 29 +++++++++---------
 .../service/psionimport/PsionImportModel.java      |  2 +-
 .../service/psionimport/PsionImportService.java    |  1 -
 .../tutti/service/pupitri/csv/CarrouselRow.java    |  2 +-
 .../pupitri/report/PupitriImportReportRow.java     |  4 +--
 .../referential/ReferentialImportResult.java       |  3 +-
 .../referential/ReferentialImportService.java      | 12 --------
 .../tutti/service/report/ReportService.java        |  2 +-
 25 files changed, 85 insertions(+), 102 deletions(-)

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

--===============4033334684255138236==--


From scm@users.codelutin.com Tue Jan  6 12:01:46 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] 01/01: optimize imports
Date: Tue, 06 Jan 2015 12:01:46 +0000
Message-ID: <20150106120146.0F8E75C3EF4@goh.codelutin.com>
In-Reply-To: <20150106120145.4113.6695@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0563606477069406760=="

--===============0563606477069406760==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

New commit to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

commit 8e7c2bf263be924782b51efab36cbb8f55cf85bd
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Jan 6 13:01:42 2015 +0100

    optimize imports
---
 .../tutti/service/AbstractTuttiService.java        |  2 +-
 .../fr/ifremer/tutti/service/DecoratorService.java |  5 ++--
 .../ifremer/tutti/service/PdfGeneratorService.java |  2 --
 .../fr/ifremer/tutti/service/TuttiCsvUtil.java     |  7 ++---
 .../fr/ifremer/tutti/service/TuttiDataContext.java |  2 +-
 .../tutti/service/bigfin/BigfinDataRow.java        | 17 ++++++++++-
 .../tutti/service/bigfin/BigfinDataRowModel.java   | 34 ++++++--------------=
--
 .../tutti/service/bigfin/BigfinImportResult.java   |  2 --
 .../tutti/service/bigfin/BigfinImportService.java  | 33 ++++++++++++---------
 .../fr/ifremer/tutti/service/bigfin/Signs.java     | 13 ++++-----
 .../service/catches/WeightCleaningService.java     |  2 +-
 .../service/catches/WeightComputingService.java    |  4 +--
 .../catches/multipost/FishingOperationRow.java     |  2 --
 .../multipost/FishingOperationRowModel.java        |  2 --
 .../service/export/generic/CatchExportRow.java     |  1 -
 .../tutti/service/protocol/CaracteristicRow.java   |  2 +-
 .../service/protocol/CaracteristicRowModel.java    |  2 +-
 .../protocol/ProtocolImportExportService.java      | 29 +++++++++---------
 .../service/psionimport/PsionImportModel.java      |  2 +-
 .../service/psionimport/PsionImportService.java    |  1 -
 .../tutti/service/pupitri/csv/CarrouselRow.java    |  2 +-
 .../pupitri/report/PupitriImportReportRow.java     |  4 +--
 .../referential/ReferentialImportResult.java       |  3 +-
 .../referential/ReferentialImportService.java      | 12 --------
 .../tutti/service/report/ReportService.java        |  2 +-
 25 files changed, 85 insertions(+), 102 deletions(-)

diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTut=
tiService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/Abstrac=
tTuttiService.java
index b51e0a1..de0e9b4 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiServi=
ce.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiServi=
ce.java
@@ -22,8 +22,8 @@ package fr.ifremer.tutti.service;
  * #L%
  */
=20
-import org.nuiton.jaxx.application.ApplicationTechnicalException;
 import org.apache.commons.io.FileUtils;
+import org.nuiton.jaxx.application.ApplicationTechnicalException;
 import org.nuiton.util.ZipUtil;
=20
 import java.io.File;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorSe=
rvice.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorSe=
rvice.java
index fa07772..1c3f83f 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.j=
ava
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.j=
ava
@@ -45,8 +45,8 @@ import org.nuiton.decorator.DecoratorProvider;
=20
 import java.io.File;
=20
-import static org.nuiton.i18n.I18n.t;
 import static org.nuiton.i18n.I18n.n;
+import static org.nuiton.i18n.I18n.t;
=20
 /**
  * Tutti decorator service.
@@ -63,6 +63,7 @@ public class DecoratorService extends AbstractTuttiService {
     public static final String CARACTERISTIC_PARAMETER_ONLY =3D "parameterOn=
ly";
=20
     public static final String WITH_SURVEY_CODE =3D "withSurveyCode";
+
     public static final String FROM_PROTOCOL =3D "fromProtocol";
=20
     public static final String GEAR_WITH_RANK_ORDER =3D "gearWithrankOrder";
@@ -244,7 +245,7 @@ public class DecoratorService extends AbstractTuttiServic=
e {
                 // try with refTaxCode
                 result =3D bean.getRefTaxCode();
=20
-                if (result =3D=3Dnull) {
+                if (result =3D=3D null) {
=20
                     result =3D t("tutti.propety.no.species.speciesCode");
                 }
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGenerato=
rService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGener=
atorService.java
index 67e6207..9881944 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorServic=
e.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorServic=
e.java
@@ -24,14 +24,12 @@ package fr.ifremer.tutti.service;
  * #L%
  */
=20
-import com.itextpdf.text.PageSize;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.birt.report.engine.emitter.excel.layout.Page;
 import org.nuiton.jaxx.application.ApplicationTechnicalException;
 import org.xhtmlrenderer.pdf.ITextRenderer;
=20
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUti=
l.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.ja=
va
index d36a45b..d93c9d1 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
@@ -26,7 +26,6 @@ import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import fr.ifremer.tutti.util.Weights;
 import fr.ifremer.tutti.persistence.entities.TuttiEntities;
 import fr.ifremer.tutti.persistence.entities.TuttiEntity;
 import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
@@ -36,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Pe=
rson;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.persistence.entities.referential.Speciess;
 import fr.ifremer.tutti.persistence.entities.referential.Vessel;
+import fr.ifremer.tutti.util.Weights;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.NestedNullException;
 import org.apache.commons.beanutils.PropertyUtils;
@@ -532,8 +532,8 @@ public class TuttiCsvUtil extends Common {
         protected final Map<String, E> universe;
=20
         public ForeignKeyListValue(Class<E> entityType,
-                               String propertyName,
-                               Map<String, E> universe) {
+                                   String propertyName,
+                                   Map<String, E> universe) {
             this.entityType =3D entityType;
             this.propertyName =3D propertyName;
             this.universe =3D universe;
@@ -929,7 +929,6 @@ public class TuttiCsvUtil extends Common {
     }
=20
     /**
-     *
      * @param <M>
      */
     public static abstract class ImportModelWithHeader<M> extends AbstractTu=
ttiImportModel<M> {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataCo=
ntext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataCo=
ntext.java
index 4d5ef04..5f96e87 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.j=
ava
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.j=
ava
@@ -25,7 +25,6 @@ package fr.ifremer.tutti.service;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import fr.ifremer.tutti.TuttiConfiguration;
-import fr.ifremer.tutti.util.Weights;
 import fr.ifremer.tutti.persistence.entities.data.Cruise;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
 import fr.ifremer.tutti.persistence.entities.data.Program;
@@ -39,6 +38,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Ge=
ar;
 import fr.ifremer.tutti.persistence.entities.referential.Person;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.persistence.entities.referential.Vessel;
+import fr.ifremer.tutti.util.Weights;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Bigf=
inDataRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/=
BigfinDataRow.java
index 2d94226..a6cfed0 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataR=
ow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataR=
ow.java
@@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.bigfin;
  * #L%
  */
=20
-import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualit=
ativeValue;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
=20
 import java.io.Serializable;
@@ -37,23 +36,39 @@ import java.util.Date;
 public class BigfinDataRow implements Serializable {
=20
     public static final String PROPERTY_RECORD_ID =3D "recordId";
+
     public static final String PROPERTY_LENGTH =3D "length";
+
     public static final String PROPERTY_WEIGHT =3D "weight";
+
     public static final String PROPERTY_SPECIES =3D "species";
+
     public static final String PROPERTY_STATION =3D "station";
+
     public static final String PROPERTY_DT =3D "dt";
+
     public static final String PROPERTY_SZ_CLASS =3D "szClass";
+
     public static final String PROPERTY_GENDER =3D "gender";
+
     public static final String PROPERTY_VRAC_HORS_VRAC =3D "vracHorsVrac";
=20
     protected String recordId;
+
     protected float length;
+
     protected Float weight;
+
     protected Species species;
+
     protected String station;
+
     protected Date dt;
+
     protected Signs szClass;
+
     protected Signs gender;
+
     protected Signs vracHorsVrac;
=20
     public String getRecordId() {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Bigf=
inDataRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bi=
gfin/BigfinDataRowModel.java
index d3527a4..4f2b8c1 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataR=
owModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataR=
owModel.java
@@ -24,33 +24,17 @@ package fr.ifremer.tutti.service.bigfin;
  * #L%
  */
=20
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
 import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId;
-import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2;
-import fr.ifremer.tutti.persistence.entities.TuttiEntities;
-import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol;
-import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
-import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualit=
ativeValue;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.persistence.entities.referential.Speciess;
 import fr.ifremer.tutti.service.TuttiCsvUtil;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nuiton.csv.Common;
-import org.nuiton.csv.ImportRuntimeException;
 import org.nuiton.csv.ValueParser;
=20
 import java.text.ParseException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
-import static org.nuiton.i18n.I18n.t;
=20
 /**
  * @author Kevin Morin (Code Lutin)
@@ -119,15 +103,15 @@ public class BigfinDataRowModel extends TuttiCsvUtil.Ab=
stractTuttiImportModel<Bi
         newMandatoryColumn("gender",
                            BigfinDataRow.PROPERTY_GENDER,
                            new ValueParser<Signs>() {
-            @Override
-            public Signs parse(String value) throws ParseException {
-                Signs result =3D Signs.getSign(value.toUpperCase(), PmfmId.S=
EX.getValue());
-                if (result =3D=3D null) {
-                    throw new ParseException("Could not parse Sign value: " =
+ value, 0);
-                }
-                return result;
-            }
-        });
+                               @Override
+                               public Signs parse(String value) throws Parse=
Exception {
+                                   Signs result =3D Signs.getSign(value.toUp=
perCase(), PmfmId.SEX.getValue());
+                                   if (result =3D=3D null) {
+                                       throw new ParseException("Could not p=
arse Sign value: " + value, 0);
+                                   }
+                                   return result;
+                               }
+                           });
=20
         newMandatoryColumn("text", BigfinDataRow.PROPERTY_VRAC_HORS_VRAC, ne=
w ValueParser<Signs>() {
             @Override
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Bigf=
inImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bi=
gfin/BigfinImportResult.java
index 7f4d1da..5761081 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImpor=
tResult.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImpor=
tResult.java
@@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.bigfin;
  * #L%
  */
=20
-import fr.ifremer.tutti.persistence.entities.referential.Species;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Bigf=
inImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/b=
igfin/BigfinImportService.java
index 6921500..eb2e061 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImpor=
tService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImpor=
tService.java
@@ -90,6 +90,7 @@ public class BigfinImportService extends AbstractTuttiServi=
ce {
     protected PersistenceService persistenceService;
=20
     protected Caracteristic sizeCaracteristic;
+
     protected Caracteristic genderCaracteristic;
=20
     protected Map<Signs, CaracteristicQualitativeValue> signsToCaracteristic=
Value;
@@ -190,7 +191,7 @@ public class BigfinImportService extends AbstractTuttiSer=
vice {
                 String station =3D bean.getStation();
                 Date dt =3D bean.getDt();
                 if (station !=3D null && station.equals(operation.getStation=
Number())
-                        && dt !=3D null && DateUtils.isSameDay(dt, operation=
.getGearShootingStartDate())) {
+                    && dt !=3D null && DateUtils.isSameDay(dt, operation.get=
GearShootingStartDate())) {
=20
                     if (bean.getSzClass() =3D=3D null) {
                         String error =3D t("tutti.service.bigfinImport.error=
.szClass.unknwon", bean.getRecordId());
@@ -288,7 +289,7 @@ public class BigfinImportService extends AbstractTuttiSer=
vice {
             List<Function<BigfinDataRow, Signs>> functions =3D new ArrayList=
<>();
=20
             // put the size and order in the right order
-            for (Integer categoryId: samplingOrder) {
+            for (Integer categoryId : samplingOrder) {
                 if (PmfmId.SIZE_CATEGORY.getValue().equals(categoryId)) {
                     pmfmIds.add(categoryId);
                     functions.add(new Function<BigfinDataRow, Signs>() {
@@ -312,7 +313,7 @@ public class BigfinImportService extends AbstractTuttiSer=
vice {
             }
=20
             List<Category> categories =3D new ArrayList<>();
-            for (int i =3D 0 ; i < pmfmIds.size() ;  i++) {
+            for (int i =3D 0; i < pmfmIds.size(); i++) {
                 Category category =3D new Category(pmfmIds.get(i), i < funct=
ions.size() ? functions.get(i) : null);
                 categories.add(category);
             }
@@ -356,17 +357,17 @@ public class BigfinImportService extends AbstractTuttiS=
ervice {
     /**
      * Go deeper in the batches until it finds the last of gender or size cl=
ass, then add the frequencies
      *
-     * @param commonParameter The parameter containing the parameters which =
do not change while browsing
-     * @param parentBatch The parent batch (null if root)
-     * @param depth The depth in the batch children
+     * @param commonParameter        The parameter containing the parameters=
 which do not change while browsing
+     * @param parentBatch            The parent batch (null if root)
+     * @param depth                  The depth in the batch children
      * @param batchesByCaracteristic a map containing the batches by caracte=
ristic value
-     * @param rowsByCaracteristic a multimap containing the rows to import b=
y caracteristic value
+     * @param rowsByCaracteristic    a multimap containing the rows to impor=
t by caracteristic value
      */
     protected void browseBatchesToAddFrequencies(BrowseBatchesParameter comm=
onParameter,
-                        SpeciesBatch parentBatch,
-                        int depth,
-                        Map<Serializable, SpeciesBatch> batchesByCaracterist=
ic,
-                        Multimap<Signs, BigfinDataRow> rowsByCaracteristic) {
+                                                 SpeciesBatch parentBatch,
+                                                 int depth,
+                                                 Map<Serializable, SpeciesBa=
tch> batchesByCaracteristic,
+                                                 Multimap<Signs, BigfinDataR=
ow> rowsByCaracteristic) {
=20
         Category category =3D commonParameter.getCategories().get(depth++);
=20
@@ -524,7 +525,7 @@ public class BigfinImportService extends AbstractTuttiSer=
vice {
             weightsByLengthStep.put(lengthStep, weight);
         }
=20
-        List<SpeciesBatchFrequency> frequencies  =3D new ArrayList<>();
+        List<SpeciesBatchFrequency> frequencies =3D new ArrayList<>();
         for (Float lengthStep : weightsByLengthStep.keySet()) {
             SpeciesBatchFrequency frequency =3D SpeciesBatchFrequencys.newSp=
eciesBatchFrequency();
             frequencies.add(frequency);
@@ -568,6 +569,7 @@ public class BigfinImportService extends AbstractTuttiSer=
vice {
     private class Category {
=20
         private Integer pmfmId;
+
         /** function to get the value of the caracteristic we want to group =
the batches by (eg size or gender) */
         private Function<BigfinDataRow, Signs> categoryValueGetter;
=20
@@ -592,19 +594,24 @@ public class BigfinImportService extends AbstractTuttiS=
ervice {
     private class BrowseBatchesParameter {
         /** the current fishing operation */
         private FishingOperation operation;
+
         /** the current species */
         private Species species;
+
         /** the lengthstep caracteristic found in the protocol */
         private Caracteristic lengthStepPmfm;
+
         /** the ordered categories */
         private List<Category> categories;
+
         /** the result of the import (to add the errors) */
         private BigfinImportResult result;
+
         /** label for the species in the errors */
         private String speciesLabel;
=20
         public BrowseBatchesParameter(FishingOperation operation, Species sp=
ecies, Caracteristic lengthStepPmfm,
-                    List<Category> categories, BigfinImportResult result) {
+                                      List<Category> categories, BigfinImpor=
tResult result) {
             this.operation =3D operation;
             this.species =3D species;
             this.lengthStepPmfm =3D lengthStepPmfm;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Sign=
s.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.ja=
va
index 0e0cec8..babbe08 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java
@@ -23,9 +23,7 @@ package fr.ifremer.tutti.service.bigfin;
  */
=20
 import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId;
-import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2;
 import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId;
-import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId2;
 import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
 import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualit=
ativeValue;
 import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualit=
ativeValues;
@@ -90,7 +88,7 @@ public enum Signs {
         }
     },
=20
-//    classe de taille, 1 =3D petit ; 2 =3D gros ; 0 =3D pas de classe de ta=
ille (saisie libre donc risque fort de mauvaise saisie)
+    //    classe de taille, 1 =3D petit ; 2 =3D gros ; 0 =3D pas de classe d=
e taille (saisie libre donc risque fort de mauvaise saisie)
     NOT_SIZED("0") {
         @Override
         public Integer getCategory() {
@@ -120,7 +118,7 @@ public enum Signs {
         }
=20
         @Override
-         public boolean isNullEquivalent() {
+        public boolean isNullEquivalent() {
             return false;
         }
     },
@@ -136,7 +134,7 @@ public enum Signs {
         }
=20
         @Override
-         public boolean isNullEquivalent() {
+        public boolean isNullEquivalent() {
             return false;
         }
     },
@@ -154,7 +152,7 @@ public enum Signs {
         }
=20
         @Override
-         public boolean isNullEquivalent() {
+        public boolean isNullEquivalent() {
             return false;
         }
     },
@@ -189,11 +187,12 @@ public enum Signs {
         Signs result =3D getSign(sign, null);
         return result;
     }
+
     public static Signs getSign(String sign, Integer categoryId) {
         Signs result =3D null;
         for (Signs s : values()) {
             if (s.sign.equals(sign) &&
-                    (categoryId =3D=3D null || s.getCategory().equals(catego=
ryId))) {
+                (categoryId =3D=3D null || s.getCategory().equals(categoryId=
))) {
                 result =3D s;
                 break;
             }
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/Wei=
ghtCleaningService.java b/tutti-service/src/main/java/fr/ifremer/tutti/servic=
e/catches/WeightCleaningService.java
index 8bc4b33..ef8be8c 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightClea=
ningService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightClea=
ningService.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
-import fr.ifremer.tutti.util.Weights;
 import fr.ifremer.tutti.persistence.entities.data.BatchContainer;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatch;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency;
@@ -45,6 +44,7 @@ import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
 import fr.ifremer.tutti.type.WeightUnit;
+import fr.ifremer.tutti.util.Weights;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
=20
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/Wei=
ghtComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/servi=
ce/catches/WeightComputingService.java
index 34e9d91..b5fcc14 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComp=
utingService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComp=
utingService.java
@@ -24,8 +24,6 @@ package fr.ifremer.tutti.service.catches;
=20
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import fr.ifremer.tutti.util.Numbers;
-import fr.ifremer.tutti.util.Weights;
 import fr.ifremer.tutti.persistence.entities.data.BatchContainer;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatch;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency;
@@ -41,6 +39,8 @@ import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
 import fr.ifremer.tutti.service.ValidationService;
+import fr.ifremer.tutti.util.Numbers;
+import fr.ifremer.tutti.util.Weights;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/mul=
tipost/FishingOperationRow.java b/tutti-service/src/main/java/fr/ifremer/tutt=
i/service/catches/multipost/FishingOperationRow.java
index b5db4d9..72d11bf 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/=
FishingOperationRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/=
FishingOperationRow.java
@@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.catches.multipost;
  * #L%
  */
=20
-import java.util.Date;
-
 /**
  * @author kmorin <kmorin@codelutin.com>
  * @since 2.3.1
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/mul=
tipost/FishingOperationRowModel.java b/tutti-service/src/main/java/fr/ifremer=
/tutti/service/catches/multipost/FishingOperationRowModel.java
index eedfefd..ab7eccd 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/=
FishingOperationRowModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/=
FishingOperationRowModel.java
@@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.catches.multipost;
  * #L%
  */
=20
-import fr.ifremer.tutti.service.TuttiCsvUtil;
-
 /**
  * @author kmorin <kmorin@codelutin.com>
  * @since 2.3.1
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/gene=
ric/CatchExportRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/servic=
e/export/generic/CatchExportRow.java
index 3e1b725..60143d2 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/Cat=
chExportRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/Cat=
chExportRow.java
@@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.export.generic;
=20
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-import fr.ifremer.tutti.persistence.entities.TuttiEntities;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency;
 import fr.ifremer.tutti.persistence.entities.data.Cruise;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Ca=
racteristicRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pr=
otocol/CaracteristicRow.java
index a4ac8de..d19001c 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Caracteri=
sticRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Caracteri=
sticRow.java
@@ -21,8 +21,8 @@
  */
 package fr.ifremer.tutti.service.protocol;
=20
-import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
 import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType;
+import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
=20
 import java.io.Serializable;
=20
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Ca=
racteristicRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/servi=
ce/protocol/CaracteristicRowModel.java
index 5a6b244..febdde8 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Caracteri=
sticRowModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Caracteri=
sticRowModel.java
@@ -22,9 +22,9 @@
 package fr.ifremer.tutti.service.protocol;
=20
=20
+import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType;
 import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
 import fr.ifremer.tutti.service.TuttiCsvUtil;
-import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType;
=20
 import java.util.Map;
=20
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/Pr=
otocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti=
/service/protocol/ProtocolImportExportService.java
index 72832eb..73486af 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolI=
mportExportService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolI=
mportExportService.java
@@ -32,6 +32,7 @@ import com.google.common.collect.TreeMultimap;
 import com.google.common.io.Files;
 import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRo=
w;
 import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRo=
wBean;
+import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType;
 import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol;
 import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols;
 import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
@@ -39,7 +40,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.Tutti=
Protocols;
 import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.service.AbstractTuttiService;
-import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -141,12 +141,12 @@ public class ProtocolImportExportService extends Abstra=
ctTuttiService {
         }
         Map<String, CaracteristicMappingRow> rowsByCaracteristicId =3D
                 Maps.uniqueIndex(caracteristicMapping,
-                                  new Function<CaracteristicMappingRow, Stri=
ng>() {
-                                      @Override
-                                      public String apply(CaracteristicMappi=
ngRow caracteristicMappingRow) {
-                                          return caracteristicMappingRow.get=
PmfmId();
-                                      }
-                                  });
+                                 new Function<CaracteristicMappingRow, Strin=
g>() {
+                                     @Override
+                                     public String apply(CaracteristicMappin=
gRow caracteristicMappingRow) {
+                                         return caracteristicMappingRow.getP=
mfmId();
+                                     }
+                                 });
=20
         mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, Caracteris=
ticType.GEAR_USE_FEATURE);
         mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, Caracteris=
ticType.VESSEL_USE_FEATURE);
@@ -203,7 +203,7 @@ public class ProtocolImportExportService extends Abstract=
TuttiService {
         }
=20
         if (!protocol.isCaracteristicMappingEmpty()) {
-            for (CaracteristicMappingRow mappingRow  : protocol.getCaracteri=
sticMapping()) {
+            for (CaracteristicMappingRow mappingRow : protocol.getCaracteris=
ticMapping()) {
                 function.setType(CaracteristicType.valueOf(mappingRow.getTab=
()));
                 rows.add(function.apply(mappingRow.getPmfmId()));
             }
@@ -232,9 +232,9 @@ public class ProtocolImportExportService extends Abstract=
TuttiService {
     }
=20
     public List<Species> importProtocolSpecies(File file,
-                                      TuttiProtocol protocol,
-                                      Map<String, Caracteristic> caracterist=
icMap,
-                                      Map<String, Species> speciesMap) {
+                                               TuttiProtocol protocol,
+                                               Map<String, Caracteristic> ca=
racteristicMap,
+                                               Map<String, Species> speciesM=
ap) {
=20
         if (log.isInfoEnabled()) {
             log.info("Will import protocol [" + protocol.getName() +
@@ -328,7 +328,6 @@ public class ProtocolImportExportService extends Abstract=
TuttiService {
     }
=20
     /**
-     *
      * @param file
      * @param protocol
      * @param caracteristicMap
@@ -336,9 +335,9 @@ public class ProtocolImportExportService extends Abstract=
TuttiService {
      * @return The list of the species not imported because they are already=
 in the species
      */
     public List<Species> importProtocolBenthos(File file,
-                                                       TuttiProtocol protoco=
l,
-                                                       Map<String, Caracteri=
stic> caracteristicMap,
-                                                       Map<String, Species> =
speciesMap) {
+                                               TuttiProtocol protocol,
+                                               Map<String, Caracteristic> ca=
racteristicMap,
+                                               Map<String, Species> speciesM=
ap) {
=20
         if (log.isInfoEnabled()) {
             log.info("Will import protocol [" + protocol.getName() +
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport=
/PsionImportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service=
/psionimport/PsionImportModel.java
index 3f3cbe5..a43f8c5 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionI=
mportModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionI=
mportModel.java
@@ -321,7 +321,7 @@ public class PsionImportModel {
                 PsionImportBatchModel.SampleCategory nextCat =3D categoryIte=
rator.next();
                 SampleCategoryModelEntry actualCategory =3D categoriesById.g=
et(nextCat.getCategoryId());
=20
-                if (lastSampleCategory!=3Dnull) {
+                if (lastSampleCategory !=3D null) {
=20
                     if (actualCategory.getOrder() < lastSampleCategory.getOr=
der()) {
=20
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport=
/PsionImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/servi=
ce/psionimport/PsionImportService.java
index 1814b86..a786fa5 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionI=
mportService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionI=
mportService.java
@@ -32,7 +32,6 @@ import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode;
 import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId;
-import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2;
 import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId;
 import fr.ifremer.tutti.persistence.entities.TuttiEntities;
 import fr.ifremer.tutti.persistence.entities.data.Attachment;
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv=
/CarrouselRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pup=
itri/csv/CarrouselRow.java
index e2de313..40b8b0a 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/Carrou=
selRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/Carrou=
selRow.java
@@ -79,7 +79,7 @@ public class CarrouselRow implements Serializable {
=20
     public boolean acceptOperation(FishingOperation operation) {
         return operationCode.equals(operation.getStationNumber())
-                && DateUtils.isSameDay(date, operation.getGearShootingStartD=
ate());
+               && DateUtils.isSameDay(date, operation.getGearShootingStartDa=
te());
     }
=20
     public String getOperationCode() {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/rep=
ort/PupitriImportReportRow.java b/tutti-service/src/main/java/fr/ifremer/tutt=
i/service/pupitri/report/PupitriImportReportRow.java
index 6bc8a79..8aaf0c9 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/Pup=
itriImportReportRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/Pup=
itriImportReportRow.java
@@ -62,8 +62,8 @@ public class PupitriImportReportRow {
         result.speciesName =3D name;
         result.speciesVernucalCode =3D vernacularCode;
         result.sorted =3D sorted;
-        result.sign=3D signContext.getSigns().getSign();
-        result.sortedWeight=3D signContext.getWeight();
+        result.sign =3D signContext.getSigns().getSign();
+        result.sortedWeight =3D signContext.getWeight();
         result.nbBox =3D signContext.getNbBox();
         result.nbSmallBox =3D signContext.getNbSmallBox();
         result.nbBigBox =3D signContext.getNbBigBox();
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential=
/ReferentialImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/=
service/referential/ReferentialImportResult.java
index 0414bc6..81bb617 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/Refere=
ntialImportResult.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/Refere=
ntialImportResult.java
@@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.referential;
  * #L%
  */
=20
-import fr.ifremer.tutti.persistence.entities.TuttiEntity;
 import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEnt=
ity;
=20
 import java.util.ArrayList;
@@ -38,7 +37,9 @@ import java.util.List;
 public class ReferentialImportResult<E extends TuttiReferentialEntity> {
=20
     protected List<E> refAdded =3D new ArrayList<>();
+
     protected List<E> refUpdated =3D new ArrayList<>();
+
     protected int nbRefDeleted =3D 0;
=20
     public List<E> getRefAdded() {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential=
/ReferentialImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti=
/service/referential/ReferentialImportService.java
index ea953fb..eca768f 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/Refere=
ntialImportService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/Refere=
ntialImportService.java
@@ -24,11 +24,8 @@ package fr.ifremer.tutti.service.referential;
=20
 import com.google.common.base.Charsets;
 import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.google.common.io.Files;
-import fr.ifremer.tutti.persistence.entities.TuttiEntities;
 import fr.ifremer.tutti.persistence.entities.referential.Gear;
 import fr.ifremer.tutti.persistence.entities.referential.Gears;
 import fr.ifremer.tutti.persistence.entities.referential.Person;
@@ -41,24 +38,15 @@ import fr.ifremer.tutti.service.AbstractTuttiService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.csv.Export;
-import org.nuiton.csv.Import;
-import org.nuiton.csv.ImportRuntimeException;
 import org.nuiton.jaxx.application.ApplicationTechnicalException;
=20
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
=20
 import static org.nuiton.i18n.I18n.t;
=20
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/Repo=
rtService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/=
ReportService.java
index 9ec96f3..b4a3c49 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportServi=
ce.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportServi=
ce.java
@@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.report;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.nuiton.jaxx.application.ApplicationTechnicalException;
 import fr.ifremer.tutti.persistence.ProgressionModel;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
 import fr.ifremer.tutti.service.AbstractTuttiService;
@@ -44,6 +43,7 @@ import org.eclipse.birt.report.engine.api.IReportEngineFact=
ory;
 import org.eclipse.birt.report.engine.api.IReportRunnable;
 import org.eclipse.birt.report.engine.api.IRunAndRenderTask;
 import org.eclipse.birt.report.engine.api.RenderOption;
+import org.nuiton.jaxx.application.ApplicationTechnicalException;
=20
 import java.io.File;
 import java.io.FileFilter;

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

--===============0563606477069406760==--


