[Tutti-commits] 01/02: Changement du message lors de l'erreur d'un import (See #8247)

20 Apr 2016

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

New commit to branch develop in repository tutti.

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

commit 3191b676c4759b4cdb59c1ee617bb9b603cd8260
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Apr 20 09:08:29 2016 +0200

    Changement du message lors de l'erreur d'un import (See #8247)
---
 .../catches/multipost/MultiPostImportService.java      | 18 +++++++-----------
 .../main/resources/i18n/tutti-service_fr_FR.properties |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java
index e88158d..80fd69b 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java
@@ -82,7 +82,6 @@ import fr.ifremer.tutti.service.csv.CaracteristicValueParserFormatter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.nuiton.csv.Import;
-import org.nuiton.decorator.Decorator;
 import org.nuiton.jaxx.application.ApplicationBusinessException;
 import org.nuiton.jaxx.application.ApplicationTechnicalException;
 
@@ -506,10 +505,10 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult
      * @return the list of the species which have not been imported, because there were concurrent batches
      */
     public MultiPostImportResult importSpeciesBatch(File file,
-                                                  FishingOperation operation,
-                                                  SpeciesBatch speciesBatch,
-                                                  boolean importFrequencies,
-                                                  boolean importIndividualObservations) {
+                                                    FishingOperation operation,
+                                                    SpeciesBatch speciesBatch,
+                                                    boolean importFrequencies,
+                                                    boolean importIndividualObservations) {
 
         return persistenceService.invoke(() -> {
 
@@ -821,6 +820,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult
 
 
     //FIXME exactly the same as for the species ???
+
     /**
      * Import benthos batches frequencies or individual observations from a satellite post.
      *
@@ -1440,9 +1440,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult
                     if (!requiredSpeciesId.equals(speciesId)) {
 
                         // Bad species, import fail
-                        Decorator<Species> fishingOperationDecorator = context.getService(DecoratorService.class).getDecoratorByType(Species.class);
-                        throw new ApplicationBusinessException(t("tutti.service.multipost.import.wrongSpecies.error",
-                                                                 fishingOperationDecorator.toString(speciesBatch.getSpecies())));
+                        throw new ApplicationBusinessException(t("tutti.service.multipost.import.wrongSpecies.error"));
 
                     }
 
@@ -1486,9 +1484,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult
                     if (!requiredSpeciesId.equals(row.getSpecies().getIdAsInt())) {
 
                         // Bad species, import fail
-                        Decorator<Species> fishingOperationDecorator = context.getService(DecoratorService.class).getDecoratorByType(Species.class);
-                        throw new ApplicationBusinessException(t("tutti.service.multipost.import.wrongSpecies.error",
-                                                                 fishingOperationDecorator.toString(speciesOfBenthosBatch.getSpecies())));
+                        throw new ApplicationBusinessException(t("tutti.service.multipost.import.wrongSpecies.error"));
 
                     }
 
diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
index 1009323..6477a24 100644
--- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
+++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
@@ -256,7 +256,7 @@ tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des men
 tutti.service.multipost.import.operation.error=Erreur lors de l'import des données du trait
 tutti.service.multipost.import.weights.error=Erreur lors de l'import des poids
 tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait \:<br/>%s
-tutti.service.multipost.import.wrongSpecies.error=Espèce impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre lot \:<br/>%s
+tutti.service.multipost.import.wrongSpecies.error=Importation impossible, vous essayer d'importer un fichier provenant d'un autre trait ou les catégorisations du lot ne correspondent pas.
 tutti.service.multipost.uncompress.error=Erreur lors de la décompression de l'archive %s
 tutti.service.operations.cleanWeights.benthos.batch=Lot benthos
 tutti.service.operations.cleanWeights.error.redundant.frequencyWeight=Le poids (%s) du <strong>sous-échantillon</strong> vaut la somme des poids des <strong>échantillons mesurés</strong>

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

    

[Tutti-commits] 01/02: Changement du message lors de l'erreur d'un import (See #8247)

codelutin.com scm