Author: kmorin Date: 2013-04-29 20:21:08 +0200 (Mon, 29 Apr 2013) New Revision: 891 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/891 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.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 trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 18:21:08 UTC (rev 891) @@ -84,7 +84,7 @@ this.directories.add(directory); // force to create directory - TuttiIOUtil.forceMkdir(directory, "could not create directory"); + TuttiIOUtil.forceMkdir(directory, _("tutti.persistence.mkDir.error", directory)); } } loader = null; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java 2013-04-29 18:21:08 UTC (rev 891) @@ -76,9 +76,12 @@ public void initConfig(RessourceClassLoader resourceLoader) { - TuttiIOUtil.forceMkdir(getDbDirectory(), "could not create directory"); - TuttiIOUtil.forceMkdir(getDbAttachmentDirectory(), "could not create directory"); - TuttiIOUtil.forceMkdir(getProtocolDirectory(), "could not create directory"); + File directory = getDbDirectory(); + TuttiIOUtil.forceMkdir(directory, _("tutti.persistence.mkDir.error", directory)); + directory = getDbAttachmentDirectory(); + TuttiIOUtil.forceMkdir(directory, _("tutti.persistence.mkDir.error", directory)); + directory = getProtocolDirectory(); + TuttiIOUtil.forceMkdir(directory, _("tutti.persistence.mkDir.error", directory)); // add a predicate to search the configuration file from his directory instead of the class-path 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:54:57 UTC (rev 890) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 18:21:08 UTC (rev 891) @@ -30,9 +30,8 @@ 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= +tutti.persistence.mkDir.error= tutti.persistence.protocol.fromFile.error= tutti.persistence.tableMetadata.instanciation.error= tutti.sampleCategoryType.age= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 18:21:08 UTC (rev 891) @@ -31,6 +31,7 @@ tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL +tutti.persistence.mkDir.error=Erreur lors de la création du dossier %s tutti.persistence.protocol.fromFile.error=Erreur lors de l'import du protocol du fichier %s tutti.persistence.tableMetadata.instanciation.error=Erreur à l'initialisation de %s tutti.sampleCategoryType.age=Age 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:54:57 UTC (rev 890) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-29 18:21:08 UTC (rev 891) @@ -137,7 +137,7 @@ try { TuttiIOUtil.forceMkdir(structureDirectory, - "Could not create directory"); + _("tutti.service.mkDir.error", structureDirectory)); if (log.isInfoEnabled()) { log.info("Export directory: " + structureDirectory); @@ -158,7 +158,7 @@ // create zip TuttiIOUtil.zip(structureDirectory, file, - "Could not create archive at " + file); + _("tutti.service.persistence.exportDb.zip.error", file)); } finally { @@ -178,10 +178,10 @@ // check zip structure FileObject fileObject = TuttiIOUtil.resolveFile( - "zip:" + file.getAbsolutePath(), "could not obtain archive"); + "zip:" + file.getAbsolutePath(), _("tutti.service.persistence.getArchive.error", file)); - FileObject[] children = TuttiIOUtil.getChildren(fileObject, "Could not open archive"); + FileObject[] children = TuttiIOUtil.getChildren(fileObject, _("tutti.service.persistence.openArchive.error", file)); if (children.length != 1) { throw new TuttiBusinessException(_("tutti.service.persistence.checkImportstructure.tooManyChildren", file)); @@ -195,7 +195,7 @@ protected void checkArchiveDb(File file, FileObject fileObject, String dir) { - FileObject directory = TuttiIOUtil.getChild(fileObject, dir, " could not obtain child " + dir); + FileObject directory = TuttiIOUtil.getChild(fileObject, dir, _("tutti.service.persistence.getChild.error", dir)); if (directory == null) { throw new TuttiBusinessException(_("tutti.service.persistence.checkArchiveDb.error", file, dir)); } @@ -222,16 +222,17 @@ if (log.isInfoEnabled()) { log.info("Import db to " + target); } - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), "could not obtain archive"); + FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), + _("tutti.service.persistence.getArchive.error", file)); - FileObject[] children = TuttiIOUtil.getChildren(fileObject, "Could not open archive"); + FileObject[] children = TuttiIOUtil.getChildren(fileObject, _("tutti.service.persistence.openArchive.error", file)); fileObject = children[0]; TuttiIOUtil.explode(fileObject, target, new AllFileSelector(), - "Could not decompress archive " + file); + _("tutti.service.persistence.extractArchive.error", file)); } public boolean isDbLoaded() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java 2013-04-29 18:21:08 UTC (rev 891) @@ -33,6 +33,8 @@ import java.net.URL; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * Configuration for the service layer. * @@ -122,7 +124,7 @@ File dataDirectory = getDataDirectory(); TuttiIOUtil.forceMkdir( dataDirectory, - "Could not create data directory " + dataDirectory); + _("tutti.service.mkDir.error", dataDirectory)); File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { @@ -133,7 +135,7 @@ } TuttiIOUtil.forceMkdir( tmpDirectory, - "Could not create temp directory " + tmpDirectory); + _("tutti.service.mkDir.error", tmpDirectory)); } public void setCsvSeparator(char c) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-04-29 18:21:08 UTC (rev 891) @@ -144,7 +144,7 @@ File basedir = new File(context.getConfig().newTempFile( "exportProgram"), "exportProgram-" + programId); - TuttiIOUtil.forceMkdir(basedir, "Could not create directory"); + TuttiIOUtil.forceMkdir(basedir, _("tutti.service.mkDir.error", basedir)); ExportContext exportContext = createExportContext(basedir); @@ -154,12 +154,12 @@ cruise = persistenceService.getCruise(cruise.getId()); exportCruise(cruise, exportContext, progressionModel); } - TuttiIOUtil.close(exportContext, "Could not close export context"); + TuttiIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); progressionModel.setMessage( _("tutti.service.exportCruise.buildZip", exportFile)); - TuttiIOUtil.zip(basedir, exportFile, "Could not create export zip"); + TuttiIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); @@ -182,18 +182,18 @@ File basedir = new File(context.getConfig().newTempFile( "exportCruise"), "exportCruise-" + cruiseId); - TuttiIOUtil.forceMkdir(basedir, "Could not create directory"); + TuttiIOUtil.forceMkdir(basedir, _("tutti.service.mkDir.error", basedir)); ExportContext exportContext = createExportContext(basedir); try { exportCruise(cruise, exportContext, progressionModel); - TuttiIOUtil.close(exportContext, "Could not close export context"); + TuttiIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); progressionModel.setMessage( _("tutti.service.exportCruise.buildZip", exportFile)); - TuttiIOUtil.zip(basedir, exportFile, "Could not create export zip"); + TuttiIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); 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:54:57 UTC (rev 890) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-29 18:21:08 UTC (rev 891) @@ -56,12 +56,14 @@ tutti.service.csv.parse.entityNotFound= tutti.service.cvs.format.error= tutti.service.export.catches.error= +tutti.service.export.closeContext.error= tutti.service.export.context.error= tutti.service.export.invalid.cruise= tutti.service.export.invalid.fishingOperation= tutti.service.export.operations.error= tutti.service.export.parameters.error= tutti.service.export.survey.error= +tutti.service.export.zip.error= tutti.service.exportCruise.buildZip= tutti.service.exportCruise.checkCruise= tutti.service.exportCruise.exportCatches= @@ -74,6 +76,7 @@ tutti.service.exportSumatra.header.species= tutti.service.exportSumatra.header.station= tutti.service.exportSumatra.header.weight= +tutti.service.mkDir.error= tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight= @@ -120,6 +123,11 @@ tutti.service.persistence.checkArchiveDb.error= tutti.service.persistence.checkImportstructure.fileNotExist= tutti.service.persistence.checkImportstructure.tooManyChildren= +tutti.service.persistence.exportDb.zip.error= +tutti.service.persistence.extractArchive.error= +tutti.service.persistence.getArchive.error= +tutti.service.persistence.getChild.error= +tutti.service.persistence.openArchive.error= 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:54:57 UTC (rev 890) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-29 18:21:08 UTC (rev 891) @@ -54,12 +54,14 @@ tutti.service.csv.parse.entityNotFound=L'entité de type %1s avec la propriété %2s de valeur %3s n'a pas été trouvée tutti.service.cvs.format.error=Erreur lors du formattage de la valeur %s tutti.service.export.catches.error=Erreur lors de l'export des captures +tutti.service.export.closeContext.error=Erreur lors de la fermeture du contexte d'export tutti.service.export.context.error=Erreur lors de la création des fichiers pour l'export tutti.service.export.invalid.cruise=L'export de la campagne %s ne peut pas être réalisé suite aux erreurs rencontrées sur ses traits lors de l'élévation des poids \:\n%s tutti.service.export.invalid.fishingOperation=L'élévation des poids ne peut pas être réalisé sur le trait %s, pour la raison suivante %s tutti.service.export.operations.error=Erreur lors de l'export des traits tutti.service.export.parameters.error=Erreur lors de l'export des paramètres tutti.service.export.survey.error=Erreur lors de l'export de la campagne +tutti.service.export.zip.error=Erreur lors de la création du zip d'export %s tutti.service.exportCruise.buildZip=Création de l'archive de l'export (fichier %s) tutti.service.exportCruise.checkCruise=Vérification de la campagne %s tutti.service.exportCruise.exportCatches=Export du fichier <strong>catch.csv</strong> pour la campagne %s @@ -72,6 +74,7 @@ tutti.service.exportSumatra.header.species=Espèce tutti.service.exportSumatra.header.station=Station tutti.service.exportSumatra.header.weight=Total +tutti.service.mkDir.error=Erreur à la création du dossier %s tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=Le poids total des mensurations d'un lot du benthos est supérieur au poids de la catégorie tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot du benthos est différent de la somme des poids de ses sous-catégories tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. @@ -93,6 +96,11 @@ 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.persistence.exportDb.zip.error=Erreur lors de la création de l'archive %s +tutti.service.persistence.extractArchive.error=Erreur lors de l'extraction de l'archive %s +tutti.service.persistence.getArchive.error=Erreur lors de la récupération de l'archive %s +tutti.service.persistence.getChild.error=Erreur lors de la récupération du fils %s +tutti.service.persistence.openArchive.error=Erreur lors de l'ouverture de l'archive %s 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 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-29 18:21:08 UTC (rev 891) @@ -337,7 +337,7 @@ } TuttiIOUtil.forceMkdir(i18nDirectory, - "Could not create i18n at " + i18nDirectory); + _("tutti.i18n.mkDir.error", i18nDirectory)); if (log.isDebugEnabled()) { log.debug("I18N directory: " + i18nDirectory); @@ -371,7 +371,7 @@ } TuttiIOUtil.forceMkdir( helpDirectory, - "Could not create helpDirectory at " + helpDirectory); + _("tutti.help.mkDir.error", helpDirectory)); // load help mapping String mappingProperties = Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 18:21:08 UTC (rev 891) @@ -876,6 +876,8 @@ tutti.gearUseFeatureTable.table.header.key= tutti.gearUseFeatureTable.table.header.value= tutti.gearUseFeatureTable.title= +tutti.help.mkDir.error= +tutti.i18n.mkDir.error= tutti.importProtocol.action.success= tutti.importPupitri.carrouselFile.extension= tutti.importPupitri.carrouselFile.extension.description= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-29 17:54:57 UTC (rev 890) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-29 18:21:08 UTC (rev 891) @@ -861,6 +861,8 @@ tutti.gearUseFeatureTable.table.header.key=Caractéristique tutti.gearUseFeatureTable.table.header.value=Valeur tutti.gearUseFeatureTable.title=Mise en œuvre de l'engin +tutti.help.mkDir.error=Erreur à la création du dossier d'aide +tutti.i18n.mkDir.error=Erreur à la création du dossier d'internationalisation tutti.importProtocol.action.success=Protocole [%s] lu depuis le fichier. tutti.importPupitri.carrouselFile.extension=car tutti.importPupitri.carrouselFile.extension.description=Fichier du carrousel (.car)