This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) new 0b1e7ee Ajout du numéro de ligne dans les messages d'erreurs (See #2246) new 9867f8f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) new 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) The 3 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 8cf674f1b633a46ba7f6006fedfbd14a3c173fe2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 08:43:10 2016 +0200 Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) commit 9867f8f7a6cca1411711b3e7debb5b26d9dba16b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 12 16:28:46 2016 +0200 Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) commit 0b1e7eef684a101f9c325a898721ae91aadae88a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 12 15:49:30 2016 +0200 Ajout du numéro de ligne dans les messages d'erreurs (See #2246) Summary of changes: .../services/service/UserDbPersistenceService.java | 15 +++++++++ .../DuplicatedEchotypeAssociationException.java | 20 ++++++++++++ .../DuplicatedElementaryCellException.java | 4 +-- .../importdata/DuplicatedEsduCellException.java | 4 +-- .../DuplicatedGearMetadataValueException.java | 3 +- ...eption.java => DuplicatedMapCellException.java} | 6 ++-- .../importdata/DuplicatedOperationException.java | 4 +-- .../DuplicatedOperationMetadataValueException.java | 4 +-- ...ion.java => DuplicatedRegionCellException.java} | 6 ++-- ...plicatedResultsVoyageLengthAgeKeyException.java | 20 ++++++++++++ ...catedResultsVoyageLengthWeightKeyException.java | 20 ++++++++++++ .../importdata/DuplicatedSampleException.java | 4 +-- .../importdata/DuplicatedSubSampleException.java | 3 +- .../importdata/DuplicatedTransectException.java | 4 +-- .../importdata/DuplicatedTransitException.java | 4 +-- .../importdata/DuplicatedVoyageException.java | 4 +-- .../importdata/MismatchVoyageException.java | 21 ++++++++++++ .../actions/VoyageAcousticsImportAction.java | 4 +-- .../VoyageCatchesSubSampleImportAction.java | 1 + .../VoyageCatchesTotalSampleImportAction.java | 2 +- .../actions/VoyageCommonsTransectImportAction.java | 2 +- .../actions/VoyageCommonsTransitImportAction.java | 2 +- .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../VoyageOperationsGearMetadataImportAction.java | 1 + .../VoyageOperationsOperationImportAction.java | 2 +- ...ageOperationsOperationMetadataImportAction.java | 2 +- .../VoyageResultsMapFishCellImportAction.java | 15 ++++++++- .../VoyageResultsMapOtherCellImportAction.java | 15 ++++++++- .../actions/VoyageResultsRegionImportAction.java | 21 ++++++++++-- .../VoyageResultsVoyageEchotypeImportAction.java | 19 ++++++++--- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 31 ++++++++++++++++++ ...geResultsVoyageLengthWeightKeyImportAction.java | 38 ++++++++++++++++++++-- .../i18n/echobase-services_en_GB.properties | 26 +++++++++------ .../i18n/echobase-services_fr_FR.properties | 24 +++++++++----- 34 files changed, 290 insertions(+), 63 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEchotypeAssociationException.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedEsduCellException.java => DuplicatedMapCellException.java} (79%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedElementaryCellException.java => DuplicatedRegionCellException.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthAgeKeyException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthWeightKeyException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.