April 2013 - Tutti-commits - mailman.cloud.codelutin.com

r893 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/protocol resources/i18n
by kmorin＠users.forge.codelutin.com April 30, 2013

April 30, 2013

Author: kmorin Date: 2013-04-30 11:11:34 +0200 (Tue, 30 Apr 2013) New Revision: 893 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/893 Log: remove plankton Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 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-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-30 09:11:34 UTC (rev 893) @@ -570,7 +570,6 @@ ui.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); ui.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); ui.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); -// ui.getPlanktonTabFishingOperationReminderLabel().setTitle(fishingOperationText); if (loadOtherTabs) { @@ -581,7 +580,6 @@ ui.getMarineLitterTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); ui.getAccidentalTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); ui.getIndividualObservationTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); -// ui.getPlanktonTabContent().getHandler().selectFishingOperation(bean); } catchesUIModel.setLoadingData(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-04-30 09:11:34 UTC (rev 893) @@ -292,10 +292,6 @@ model: {model.getMarineLitterTotalWeight()}; } -#planktonTab { - enabled: {false}; -} - #accidentalTabPanel { layout:{accidentalTabPanelLayout}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-30 09:11:34 UTC (rev 893) @@ -40,7 +40,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI - fr.ifremer.tutti.ui.swing.content.operation.catches.plankton.PlanktonBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-30 09:11:34 UTC (rev 893) @@ -143,7 +143,6 @@ closeUI(ui.getSpeciesTabContent()); closeUI(ui.getBenthosTabContent()); closeUI(ui.getMarineLitterTabContent()); -// closeUI(ui.getPlanktonTabContent()); closeUI(ui.getAccidentalTabContent()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-30 09:11:34 UTC (rev 893) @@ -207,12 +207,6 @@ </Table> </JPanel> </tab> -  -  -  -  -  -  </JTabbedPane> <JPanel id='saveWarningContainer' layout='{new BorderLayout(10, 10)}' 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-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-30 09:11:34 UTC (rev 893) @@ -877,6 +877,7 @@ tutti.gearUseFeatureTable.table.header.value= tutti.gearUseFeatureTable.title= tutti.help.mkDir.error= +tutti.i18n.deleteCache.error= tutti.i18n.mkDir.error= tutti.importProtocol.action.success= tutti.importPupitri.carrouselFile.extension= @@ -888,6 +889,7 @@ tutti.importPupitri.title= tutti.importPupitri.trunkFile.extension= tutti.importPupitri.trunkFile.extension.description= +tutti.io.directory.delete.error= tutti.label.catches.planktonTotalSampleWeight= tutti.label.catches.planktonTotalWeight= tutti.label.tab.accidental= @@ -1027,6 +1029,7 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= tutti.message.action.running= tutti.property.get.error= +tutti.property.set.error= tutti.sampleOrder.caracteristicNotFound= tutti.selectBenthos.title= tutti.selectCruise.action.chooseCruiseExportFile= 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-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-30 09:11:34 UTC (rev 893) @@ -599,20 +599,6 @@ tutti.editMarineLitterBatch.table.header.number.tip=Nombre d'objets tutti.editMarineLitterBatch.table.header.weight=Poids tutti.editMarineLitterBatch.table.header.weight.tip=Poids (kg) -tutti.editPlanktonBatch.table.header.comment=Commentaire -tutti.editPlanktonBatch.table.header.comment.tip=Commentaire -tutti.editPlanktonBatch.table.header.file=Pièces jointes -tutti.editPlanktonBatch.table.header.file.tip=Pièces jointes -tutti.editPlanktonBatch.table.header.sampleWeight=Poids échantillonné -tutti.editPlanktonBatch.table.header.sampleWeight.tip=Poids échantillonné -tutti.editPlanktonBatch.table.header.speciesByCode=Espèce -tutti.editPlanktonBatch.table.header.speciesByCode.tip=Espèce -tutti.editPlanktonBatch.table.header.speciesByGenusCode=Espèce -tutti.editPlanktonBatch.table.header.speciesByGenusCode.tip=Espèce -tutti.editPlanktonBatch.table.header.toConfirm=A Confirmer -tutti.editPlanktonBatch.table.header.toConfirm.tip=A Confirmer -tutti.editPlanktonBatch.table.header.weight=Poids -tutti.editPlanktonBatch.table.header.weight.tip=Poids tutti.editProgram.action.closeEditProgram=Fermer tutti.editProgram.action.closeEditProgram.mnemonic=r tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne, ou fermer l'éditeur suite à un enregistrement @@ -862,6 +848,7 @@ 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.deleteCache.error= 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 @@ -873,6 +860,7 @@ tutti.importPupitri.title=Import Pupitri tutti.importPupitri.trunkFile.extension=tnk tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) +tutti.io.directory.delete.error= tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total tutti.label.tab.accidental=Captures accidentelles

1 0

r892 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . individualobservation
by kmorin＠users.forge.codelutin.com April 30, 2013

April 30, 2013

Author: kmorin Date: 2013-04-30 10:56:13 +0200 (Tue, 30 Apr 2013) New Revision: 892 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/892 Log: fixes #2384 [CAPTURE] - Observations individuelles - Les poids des lots sont saisis en grammes mais pas convertis en kg pour la sauvegarde Removed: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-29 18:21:08 UTC (rev 891) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-30 08:56:13 UTC (rev 892) @@ -371,32 +371,6 @@ </JXTitledPanel> </JPanel> </tab> - - <tab id='planktonTab' title='tutti.label.tab.plancton'> -  - </tab> - - <tab id='accidentalTab'> - <JPanel id='accidentalTabPanel'> - <JXTitledPanel id='accidentalTabFishingOperationReminderLabel' - constraints='EditCatchesUIHandler.MAIN_CARD'> - <AccidentalBatchUI id='accidentalTabContent' - constructorParams='this'/> - </JXTitledPanel> - <JXTitledPanel id='accidentalTabCreateBatchReminderLabel' - constraints='EditCatchesUIHandler.CREATE_BATCH_CARD'> - <CreateAccidentalBatchUI id='accidentalTabCreateBatch' - constructorParams='this'/> - </JXTitledPanel> - <JXTitledPanel id='accidentalCaracteristicMapEditorReminderLabel' - constraints='EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD'> - <CaracteristicMapEditorUI id='accidentalCaracteristicMapEditor' - constructorParams='accidentalTabContent'/> - </JXTitledPanel> - </JPanel> - </tab> <tab id='individualObservationTab'> <JPanel id='individualObservationTabPanel'> <JXTitledPanel @@ -420,6 +394,25 @@ </JXTitledPanel> </JPanel> </tab> + <tab id='accidentalTab'> + <JPanel id='accidentalTabPanel'> + <JXTitledPanel id='accidentalTabFishingOperationReminderLabel' + constraints='EditCatchesUIHandler.MAIN_CARD'> + <AccidentalBatchUI id='accidentalTabContent' + constructorParams='this'/> + </JXTitledPanel> + <JXTitledPanel id='accidentalTabCreateBatchReminderLabel' + constraints='EditCatchesUIHandler.CREATE_BATCH_CARD'> + <CreateAccidentalBatchUI id='accidentalTabCreateBatch' + constructorParams='this'/> + </JXTitledPanel> + <JXTitledPanel id='accidentalCaracteristicMapEditorReminderLabel' + constraints='EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD'> + <CaracteristicMapEditorUI id='accidentalCaracteristicMapEditor' + constructorParams='accidentalTabContent'/> + </JXTitledPanel> + </JPanel> + </tab> </JTabbedPane>  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-29 18:21:08 UTC (rev 891) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-30 08:56:13 UTC (rev 892) @@ -79,6 +79,10 @@ public IndividualObservationBatchRowModel(IndividualObservationBatch aBatch) { this(); fromBean(aBatch); + Float weightInG = getWeight(); + if (weightInG != null) { + setWeight(weightInG * 1000.0f); + } } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-29 18:21:08 UTC (rev 891) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-30 08:56:13 UTC (rev 892) @@ -480,6 +480,13 @@ FishingOperation fishingOperation = getModel().getFishingOperation(); catchBean.setFishingOperation(fishingOperation); + + // convert grams into kilograms + Float weightInG = catchBean.getWeight(); + if (weightInG != null) { + catchBean.setWeight(weightInG / 1000.0f); + } + if (log.isInfoEnabled()) { log.info("Selected fishingOperation: " + fishingOperation.getId()); }

1 0

r891 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config tutti-persistence/src/main/resources/i18n tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/config tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com April 29, 2013

April 29, 2013

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)

1 0

r890 - in trunk: tutti-persistence/src/main/resources/i18n tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com April 29, 2013

April 29, 2013

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

1 0

r889 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/util/action resources/i18n
by kmorin＠users.forge.codelutin.com April 29, 2013

April 29, 2013

Author: kmorin Date: 2013-04-29 19:42:04 +0200 (Mon, 29 Apr 2013) New Revision: 889 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/889 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.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-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-04-29 17:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-04-29 17:42:04 UTC (rev 889) @@ -416,12 +416,12 @@ try { FileUtils.copyDirectory(source, target); } catch (IOException e) { - throw new RuntimeException("Could not copy directory content from " + source + " to " + target, e); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.prepareFirstDB.copyDirectory.error", source, target), e); } try { FileUtils.deleteDirectory(source.getParentFile()); } catch (IOException e) { - throw new RuntimeException("Could not delete temporary directory " + target, e); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error", target), e); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 17:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 17:42:04 UTC (rev 889) @@ -133,8 +133,7 @@ A result = ConstructorUtils.invokeConstructor(actionName, handler); return result; } catch (Exception e) { - throw new RuntimeException( - "Could not instanciate action " + actionName, e); + throw new TuttiTechnicalException(_("tutti.action.create.error", actionName), e); } } 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:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 17:42:04 UTC (rev 889) @@ -16,6 +16,8 @@ tutti.about.update.content= tutti.about.update.title= tutti.action.create.error= +tutti.applicationUpdater.prepareFirstDB.copyDirectory.error= +tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error= tutti.applicationUpdater.synchroDB.prepare.error= tutti.applicationUpdater.synchroDB.synchro.error= tutti.applicationUpdater.synchroDB.writeVersion.error= 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:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-29 17:42:04 UTC (rev 889) @@ -14,6 +14,8 @@ tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> tutti.about.update.title=Mise à jour Tutti tutti.action.create.error=Erreur à l'instanciation de l'action %s +tutti.applicationUpdater.prepareFirstDB.copyDirectory.error=Erreur lors de la copie du contenu du dossier %1s vers %2s +tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error=Erreur lors de la suppression du dossier %s tutti.applicationUpdater.synchroDB.prepare.error=Erreur lors de la préparation de la synchronisation de la base tutti.applicationUpdater.synchroDB.synchro.error=Erreur lors de la synchronisation de la base tutti.applicationUpdater.synchroDB.writeVersion.error=Erreur lors de l'écriture de la nouvelle version de la base de données dans le fichier %s

1 0

r888 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service java/fr/ifremer/tutti/service/protocol resources/i18n
by kmorin＠users.forge.codelutin.com April 29, 2013

April 29, 2013

Author: kmorin Date: 2013-04-29 19:38:12 +0200 (Mon, 29 Apr 2013) New Revision: 888 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/888 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.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-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-04-29 17:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-04-29 17:38:12 UTC (rev 888) @@ -190,10 +190,7 @@ if (result == null) { // can not find entity this is a big problem for us... - throw new RuntimeException( - "Could not find entity of type " + - entityType.getSimpleName() + " with '" + - propertyName + "' = " + value); + throw new TuttiTechnicalException(_("tutti.service.csv.parse.entityNotFound", entityType.getSimpleName(), propertyName, value)); } } return result; @@ -232,10 +229,8 @@ if (existingValues.contains(value)) { - // can not find entity this is a big problem for us... - throw new RuntimeException( - "Property '" + - propertyName + "' with value " + value + " is already defined."); + // entity already defined + throw new TuttiTechnicalException(_("tutti.service.csv.parse.entityAlreadyDefined", propertyName, value)); } } return value; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 17:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 17:38:12 UTC (rev 888) @@ -66,7 +66,7 @@ if (taxonIds.contains(referenceTaxonId)) { // duplicate reference taxon id used - throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error")); + throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error", referenceTaxonId)); } taxonIds.add(referenceTaxonId); return species; 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:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-29 17:38:12 UTC (rev 888) @@ -50,6 +50,8 @@ tutti.service.catches.computeWeights.species.error.incoherentSampleWeight= tutti.service.compressZipFile.error= tutti.service.context.serviceInstanciation.error= +tutti.service.csv.parse.entityAlreadyDefined= +tutti.service.csv.parse.entityNotFound= tutti.service.cvs.format.error= tutti.service.export.catches.error= tutti.service.export.context.error= @@ -119,6 +121,7 @@ tutti.service.protocol.export.species.error= tutti.service.protocol.import.benthos.error= tutti.service.protocol.import.species.error= +tutti.service.protocol.import.taxonUsed.error= tutti.service.pupitri.export.species.error= tutti.service.pupitri.import.carrousel.error= tutti.service.pupitri.import.trunk.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:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-29 17:38:12 UTC (rev 888) @@ -50,6 +50,8 @@ tutti.service.catches.computeWeights.species.error.incoherentSampleWeight=Le poids de sous-échantillon est supérieur au poids du lot. tutti.service.compressZipFile.error=Erreur lors de la compression du dossier %1s dans le fichier %2s tutti.service.context.serviceInstanciation.error=Erreur lors de l'instanciation du service %s +tutti.service.csv.parse.entityAlreadyDefined=La propriété %1s de valeur %2s est déjà définie +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.context.error=Erreur lors de la création des fichiers pour l'export @@ -94,6 +96,7 @@ tutti.service.protocol.export.species.error=Erreur lors de l'export des espèces dans le fichier %s tutti.service.protocol.import.benthos.error=Erreur lors de l'import du benthos du protocole %1s du fichier %2s tutti.service.protocol.import.species.error=Erreur lors de l'import des espèces du protocole %1s du fichier %2s +tutti.service.protocol.import.taxonUsed.error=Le taxon référent d'id %s est déjà utilisé tutti.service.pupitri.export.species.error=Erreur lors de l'export des espèces pour Pupitri dans le fichier %s tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier de carrousel %2s pour le trait %1s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trèmis %2s pour le trait %1s

1 0

Jenkins build became unstable: tutti #726
by admin+hudson＠codelutin.com April 29, 2013

April 29, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/726/changes>

1 2

Jenkins build became unstable: tutti » Tutti :: Service #726
by admin+hudson＠codelutin.com April 29, 2013

April 29, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/726/c…>

1 2

r887 - in trunk/tutti-persistence/src/main: java/fr/ifremer/tutti/persistence java/fr/ifremer/tutti/persistence/service/synchro resources/i18n
by kmorin＠users.forge.codelutin.com April 29, 2013

April 29, 2013

Author: kmorin Date: 2013-04-29 19:32:57 +0200 (Mon, 29 Apr 2013) New Revision: 887 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/887 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/service/synchro/TuttiDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.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 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:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 17:32:57 UTC (rev 887) @@ -29,6 +29,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,6 +41,8 @@ import java.util.Enumeration; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * A class loader that search first in a given directory before in parent * class loader. @@ -179,9 +182,7 @@ directories.toArray(new File[directories.size()])); loader = URLClassLoader.newInstance(urls, null); } catch (IOException e) { - throw new RuntimeException( - "Could not convert directories " + directories - + " to url.", e); + throw new TuttiTechnicalException(_("tutti.persistence.loader.error", directories), e); } } return loader; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java 2013-04-29 17:32:57 UTC (rev 887) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.mapping.Table; @@ -40,6 +41,8 @@ import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Tutti database metadatas. * @@ -61,8 +64,7 @@ this.delegate = new DatabaseMetadata(connection, dialect, true); this.meta = connection.getMetaData(); } catch (SQLException e) { - throw new RuntimeException( - "Could not init database meta on connection " + connection, e); + throw new TuttiTechnicalException(_("tutti.persistence.dbMetadata.instanciation.error", connection), e); } tables = Maps.newTreeMap(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java 2013-04-29 17:32:57 UTC (rev 887) @@ -28,6 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import org.hibernate.mapping.ForeignKey; import org.hibernate.tool.hbm2ddl.ColumnMetadata; @@ -43,6 +44,8 @@ import java.util.Set; import java.util.SortedSet; +import static org.nuiton.i18n.I18n._; + /** * Overrides of the {@link TableMetadata} with some improvements: * <ul> @@ -124,7 +127,7 @@ this.existingPrimaryKeysQuery = String.format(QUERY_SELECT_PRIMARY_KEYS, Joiner.on(',').join(pkNames), getName()); this.countQuery = String.format(QUERY_SELECT_COUNT, getName()); } catch (Exception e) { - throw new RuntimeException("Could not init " + this, e); + throw new TuttiTechnicalException(_("tutti.persistence.tableMetadata.instanciation.error", this), e); } } 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:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:32:57 UTC (rev 887) @@ -29,7 +29,11 @@ tutti.persistence.batch.validation.vracSpeciesNotFound= tutti.persistence.config.generateEnumFile.error= tutti.persistence.config.generateFile.error= +tutti.persistence.dbmetadata.instanciation.error= +tutti.persistence.dbmetadata.table.error= +tutti.persistence.loader.error= tutti.persistence.protocol.fromFile.error= +tutti.persistence.tableMetadata.instanciation.error= tutti.sampleCategoryType.age= tutti.sampleCategoryType.maturity= tutti.sampleCategoryType.sex= 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:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 17:32:57 UTC (rev 887) @@ -29,7 +29,10 @@ tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données 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.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 tutti.sampleCategoryType.maturity=Maturité tutti.sampleCategoryType.sex=Sexe

1 0

r886 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com April 29, 2013

April 29, 2013

Author: kmorin Date: 2013-04-29 19:16:30 +0200 (Mon, 29 Apr 2013) New Revision: 886 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/886 Log: make test succeed Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-29 17:11:09 UTC (rev 885) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-29 17:16:30 UTC (rev 886) @@ -121,8 +121,8 @@ BatchContainer<MarineLitterBatch> rootMarineLitterBatch; try { - rootMarineLitterBatch = getComputedMarineLitterBatches(fishingOperation, - catchBatch.getMarineLitterTotalWeight()); + Float weight = catchBatch == null ? null : catchBatch.getMarineLitterTotalWeight(); + rootMarineLitterBatch = getComputedMarineLitterBatches(fishingOperation, weight); } catch (TuttiBusinessException e) { result.put(fishingOperationId, e.getMessage());

1 0