Author: kmorin Date: 2013-04-29 19:54:57 +0200 (Mon, 29 Apr 2013) New Revision: 890 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/890 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:42:04 UTC (rev 889) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:54:57 UTC (rev 890) @@ -29,6 +29,7 @@ tutti.persistence.batch.validation.vracSpeciesNotFound= tutti.persistence.config.generateEnumFile.error= tutti.persistence.config.generateFile.error= +tutti.persistence.dbMetadata.instanciation.error= tutti.persistence.dbmetadata.instanciation.error= tutti.persistence.dbmetadata.table.error= tutti.persistence.loader.error= Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-29 17:42:04 UTC (rev 889) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-29 17:54:57 UTC (rev 890) @@ -69,6 +69,8 @@ import java.text.SimpleDateFormat; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * Persistence service. * @@ -171,7 +173,7 @@ public void checkImportStructure(File file) { if (!file.exists()) { - throw new TuttiBusinessException("Db archive " + file + " does not exists"); + throw new TuttiBusinessException(_("tutti.service.persistence.checkImportstructure.fileNotExist", file)); } // check zip structure @@ -182,7 +184,7 @@ FileObject[] children = TuttiIOUtil.getChildren(fileObject, "Could not open archive"); if (children.length != 1) { - throw new TuttiBusinessException("Db archive " + file + " should have only one children"); + throw new TuttiBusinessException(_("tutti.service.persistence.checkImportstructure.tooManyChildren", file)); } fileObject = children[0]; checkArchiveDb(file, fileObject, "db"); @@ -195,9 +197,7 @@ String dir) { FileObject directory = TuttiIOUtil.getChild(fileObject, dir, " could not obtain child " + dir); if (directory == null) { - throw new TuttiBusinessException( - "Db archive " + file + " does not contains a " + - dir + " directory."); + throw new TuttiBusinessException(_("tutti.service.persistence.checkArchiveDb.error", file, dir)); } } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-29 17:42:04 UTC (rev 889) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-29 17:54:57 UTC (rev 890) @@ -9,6 +9,8 @@ tutti.config.option.tmp.directory.description= tutti.config.option.version.description= tutti.config.service= +tutti.persistence.checkArchiveDb.error= +tutti.persistence.checkImportstructure.fileNotExist= tutti.property.attachment= tutti.property.caracteristic= tutti.property.country= @@ -115,6 +117,9 @@ tutti.service.operations.validate.marineLitter.error.marineLitterSizeCategory.required= tutti.service.operations.validate.marineLitter.error.number.required= tutti.service.operations.validate.marineLitter.warning.weight.required= +tutti.service.persistence.checkArchiveDb.error= +tutti.service.persistence.checkImportstructure.fileNotExist= +tutti.service.persistence.checkImportstructure.tooManyChildren= tutti.service.protocol.export.benthos.error= tutti.service.protocol.export.caracteristics.all.error= tutti.service.protocol.export.caracteristics.protocol.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-29 17:42:04 UTC (rev 889) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-29 17:54:57 UTC (rev 890) @@ -90,6 +90,9 @@ tutti.service.operations.computeWeights.error.species.incoherentTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié tutti.service.operations.computeWeights.error.species.noWeight=Un lot des espèces n'a pas de poids tutti.service.operations.exportCatchesReport.error=Erreur lors de la génération du rapport des captures +tutti.service.persistence.checkArchiveDb.error=L'archive de base de données %1s ne contient pas le dossier %2s +tutti.service.persistence.checkImportstructure.fileNotExist=L'archive de base de données %s n'existe pas +tutti.service.persistence.checkImportstructure.tooManyChildren=L'archive de base de données %s ne doit avoir qu'un sous-dossier tutti.service.protocol.export.benthos.error=Erreur lors de l'export du benthos dans le fichier %s tutti.service.protocol.export.caracteristics.all.error=Erreur lors de l'export des caractéristiques dans le fichier %s tutti.service.protocol.export.caracteristics.protocol.error=Erreur lors de l'export des caractéristiques du protocole dans le fichier %s