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

Build failed in Jenkins: tutti » Tutti :: Service #844
by admin+hudson＠codelutin.com 28 May '13

28 May '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/844/c…> Changes: [Tony Chemit] fixes #2511: [TECH] mise à jour tutti-i18n ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Service 2.3-rc-1 [INFO] ------------------------------------------------------------------------ [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-service --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-service --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-service --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-service --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-service --- [INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-service --- [WARNING] bundle en_GB contains 244/244 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 19 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-service --- [INFO] Compiling 74 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[28,23] error: cannot find symbol [ERROR] symbol: class TuttiBusinessException location: package fr.ifremer.tutti <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[29,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[30,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[31,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[32,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[33,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[34,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[35,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[36,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[37,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[38,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[39,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[27,23] error: cannot find symbol [ERROR] symbol: class TuttiTechnicalException location: package fr.ifremer.tutti <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[28,23] error: cannot find symbol [ERROR] symbol: class TuttiBusinessException location: package fr.ifremer.tutti <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[29,23] error: cannot find symbol [ERROR] symbol: class TuttiIOUtil location: package fr.ifremer.tutti <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[30,35] error: package fr.ifremer.tutti.persistence does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[31,35] error: package fr.ifremer.tutti.persistence does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[32,35] error: package fr.ifremer.tutti.persistence does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[33,42] error: package fr.ifremer.tutti.persistence.config does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[34,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[35,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[36,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[37,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[38,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[39,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[40,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[41,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[42,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[43,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[44,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[45,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[46,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[47,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[48,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[49,53] error: package fr.ifremer.tutti.persistence.entities.protocol does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[50,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[51,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[52,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[53,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[54,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[55,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[56,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[57,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[58,43] error: package fr.ifremer.tutti.persistence.service does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[81,72] error: cannot find symbol [ERROR] symbol: class TuttiPersistence <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[27,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[28,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[29,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[30,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[31,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[32,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[33,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[34,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[35,53] error: package fr.ifremer.tutti.persistence.entities.protocol does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[27,23] error: cannot find symbol [ERROR] symbol: class LabelAware location: package fr.ifremer.tutti <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[28,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[29,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[30,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[31,49] error: package fr.ifremer.tutti.persistence.entities.data does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[32,53] error: package fr.ifremer.tutti.persistence.entities.protocol does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[33,53] error: package fr.ifremer.tutti.persistence.entities.protocol does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[34,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[35,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[36,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[37,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[38,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[39,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[40,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[41,56] error: package fr.ifremer.tutti.persistence.entities.referential does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[32,23] error: cannot find symbol [ERROR] symbol: class TuttiTechnicalException location: package fr.ifremer.tutti <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[33,35] error: package fr.ifremer.tutti.persistence does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[157,41] error: cannot find symbol [ERROR] symbol: class CatchBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[158,41] error: cannot find symbol [ERROR] symbol: class BatchContainer location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[158,56] error: cannot find symbol [ERROR] symbol: class SpeciesBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[159,41] error: cannot find symbol [ERROR] symbol: class BatchContainer location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[159,56] error: cannot find symbol [ERROR] symbol: class BenthosBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[160,41] error: cannot find symbol [ERROR] symbol: class BatchContainer location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[160,56] error: cannot find symbol [ERROR] symbol: class MarineLitterBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[338,66] error: cannot find symbol [ERROR] symbol: class FishingOperation location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[338,11] error: cannot find symbol [ERROR] symbol: class BatchContainer location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[338,26] error: cannot find symbol [ERROR] symbol: class SpeciesBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[358,40] error: cannot find symbol [ERROR] symbol: class SpeciesBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[490,66] error: cannot find symbol [ERROR] symbol: class FishingOperation location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[490,11] error: cannot find symbol [ERROR] symbol: class BatchContainer location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[490,26] error: cannot find symbol [ERROR] symbol: class BenthosBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[510,40] error: cannot find symbol [ERROR] symbol: class BenthosBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[641,76] error: cannot find symbol [ERROR] symbol: class FishingOperation location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[641,11] error: cannot find symbol [ERROR] symbol: class BatchContainer location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[641,26] error: cannot find symbol [ERROR] symbol: class MarineLitterBatch location: class TuttiWeightComputingService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[86,14] error: cannot find symbol [ERROR] symbol: class TuttiPersistence location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[301,16] error: cannot find symbol [ERROR] symbol: class Vessel location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[306,16] error: cannot find symbol [ERROR] symbol: class Vessel location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[311,16] error: cannot find symbol [ERROR] symbol: class Species location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[316,16] error: cannot find symbol [ERROR] symbol: class Species location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[321,39] error: cannot find symbol [ERROR] symbol: class TuttiProtocol location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[321,16] error: cannot find symbol [ERROR] symbol: class Species location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[326,47] error: cannot find symbol [ERROR] symbol: class TuttiProtocol location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[326,16] error: cannot find symbol [ERROR] symbol: class Species location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[331,11] error: cannot find symbol [ERROR] symbol: class Species location: class PersistenceService <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[336,16] error: cannot find symbol [INFO] 100 errors [INFO] -------------------------------------------------------------

1 1

r1018 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 28 May '13

28 May '13

Author: tchemit Date: 2013-05-28 09:39:21 +0200 (Tue, 28 May 2013) New Revision: 1018 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1018 Log: refs #2414: [IMP/EXP] - Export des donn?\195?\169es de campagne : format g?\195?\169n?\195?\169rique (finaliser) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-05-27 21:50:15 UTC (rev 1017) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-05-28 07:39:21 UTC (rev 1018) @@ -32,6 +32,10 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; @@ -94,6 +98,30 @@ } }; + public static final Predicate<SpeciesBatch> IS_VRAC_SPECIES_BATCH = new Predicate<SpeciesBatch>() { + + public boolean apply(SpeciesBatch input) { + return SampleCategoryEnum.sortedUnsorted == input.getSampleCategoryType() && + SortedUnsortedEnum.SORTED.getFieldValue().equals(input.getSampleCategoryValue()); + } + }; + + public static final Predicate<BenthosBatch> IS_VRAC_BENTHOS = new Predicate<BenthosBatch>() { + + public boolean apply(BenthosBatch input) { + return SampleCategoryEnum.sortedUnsorted == input.getSampleCategoryType() && + SortedUnsortedEnum.SORTED.getFieldValue().equals(input.getSampleCategoryValue()); + } + }; + + public static boolean isVracSpeciesBatch(SpeciesBatch speciesBatch) { + return IS_VRAC_SPECIES_BATCH.apply(speciesBatch); + } + + public static boolean isVracBenthosBatch(BenthosBatch benthosBatch) { + return IS_VRAC_BENTHOS.apply(benthosBatch); + } + /** Logger. */ private static final Log log = LogFactory.getLog(TuttiEntities.class); @@ -316,18 +344,6 @@ } } -// public static B newEntity(B entity) { -// return newEntity((Class) entity.getClass()); -// } - -// public static B newEntity(Class type) { -// try { -// return type.newInstance(); -// } catch (Exception e) { -// throw Throwables.propagate(e); -// } -// } - public static <K, V> void fillEntries(Map<K, V> map, Collection<K> keys, Function<K, V> function) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-05-27 21:50:15 UTC (rev 1017) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-05-28 07:39:21 UTC (rev 1018) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -112,7 +113,8 @@ FishingOperation operation, BatchContainer<SpeciesBatch> rootSpeciesBatch, BatchContainer<BenthosBatch> rootBenthosBatch, - Float catchRaisingFactor) { + Float speciesCatchRaisingFactor, + Float benthosCatchRaisingFactor) { for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { CatchExportRow row = new CatchExportRow(); @@ -120,9 +122,18 @@ row.setFishingOperation(operation); row.setSpecies(speciesBatch.getSpecies()); - prepareRows(persistenceService, row, rows, - speciesBatch, - catchRaisingFactor); + if (TuttiEntities.isVracSpeciesBatch(speciesBatch)) { + Float speciesTotalWeight = speciesBatch.getSampleCategoryWeight(); + if (speciesTotalWeight == null) { + speciesTotalWeight = speciesBatch.getSampleCategoryComputedWeight(); + } + prepareSortedRows(persistenceService, row, rows, + speciesBatch, + speciesCatchRaisingFactor / speciesTotalWeight); + } else { + prepareUnsortedRows(row, rows, speciesBatch); + } + } for (BenthosBatch benthosBatch : rootBenthosBatch.getChildren()) { CatchExportRow row = new CatchExportRow(); @@ -130,36 +141,36 @@ row.setFishingOperation(operation); row.setSpecies(benthosBatch.getSpecies()); - prepareRows(persistenceService, row, rows, - benthosBatch, - catchRaisingFactor); + if (TuttiEntities.isVracBenthosBatch(benthosBatch)) { + Float speciesTotalWeight = benthosBatch.getSampleCategoryWeight(); + if (speciesTotalWeight == null) { + speciesTotalWeight = benthosBatch.getSampleCategoryComputedWeight(); + } + prepareSortedRows(persistenceService, row, rows, + benthosBatch, + benthosCatchRaisingFactor / speciesTotalWeight); + } else { + prepareUnsortedRows(row, rows, benthosBatch); + } } } - public void prepareRows(PersistenceService persistenceService, - CatchExportRow currentRow, - List<CatchExportRow> rows, - SpeciesBatch speciesBatch, - Float catchRaisingFactor) { + protected void prepareSortedRows(PersistenceService persistenceService, + CatchExportRow currentRow, + List<CatchExportRow> rows, + SpeciesBatch speciesBatch, + Float catchRaisingFactor) { - ExportSampleCategory<Serializable> sampleCategory = - new ExportSampleCategory<Serializable>(); - SampleCategoryEnum sampleCategoryType = speciesBatch.getSampleCategoryType(); - Caracteristic caracteristic = sampleCategoryToCaracteristics.get(sampleCategoryType); - sampleCategory.setCategoryCaracteristic(caracteristic); - sampleCategory.setCategoryType(sampleCategoryType); - sampleCategory.setCategoryValue(speciesBatch.getSampleCategoryValue()); - sampleCategory.setCategoryWeight(speciesBatch.getSampleCategoryWeight()); - sampleCategory.setSampleWeight(speciesBatch.getWeight()); + prepareBatch(currentRow, + speciesBatch.getSampleCategoryType(), + speciesBatch.getSampleCategoryValue(), + speciesBatch.getSampleCategoryWeight(), + speciesBatch.getSampleCategoryComputedWeight(), + speciesBatch.getWeight(), + speciesBatch.getNumber(), + speciesBatch.getComputedNumber(), + speciesBatch.getRankOrder()); - sampleCategory.setComputedWeight(speciesBatch.getSampleCategoryComputedWeight()); - sampleCategory.setNumber(speciesBatch.getNumber()); - sampleCategory.setComputedNumber(speciesBatch.getComputedNumber()); - sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE); - sampleCategory.setRankOrder(speciesBatch.getRankOrder()); - - currentRow.addCategory(sampleCategory); - if (speciesBatch.isChildBatchsEmpty()) { // on a leaf, get frequencies @@ -167,119 +178,211 @@ List<SpeciesBatchFrequency> speciesBatchFrequency = persistenceService.getAllSpeciesBatchFrequency(speciesBatch.getId()); - if (CollectionUtils.isEmpty(speciesBatchFrequency) || - speciesBatchFrequency.get(0).getWeight()==null) { + speciesBatchFrequency.get(0).getWeight() == null) { // no frequency or frequencies with no weight - // simple denombrement + CatchExportRow row = currentRow.copy(); - Float batchWeight = speciesBatch.getSampleCategoryWeight(); + // Get reference weight - if (batchWeight == null) { - batchWeight = speciesBatch.getSampleCategoryComputedWeight(); - } - Float referenceWeight = speciesBatch.getWeight(); if (referenceWeight == null) { - referenceWeight = batchWeight; + referenceWeight = speciesBatch.getSampleCategoryWeight(); } + if (referenceWeight == null) { + referenceWeight = speciesBatch.getSampleCategoryComputedWeight(); + } + computeRaisingFactor(row, catchRaisingFactor, - batchWeight, referenceWeight); rows.add(row); } else { + + // there is some frequencies with weight + for (SpeciesBatchFrequency batchFrequency : speciesBatchFrequency) { CatchExportRow row = currentRow.copy(); row.setSpeciesFrequency(batchFrequency); rows.add(row); - Float batchWeight = speciesBatch.getComputedWeight(); - Float referenceWeight = batchFrequency.getWeight(); computeRaisingFactor(row, catchRaisingFactor, - batchWeight, referenceWeight); } } - } else { + // Yet another sample category to walk through + for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { - prepareRows(persistenceService, currentRow, rows, childBatch, catchRaisingFactor); + prepareSortedRows(persistenceService, + currentRow, + rows, + childBatch, + catchRaisingFactor); } } } - protected void computeRaisingFactor(CatchExportRow row, - float catchRaisingFactor, - float batchWeight, - float referenceWeight) { - float raisingFactor = catchRaisingFactor * (batchWeight / referenceWeight); + protected void prepareUnsortedRows(CatchExportRow currentRow, + List<CatchExportRow> rows, + SpeciesBatch speciesBatch) { - row.setReferenceWeight(referenceWeight); - row.setRaisingFactor(raisingFactor); + prepareBatch(currentRow, + speciesBatch.getSampleCategoryType(), + speciesBatch.getSampleCategoryValue(), + speciesBatch.getSampleCategoryWeight(), + speciesBatch.getSampleCategoryComputedWeight(), + speciesBatch.getWeight(), + speciesBatch.getNumber(), + speciesBatch.getComputedNumber(), + speciesBatch.getRankOrder()); + + CatchExportRow row = currentRow.copy(); + row.setReferenceWeight(speciesBatch.getSampleCategoryWeight()); + row.setRaisingFactor(1.f); + rows.add(row); } - public void prepareRows(PersistenceService persistenceService, - CatchExportRow currentRow, - List<CatchExportRow> rows, - BenthosBatch benthosBatch, - Float catchRaisingFactor) { + protected void prepareSortedRows(PersistenceService persistenceService, + CatchExportRow currentRow, + List<CatchExportRow> rows, + BenthosBatch benthosBatch, + Float catchRaisingFactor) { - ExportSampleCategory<Serializable> sampleCategory = - new ExportSampleCategory<Serializable>(); - SampleCategoryEnum sampleCategoryType = benthosBatch.getSampleCategoryType(); - Caracteristic caracteristic = sampleCategoryToCaracteristics.get(sampleCategoryType); - sampleCategory.setCategoryCaracteristic(caracteristic); - sampleCategory.setCategoryType(sampleCategoryType); - sampleCategory.setCategoryValue(benthosBatch.getSampleCategoryValue()); - sampleCategory.setCategoryWeight(benthosBatch.getSampleCategoryWeight()); - sampleCategory.setSampleWeight(benthosBatch.getWeight()); + prepareBatch(currentRow, + benthosBatch.getSampleCategoryType(), + benthosBatch.getSampleCategoryValue(), + benthosBatch.getSampleCategoryWeight(), + benthosBatch.getSampleCategoryComputedWeight(), + benthosBatch.getWeight(), + benthosBatch.getNumber(), + benthosBatch.getComputedNumber(), + benthosBatch.getRankOrder()); - sampleCategory.setComputedWeight(benthosBatch.getSampleCategoryComputedWeight()); - sampleCategory.setNumber(benthosBatch.getNumber()); - sampleCategory.setComputedNumber(benthosBatch.getComputedNumber()); - sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE); - sampleCategory.setRankOrder(benthosBatch.getRankOrder()); - - currentRow.addCategory(sampleCategory); - if (benthosBatch.isChildBatchsEmpty()) { // on a leaf, get frequencies - List<BenthosBatchFrequency> speciesBatchFrequency = + List<BenthosBatchFrequency> benthosBatchFrequency = persistenceService.getAllBenthosBatchFrequency(benthosBatch.getId()); - if (CollectionUtils.isEmpty(speciesBatchFrequency)) { + if (CollectionUtils.isEmpty(benthosBatchFrequency) || + benthosBatchFrequency.get(0).getWeight() == null) { - // no frequency - // simple denombrement - rows.add(currentRow.copy()); + // no frequency or frequencies with no weight + + CatchExportRow row = currentRow.copy(); + + // Get reference weight + + Float referenceWeight = benthosBatch.getWeight(); + + if (referenceWeight == null) { + referenceWeight = benthosBatch.getSampleCategoryWeight(); + } + + if (referenceWeight == null) { + referenceWeight = benthosBatch.getSampleCategoryComputedWeight(); + } + + computeRaisingFactor(row, + catchRaisingFactor, + referenceWeight); + rows.add(row); } else { - for (BenthosBatchFrequency batchFrequency : speciesBatchFrequency) { + + // there is some frequencies with weight + + for (BenthosBatchFrequency batchFrequency : benthosBatchFrequency) { CatchExportRow row = currentRow.copy(); row.setBenthosFrequency(batchFrequency); rows.add(row); + + Float referenceWeight = batchFrequency.getWeight(); + + computeRaisingFactor(row, catchRaisingFactor, referenceWeight); } } } else { + // Yet another sample category to walk through + for (BenthosBatch childBatch : benthosBatch.getChildBatchs()) { - prepareRows(persistenceService, currentRow, rows, childBatch, catchRaisingFactor); + prepareSortedRows(persistenceService, + currentRow, + rows, + childBatch, + catchRaisingFactor); } } } + protected void prepareUnsortedRows(CatchExportRow currentRow, + List<CatchExportRow> rows, + BenthosBatch benthosBatch) { + + prepareBatch(currentRow, + benthosBatch.getSampleCategoryType(), + benthosBatch.getSampleCategoryValue(), + benthosBatch.getSampleCategoryWeight(), + benthosBatch.getSampleCategoryComputedWeight(), + benthosBatch.getWeight(), + benthosBatch.getNumber(), + benthosBatch.getComputedNumber(), + benthosBatch.getRankOrder()); + + CatchExportRow row = currentRow.copy(); + row.setReferenceWeight(benthosBatch.getSampleCategoryWeight()); + row.setRaisingFactor(1.f); + rows.add(row); + } + + protected void computeRaisingFactor(CatchExportRow row, + float catchRaisingFactor, + float referenceWeight) { + float raisingFactor = referenceWeight / catchRaisingFactor; + row.setReferenceWeight(referenceWeight); + row.setRaisingFactor(raisingFactor); + } + + protected void prepareBatch(CatchExportRow currentRow, + SampleCategoryEnum sampleCategoryType, + Serializable sampleCategoryValue, + Float sampleCategoryWeight, + Float sampleCategoryComputedWeight, + Float batchWeight, + Integer batchNumber, + Integer batchComputedNumber, + Integer batchRankOrder + ) { + ExportSampleCategory<Serializable> sampleCategory = + new ExportSampleCategory<Serializable>(); + Caracteristic caracteristic = sampleCategoryToCaracteristics.get(sampleCategoryType); + sampleCategory.setCategoryCaracteristic(caracteristic); + sampleCategory.setCategoryType(sampleCategoryType); + sampleCategory.setCategoryValue(sampleCategoryValue); + sampleCategory.setCategoryWeight(sampleCategoryWeight); + sampleCategory.setSampleWeight(batchWeight); + + sampleCategory.setComputedWeight(sampleCategoryComputedWeight); + sampleCategory.setNumber(batchNumber); + sampleCategory.setComputedNumber(batchComputedNumber); + sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE); + sampleCategory.setRankOrder(batchRankOrder); + + currentRow.addCategory(sampleCategory); + } + protected void addSampleCategory(String headerPrefix, String categoryName) { newNullableColumnForExport(headerPrefix, categoryName + "." + ExportSampleCategory.PROPERTY_CATEGORY_VALUE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); newNullableColumnForExport("Num_Ordre_" + headerPrefix + "_H2", categoryName + "." + ExportSampleCategory.PROPERTY_RANK_ORDER, TuttiCsvUtil.INTEGER); 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-05-27 21:50:15 UTC (rev 1017) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-28 07:39:21 UTC (rev 1018) @@ -511,20 +511,22 @@ rootSpeciesBatch, rootBenthosBatch); - Float catchRaisingFactor; + Float totalWeight = catchBatch.getCatchTotalWeight(); if (totalWeight == null) { totalWeight = catchBatch.getCatchTotalComputedWeight(); } - Float totalSortedWeight = catchBatch.getCatchTotalSortedComputedWeight(); - Float totalUnsortedWeight = catchBatch.getCatchTotalUnsortedComputedWeight(); - catchRaisingFactor = totalWeight / (totalSortedWeight + totalUnsortedWeight); + Float totalSpeciesWeight = catchBatch.getSpeciesTotalSampleSortedComputedWeight(); + Float totalBenthosWeight = catchBatch.getBenthosTotalSampleSortedComputedWeight(); + Float speciesCatchRaisingFactor =(totalWeight-totalUnsortedWeight) / (totalSpeciesWeight); + Float benthosCatchRaisingFactor =(totalWeight-totalUnsortedWeight) / (totalBenthosWeight); + List<CatchExportRow> rows = Lists.newArrayList(); exportContext.catchModel.prepareRows(persistenceService, rows, @@ -532,7 +534,8 @@ operation, rootSpeciesBatch, rootBenthosBatch, - catchRaisingFactor); + speciesCatchRaisingFactor, + benthosCatchRaisingFactor); exportContext.catchExport.write(rows, exportContext.catchWriter); }

1 0

r1017 - in trunk: tutti-persistence/src/main/resources/i18n tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 23:50:15 +0200 (Mon, 27 May 2013) New Revision: 1017 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1017 Log: fixes #2511: [TECH] mise ?\195?\160 jour tutti-i18n Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 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-05-27 18:44:37 UTC (rev 1016) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-05-27 21:50:15 UTC (rev 1017) @@ -6,14 +6,14 @@ tutti.config.option.persistence.db.name.description=Nom du fichier de la base de données tutti.config.option.persistence.db.protocol.directory.description=Répertoire où sont conservés les protocoles tutti.config.option.persistence.hibernate.dialect.description=Le dialecte hibernate utilisée pour communiquer avec la base de données -tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requêtes sql générées. +tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requêtes sql générées tutti.config.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requête sql dans les logs tutti.config.option.persistence.hibernate.useSqlComment.description=Option pour ajouter les commentaires dans les requêtes sql générées tutti.config.option.persistence.jdbc.driver.description=Le pilote JDBC utilisé pour communiquer avec la base de données tutti.config.option.persistence.jdbc.password.description=Mot de passe de l'utilisateur pour se connecter à la base de données tutti.config.option.persistence.jdbc.url.description=URL de connexion à la base de données tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données -tutti.config.persistence=Configuration de la persistance de Tutti +tutti.config.persistence=Configuration de la persistance de l'application tutti.persistence.attachment.copyFile.error=Erreur lors de la copie de la pièce jointe %1s dans le fichier %2s tutti.persistence.attachment.deleteFile.error=Erreur lors de la suppression de la pièce jointe %s tutti.persistence.batch.validation.horsVracBenthosNotFound=Lot 'Hors Vrac > Benthos' non trouvé ou configuré avec d'autres critères de classement. @@ -38,9 +38,9 @@ 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.delete.error=Erreur lors de la suppression du protocole %1s (fichier %2s) -tutti.persistence.protocol.fromFile.error=Erreur lors de l'import du protocol du fichier %s -tutti.persistence.synchronizeReferential.prepare.step1=Connection à la base de synchronisation -tutti.persistence.synchronizeReferential.prepare.step2=Connection à la base à synchroniser +tutti.persistence.protocol.fromFile.error=Erreur lors de l'import du protocole du fichier %s +tutti.persistence.synchronizeReferential.prepare.step1=Connexion à la base de synchronisation +tutti.persistence.synchronizeReferential.prepare.step2=Connexion à la base à synchroniser tutti.persistence.synchronizeReferential.prepare.step3=Vérification de la compatibilité des schémas tutti.persistence.synchronizeReferential.prepare.step4=Lecture de la table %s tutti.persistence.synchronizeReferential.synchronize.step1=Mise à jour de la table %s 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-05-27 18:44:37 UTC (rev 1016) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-27 21:50:15 UTC (rev 1017) @@ -2,13 +2,13 @@ tutti.config.option.csv.separator.description=Caractère séparateur pour les import / export de fichier au format csv. tutti.config.option.data.directory.description=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). tutti.config.option.export.countryId.description=L'id du pays à utiliser pour les exports (il s'agit de la valeur LOCATION.ID). -tutti.config.option.inceptionYear.description=Année de démarrage du projet. +tutti.config.option.inceptionYear.description=Année de démarrage du projet tutti.config.option.organizationName.description=Nom de l'organisation dans la licence tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage tutti.config.option.site.url.description=Url du site internet de l'application tutti.config.option.tmp.directory.description=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application). tutti.config.option.version.description=Version courante de l'application -tutti.config.service=Configuration des services de Tutti +tutti.config.service=Configuration des services de l'application tutti.property.attachment=Pièce jointe tutti.property.caracteristic=Caractéristique tutti.property.country=Pays @@ -56,7 +56,7 @@ 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.cvs.format.error=Erreur lors du formatage 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 @@ -134,7 +134,7 @@ 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 +tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s tutti.service.referential.export.species.error=Erreur lors de l'export des espèces dans le fichier %s @@ -206,8 +206,8 @@ tutti.validator.export.message.warning=\t- [WARNING] %s tutti.validator.export.operation=* %s \: tutti.validator.warning.benthos.protocolNotRespected=Un lot du benthos ne suit pas les recommandations du protocole -tutti.validator.warning.fishingOperation.batch.notFound=Pas d'arbre d'échantilonnage trouvé -tutti.validator.warning.fishingOperation.invalid.batch.model=Arbre d'échantilonnage non compatible avec Tutti +tutti.validator.warning.fishingOperation.batch.notFound=Pas d'arbre d’échantillonnage trouvé +tutti.validator.warning.fishingOperation.invalid.batch.model=Arbre d’échantillonnage non compatible avec l'application tutti.validator.warning.latitude.outOfBounds=La Latitude doit être comprise entre -90.0 et 90.0 tutti.validator.warning.longitude.outOfBounds=La longitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.marineLitter.weight.required=Un lot de macro-déchets n'a pas de poids 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-05-27 18:44:37 UTC (rev 1016) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-27 21:50:15 UTC (rev 1017) @@ -1,9 +1,9 @@ -swing.error.cannot.mail=Erreur lors de l'ouverture du client mail. -swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de Tutti. -swing.error.cannot.open.link=Impossible d'ouvrir le fichier %s. -swing.error.desktop.browse.not.supported=Le navigateur n'a pas pu être ouvert. Vérifiez que vous avez défini un navigateur par défaut dans votre système. -swing.error.desktop.mail.not.supported=Le client mail n'a pas pu être ouvert. Vérifiez que vous avez défini un client mail par défaut dans votre système. -swing.error.desktop.not.supported=Votre système ne permet pas d'ouvrir des liens ou fichiers en dehors de Tutti. +swing.error.cannot.mail=Erreur lors de l'ouverture du client mail +swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de l'application +swing.error.cannot.open.link=Impossible d'ouvrir le fichier %s +swing.error.desktop.browse.not.supported=Le navigateur n'a pas pu être ouvert. Vérifiez que vous avez défini un navigateur par défaut dans votre système +swing.error.desktop.mail.not.supported=Le client mail n'a pas pu être ouvert. Vérifiez que vous avez défini un client mail par défaut dans votre système +swing.error.desktop.not.supported=Votre système ne permet pas d'ouvrir des liens ou fichiers en dehors de l'application tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Tutti</h3>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.<hr/> Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>. tutti.about.title=À propos de Tutti @@ -21,7 +21,7 @@ tutti.applicationUpdater.startUpdate.help=Téléchargement et installation d'une nouvelle version de l'aide (version %s) tutti.applicationUpdater.startUpdate.i18n=Téléchargement et installation d'une nouvelle version des traductions (version %s) tutti.applicationUpdater.startUpdate.jre=Téléchargement et installation d'une nouvelle JRE (version %s) -tutti.applicationUpdater.startUpdate.tutti=Téléchargement et installation d'une nouvelle version de Tutti (version %s) +tutti.applicationUpdater.startUpdate.tutti=Téléchargement et installation d'une nouvelle version de l'application (version %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 @@ -47,12 +47,12 @@ tutti.attachmentEditor.none.tip=Pas de pièce-jointes tutti.attachmentEditor.saveAttachment.button=Enregistrer tutti.attachmentEditor.saveAttachment.error.message=Erreur lors de l'enregistrement de la pièce jointe %1s dans le fichier %2s -tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier. -tutti.attachmentEditor.saveAttachment.fail.title=Erreur de sauvegarde. -tutti.attachmentEditor.saveAttachment.success.message=Le fichier %s a été sauvegardé sur votre machine. +tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier +tutti.attachmentEditor.saveAttachment.fail.title=Erreur de sauvegarde +tutti.attachmentEditor.saveAttachment.success.message=Le fichier %s a été sauvegardé sur votre machine tutti.attachmentEditor.saveAttachment.title=Enregistrer la pièce-jointe tutti.attachmentEditor.saveAttachment.warning.help=Que voulez-vous faire ?<ul><li>Non pour annuler la sauvegarde</li><li>Oui pour écraser le fichier existant</li></ul> -tutti.attachmentEditor.saveAttachment.warning.message=Vous êtes sur le point d'écraser un fichier existant. +tutti.attachmentEditor.saveAttachment.warning.message=Vous êtes sur le point d'écraser un fichier existant tutti.attachmentEditor.saveAttachment.warning.title=Fichier existant tutti.attachmentEditor.text=(%s) tutti.attachmentEditor.title=Pièces jointes @@ -68,7 +68,7 @@ tutti.common.askCancelEditBeforeLeaving.help=Que voulez-vous faire ?<ul><li>Annuler pour rester sur cet écran</li><li>OK pour quitter l'écran en abandonnant les modifications</li></ul> tutti.common.askCancelEditBeforeLeaving.title=Modifications non enregistrées mais invalides tutti.common.askOverwriteFile.help=Que voulez-vous faire ?<ul><li>Annuler pour ne pas écraser le fichier et annuler l'opération</li><li>Oui pour écraser le fichier et continuer l'opération</li></ul> -tutti.common.askOverwriteFile.message=Le fichier %s existe déjà, confirmer pour l'écraser. +tutti.common.askOverwriteFile.message=Le fichier %s existe déjà, confirmer pour l'écraser tutti.common.askOverwriteFile.title=Confirmer l'écrasement d'un fichier... tutti.common.askSaveBeforeLeaving.help=Que voulez-vous faire?<ul><li>Annuler pour rester sur cet écran</li><li>Non pour quitter l'écran en abandonnant les modifications en cours</li><li>Oui pour quitter l'écran après enregistrement des modifications</li></ul> tutti.common.askSaveBeforeLeaving.title=Modifications non enregistrées @@ -91,7 +91,7 @@ tutti.config.action.reload.actions=Recharger les actions tutti.config.action.reload.application=Recharger l'application tutti.config.action.reload.ui=Recharger l'interface graphique -tutti.config.action.sampleOrder.tip=Réordonner les catégories d'échantilonnage +tutti.config.action.sampleOrder.tip=Réordonner les catégories d’échantillonnage tutti.config.application=Configuration de l'application Tutti tutti.config.category.applications=Application tutti.config.category.applications.description=Application @@ -120,7 +120,7 @@ tutti.config.option.ui.shortcut.closePopup.description=Fermer une popup tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie tutti.config.option.update.url.description=URL de mise à jour -tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie. +tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.sampleOrder.title=Catégorie d'échantillonnage tutti.config.save.error=Erreur lors de la sauvegarde de la configuration dans le fichier %s @@ -216,17 +216,17 @@ tutti.createSpeciesBatch.title=Créer un lot tutti.createSpeciesMelag.action.cancel=Annuler tutti.createSpeciesMelag.action.cancel.mnemonic=A -tutti.createSpeciesMelag.action.cancel.tip=Annuler la création du MELAG +tutti.createSpeciesMelag.action.cancel.tip=Annuler la création du MELAG (mélange) tutti.createSpeciesMelag.action.validate=Valider tutti.createSpeciesMelag.action.validate.mnemonic=V -tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG +tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG (mélange) tutti.createSpeciesMelag.comment.part1=Traitement issu d'un mélange composé de \:\n tutti.createSpeciesMelag.comment.part2=- %skg de %s\n tutti.createSpeciesMelag.comment.part3=avec un poids d'élévation de %skg tutti.createSpeciesMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createSpeciesMelag.error.title=Erreur -tutti.createSpeciesMelag.message=Combien pesait le MELAG (kg) ? -tutti.createSpeciesMelag.title=Poids du MELAG (kg) +tutti.createSpeciesMelag.message=Combien pesait le MELAG (mélange) (kg) ? +tutti.createSpeciesMelag.title=Poids du MELAG (mélange) (kg) tutti.dbMabager.title=Gérer les bases de données tutti.dbManager.action.chooseDbExportFile=Exporter la base de données tutti.dbManager.action.chooseDbFile=Choisir la base à importer @@ -236,7 +236,7 @@ tutti.dbManager.action.closeDb.tip=Fermer la base de données en cours d'utilisation tutti.dbManager.action.exportAndCleanDb=Exporter et supprimer tutti.dbManager.action.exportAndCleanDb.mnemonic=s -tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de Tutti +tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de l'application tutti.dbManager.action.exportDb=Exporter tutti.dbManager.action.exportDb.mnemonic=x tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip @@ -247,7 +247,7 @@ tutti.dbManager.action.installDb.mnemonic=n tutti.dbManager.action.installDb.tip=Télécharger puis installer la base de données tutti.dbManager.action.openDb=Ouvrir -tutti.dbManager.action.openDb.couldNotOpen=Impossible d'ouvrir la base, elle est peut-être déjà utilisée par une autre application (ou une autre instance de Tutti). +tutti.dbManager.action.openDb.couldNotOpen=Impossible d'ouvrir la base, elle est peut-être déjà utilisée par une autre application (ou une autre instance de l'application) tutti.dbManager.action.openDb.mnemonic=O tutti.dbManager.action.openDb.tip=Ouvrir la base de données tutti.dbManager.action.upgradeDb=Vérifier les mises à jour @@ -256,10 +256,10 @@ tutti.dbManager.action.upgradeDb.opening=Ouverture de la base de données tutti.dbManager.action.upgradeDb.reloading=Rechargement de la base de données tutti.dbManager.action.upgradeDb.tip=Mettre à jour les référentiels si nécessaire -tutti.dbManager.action.upgradeDb.upToDate=Aucune mise à jour de base détectée. +tutti.dbManager.action.upgradeDb.upToDate=Aucune mise à jour de base détectée tutti.dbManager.info.db.loaded=Tutti est connecté à une base de données<hr/>Url de connexion \: %s -tutti.dbManager.info.no.db.exist=Aucune base détectée, vous pouvez installer la dernière disponible sur le réseau ou bien en importer une. -tutti.dbManager.info.no.db.loaded=Tutti possède une base (%s). Elle n'a pas pu être ouverte, elle doit être probablement utilisée par une autre application.<hr/>Quitter les applications l'utilisant puis redémarrer Tutti. +tutti.dbManager.info.no.db.exist=Aucune base détectée, vous pouvez installer la dernière disponible sur le réseau ou bien en importer une +tutti.dbManager.info.no.db.loaded=L'application possède une base (%s). Elle n'a pas pu être ouverte, elle doit être probablement utilisée par une autre application.<hr/>Quitter les applications l'utilisant puis redémarrer tutti.dbManager.title.choose.dbExportFile=Exporter la base de données tutti.dbManager.title.choose.dbImportFile=Importer la base de données tutti.editAccidentalBatch.action.createBatch=Créer une capture accidentelle @@ -303,9 +303,9 @@ tutti.editBenthosBatch.action.createBatch=Créer un lot pour une espèce tutti.editBenthosBatch.action.createBatch.mnemonic=C tutti.editBenthosBatch.action.createBatch.tip=Créer un nouveau lot pour une espèce -tutti.editBenthosBatch.action.createMelag=Espèces d'un MELAG +tutti.editBenthosBatch.action.createMelag=Espèces d'un MELAG (mélange) tutti.editBenthosBatch.action.createMelag.mnemonic=C -tutti.editBenthosBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +tutti.editBenthosBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG (mélange) tutti.editBenthosBatch.action.editFrequencies=Mensurations tutti.editBenthosBatch.action.editFrequencies.mnemonic=M tutti.editBenthosBatch.action.editFrequencies.tip=Éditer les mensurations @@ -348,7 +348,7 @@ tutti.editBenthosBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces de type benthos dans la capture tutti.editBenthosBatch.field.benthosTotalWeight=Poids TOTAL (kg) -tutti.editBenthosBatch.field.benthosTotalWeight.tip=Poids total des espèces de type benthos dans la capture (Vrav + Hors Vrac) +tutti.editBenthosBatch.field.benthosTotalWeight.tip=Poids total des espèces de type benthos dans la capture (Vrac + Hors Vrac) tutti.editBenthosBatch.filterBatch=Filtre tutti.editBenthosBatch.filterBatch.mode.all=Aucun tutti.editBenthosBatch.filterBatch.mode.all.tip=Pas de filtre (tous les lots sont visibles) @@ -373,7 +373,7 @@ tutti.editBenthosBatch.table.header.sexCategory=Sexe tutti.editBenthosBatch.table.header.sexCategory.tip=Sexe des individus du lot tutti.editBenthosBatch.table.header.sizeCategory=Class. Tri -tutti.editBenthosBatch.table.header.sizeCategory.tip=Classe de taille (petis, gros, …) des individus du lot +tutti.editBenthosBatch.table.header.sizeCategory.tip=Classe de taille (petits, gros, …) des individus du lot tutti.editBenthosBatch.table.header.sortedUnsortedCategory=V/HV (kg) tutti.editBenthosBatch.table.header.sortedUnsortedCategory.tip=V \= Vrac ; HV \= Hors Vrac (espèces rares, de grande taille etc. sorties de la capture) tutti.editBenthosBatch.table.header.species=Espèce @@ -407,7 +407,7 @@ tutti.editBenthosFrequencies.field.mode.simple=Mode simple tutti.editBenthosFrequencies.field.mode.simple.tip=Mode par défaut on on doit tout saisir (les classes de tailles et les nombres) tutti.editBenthosFrequencies.field.mode.simpleCounting=Mode simple dénombrement -tutti.editBenthosFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole. +tutti.editBenthosFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole tutti.editBenthosFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editBenthosFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées tutti.editBenthosFrequencies.field.simpleCounting=Nombre @@ -435,8 +435,8 @@ tutti.editCatchBatch.action.saveCatchBatch=Enregistrer tutti.editCatchBatch.action.saveCatchBatch.mnemonic=S tutti.editCatchBatch.action.saveCatchBatch.tip=Enregistrer la capture -tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée. -tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées. +tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée +tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip=Poids du VRAC trié dans le benthos tutti.editCatchBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) @@ -447,8 +447,8 @@ tutti.editCatchBatch.field.benthosTotalWeight.tip=Poids total du benthos dans la capture (\= poids total Vrac + poids total Hors Vrac) tutti.editCatchBatch.field.catchTotalRejectedWeight=Poids total NON TRIÉ (kg) tutti.editCatchBatch.field.catchTotalRejectedWeight.tip=Poids de la fraction non triée à bord -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Caroussel observé -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance caroussel +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Carrousel observé +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance carrousel tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance trémie et envoyée sur la chaîne de tri tutti.editCatchBatch.field.catchTotalSortedWeight=Poids total VRAC (kg) @@ -487,8 +487,8 @@ tutti.editCruise.action.saveCruise.tip=Enregistrer la campagne tutti.editCruise.action.viewGearCaracteristics=Voir tutti.editCruise.action.viewGearCaracteristics.tip=Voir les caractéristiques de l'engin -tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée. -tutti.editCruise.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées. +tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée +tutti.editCruise.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées tutti.editCruise.field.beginDate=Date de début tutti.editCruise.field.beginDate.tip=Date de début de la campagne tutti.editCruise.field.comment=Commentaire @@ -546,9 +546,9 @@ tutti.editFishingOperation.action.saveEditFishingOperation.mnemonic=E tutti.editFishingOperation.action.saveEditFishingOperation.tip=Enregistrer le trait tutti.editFishingOperation.action.saveFishingOperation=Enregistrer -tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré. -tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation=Le trait n'a pas été créé. -tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées. +tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré +tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation=Le trait n'a pas été créé +tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées tutti.editFishingOperation.duration.format=dj Hh m'm' tutti.editFishingOperation.field.comment=Commentaire tutti.editFishingOperation.field.comment.tip=Commentaire sur le trait @@ -687,8 +687,8 @@ tutti.editMarineLitterBatch.action.removeBatch.confirm.title=Suppression d'un lot de déchets tutti.editMarineLitterBatch.action.removeBatch.mnemonic=S tutti.editMarineLitterBatch.action.removeBatch.tip=Supprimer la ligne sélectionnée -tutti.editMarineLitterBatch.field.marineLitterTotalWeight=Poids total (Kg) -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.tip=Poids total (Kg) +tutti.editMarineLitterBatch.field.marineLitterTotalWeight=Poids total (kg) +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.tip=Poids total (kg) tutti.editMarineLitterBatch.table.header.comment=Commentaire tutti.editMarineLitterBatch.table.header.comment.tip=Commentaire tutti.editMarineLitterBatch.table.header.file=Pièces jointes @@ -707,8 +707,8 @@ tutti.editProgram.action.saveProgram=Enregistrer tutti.editProgram.action.saveProgram.mnemonic=E tutti.editProgram.action.saveProgram.tip=Enregistrer les modifications -tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. -tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. +tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée +tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées tutti.editProgram.field.description=Description tutti.editProgram.field.description.tip=Description de la série, champ obligatoire tutti.editProgram.field.name=Nom @@ -718,7 +718,7 @@ tutti.editProgram.title.create.program=Créer une nouvelle série de campagne tutti.editProgram.title.edit.program=Éditer une série de campagne existante tutti.editProtocol.action.addBenthosProtocol.mnemonic=j -tutti.editProtocol.action.addBenthosProtocol.tip=Ajouter un benthos au protocole +tutti.editProtocol.action.addBenthosProtocol.tip=Ajouter une espèce du benthos au protocole tutti.editProtocol.action.addSpeciesProtocol.mnemonic=j tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole tutti.editProtocol.action.chooseProtocolBenthosFile=Choisir le fichier des benthos @@ -730,9 +730,9 @@ tutti.editProtocol.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic=t tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) -tutti.editProtocol.action.exportProtocolBenthos=Exporter les benthos +tutti.editProtocol.action.exportProtocolBenthos=Exporter les espèces du benthos tutti.editProtocol.action.exportProtocolBenthos.mnemonic=b -tutti.editProtocol.action.exportProtocolBenthos.tip=Exporter les benthos du protocole +tutti.editProtocol.action.exportProtocolBenthos.tip=Exporter les espèce du benthos du protocole tutti.editProtocol.action.exportProtocolCaracteristic=Exporter les caractéristiques tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic=c tutti.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole @@ -766,8 +766,8 @@ tutti.editProtocol.action.selectOtherSpecies=... tutti.editProtocol.action.selectOtherSpecies.mnemonic=. tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce (dans les synonymes) -tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré. -tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées. +tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré +tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées tutti.editProtocol.field.benthos.tip=Benthos tutti.editProtocol.field.comment=Commentaire tutti.editProtocol.field.comment.tip=Commentaire @@ -782,7 +782,7 @@ tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.table.header.age=Age -tutti.editProtocol.table.header.age.tip=Catégorisation sur l'âge ? (usage pour les coquilles st jacques) +tutti.editProtocol.table.header.age.tip=Catégorisation sur l'âge ? (usage pour les coquilles st jacques par exemple) tutti.editProtocol.table.header.calcifySample=Prélèvement de pièces calcifiées tutti.editProtocol.table.header.calcifySample.tip=Prélèvement de pièces calcifiées (pour les données individuelles) tutti.editProtocol.table.header.countIfNoFrequency=Dénombrement @@ -798,7 +798,7 @@ tutti.editProtocol.table.header.speciesReferenceTaxonId=Espèce tutti.editProtocol.table.header.speciesReferenceTaxonId.tip=Code Rubin – Nom scientifique tutti.editProtocol.table.header.speciesSurveyCode=Code campagne -tutti.editProtocol.table.header.speciesSurveyCode.tip=Code campagne (non synchronisable dans H2) +tutti.editProtocol.table.header.speciesSurveyCode.tip=Code campagne (non synchronisable dans Harmonie) tutti.editProtocol.table.header.weight=Pesée tutti.editProtocol.table.header.weight.tip=L'espèce doit elle être pesée ? tutti.editProtocol.title.choose.benthosExportFile=Exporter les benthos @@ -814,9 +814,9 @@ tutti.editSpeciesBatch.action.createBatch=Créer un lot pour une espèce tutti.editSpeciesBatch.action.createBatch.mnemonic=C tutti.editSpeciesBatch.action.createBatch.tip=Créer un nouveau lot pour une espèce -tutti.editSpeciesBatch.action.createMelag=Espèces d'un MELAG +tutti.editSpeciesBatch.action.createMelag=Espèces d'un MELAG (mélange) tutti.editSpeciesBatch.action.createMelag.mnemonic=C -tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG (mélange) tutti.editSpeciesBatch.action.editFrequencies=Mensurations tutti.editSpeciesBatch.action.editFrequencies.mnemonic=M tutti.editSpeciesBatch.action.editFrequencies.tip=Éditer les mensurations @@ -876,7 +876,7 @@ tutti.editSpeciesBatch.filterBatch.mode.root.tip=Voir uniquement les lots *parents* tutti.editSpeciesBatch.filterSpeciesBatch.tip=Pour filtrer les lots tutti.editSpeciesBatch.split.weightNotNull.help=Que voulez-vous faire ? <ul><li>Annuler pour ne pas catégoriser le lot et garder le poids sous-échantilloné</li><li>OK pour catégoriser le lot et supprimer le poids sous-échantillonné</li></ul>. -tutti.editSpeciesBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné. +tutti.editSpeciesBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul tutti.editSpeciesBatch.table.header.ageCategory=Age tutti.editSpeciesBatch.table.header.comment=Commentaire @@ -955,7 +955,7 @@ tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s) tutti.fishingOperations.title.validate.operations=Validation des opérations de pêches (%s) -tutti.fishingOperations.warn.catchBatch.notFound=Pas d'arbre d'échantillonage associé à l'opération de pêche. +tutti.fishingOperations.warn.catchBatch.notFound=Pas d'arbre d’échantillonnage associé à l'opération de pêche. tutti.fishingOperations.warn.invalid.batch.model=L'arbre d’échantillonnage n'est pas compatible. Les captures ne seront pas visibles. tutti.flash.info.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier %s. tutti.flash.info.benthos.add.to.protocol=Le benthos %s a été ajoutée au protocole. @@ -1007,7 +1007,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=Erreur lors de la suppresion du contenu du dossier %s +tutti.io.directory.delete.error=Erreur lors de la suppression du contenu du dossier %s tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total tutti.label.tab.accidental=Captures accidentelles @@ -1035,7 +1035,7 @@ tutti.main.action.changeLocaleUK.tip=Passer en anglais tutti.main.action.configuration=Configuration tutti.main.action.configuration.mnemonic=C -tutti.main.action.configuration.tip=Configurer Tutti +tutti.main.action.configuration.tip=Configurer l'application tutti.main.action.editCatches=Saisir les captures tutti.main.action.editCatches.mnemonic=S tutti.main.action.editCatches.tip=Éditer les captures @@ -1057,8 +1057,8 @@ tutti.main.action.importTemporaryReferential.tip=Importer des référentiels temporaires tutti.main.action.manageDb=Gestionnaire de base tutti.main.action.manageDb.mnemonic=G -tutti.main.action.manageDb.tip=Gérer la base de données utilisée par Tutti -tutti.main.action.reloadTutti=Redémarrer Tutti +tutti.main.action.manageDb.tip=Gérer la base de données utilisée par l'application +tutti.main.action.reloadTutti=Redémarrer l'application tutti.main.action.selectCruise=Sélectionner une campagne tutti.main.action.selectCruise.mnemonic=S tutti.main.action.selectCruise.tip=Sélectionner la campagne à utiliser @@ -1067,7 +1067,7 @@ tutti.main.action.showHelp.tip=Accéder à l'aide de l'application tutti.main.action.site=Site tutti.main.action.site.mnemonic=S -tutti.main.action.site.tip=Accéder au site du projet Tutti +tutti.main.action.site.tip=Accéder au site du projet Tutti (développement de l'application) tutti.main.action.updateApplication=Vérifier les mises à jour tutti.main.action.updateApplication.mnemonic=V tutti.main.action.updateApplication.tip=Vérifier les mises à jour logicielles @@ -1080,7 +1080,7 @@ tutti.main.menu.actions.tip=Actions tutti.main.menu.administration=Administration tutti.main.menu.administration.mnemonic=d -tutti.main.menu.administration.tip=Administrer Tutti +tutti.main.menu.administration.tip=Administrer l'application tutti.main.menu.changeLocale=Langue tutti.main.menu.file=Fichier tutti.main.menu.file.mnemonic=h @@ -1091,7 +1091,7 @@ tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné tutti.main.title.noSelectedProgram=Pas de série de campagne sélectionné -tutti.main.title.noSelectedProtocol=Pas de protocol sélectionné +tutti.main.title.noSelectedProtocol=Pas de protocole sélectionné tutti.main.title.nodb=Pas de base chargée tutti.main.title.selectedCruise=Campagne %s tutti.main.title.selectedProgram=Série de campagne %s @@ -1136,20 +1136,20 @@ tutti.manageTemporaryReferential.field.species.tip=Gestion du référentiel temporaire pour les espèces tutti.manageTemporaryReferential.field.vessel=Référentiel Navire tutti.manageTemporaryReferential.field.vessel.tip=Gestion du référentiel temporaire pour les navires -tutti.manageTemporaryReferential.passwordDialog.error.message=Le mot de passe que vous avez entré est incorrect. +tutti.manageTemporaryReferential.passwordDialog.error.message=Le mot de passe que vous avez entré est incorrect tutti.manageTemporaryReferential.passwordDialog.error.title=Mot de passe incorrect -tutti.manageTemporaryReferential.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application.\nVous devez entrer le mot de passe pour continuer. +tutti.manageTemporaryReferential.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application tutti.manageTemporaryReferential.passwordDialog.title=Zone sensible tutti.manageTemporaryReferential.title=importer des référentiels temporaires tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile=Exporter un exemple de référentiel Engin tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile=Exporter un exemple de référentiel Personne tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile=Exporter un exemple de référentiel Espèce tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile=Exporter un exemple de référentiel Navire -tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile=Importer un réferentiel Engin -tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile=Importer un réferentiel Personne -tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile=Importer un réferentiel Espèce -tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire -tutti.message.action.running=<html>Action %s en cours d'execution...<hr/></html> +tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile=Importer un référentiel Engin +tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile=Importer un référentiel Personne +tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile=Importer un référentiel Espèce +tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un référentiel Navire +tutti.message.action.running=<html>Action %s en cours d'éxécution...<hr/></html> tutti.multiPostImportLog.close=Fermer tutti.multiPostImportLog.close.mnemonic=F tutti.multiPostImportLog.close.tip=Fermer la popup @@ -1157,8 +1157,8 @@ tutti.multiPostImportLog.title=Lots non importés tutti.property.get.error=Propriété %1s non trouvée sur l'objet de type %2s tutti.property.set.error=Propriété %1s non trouvée sur l'objet de type %2s -tutti.sampleOrder.caracteristicNotFound=La caractéristique d'id %s n'est pas prévue pour l'échantillonage -tutti.selectBenthos.title=Choisissez un benthos +tutti.sampleOrder.caracteristicNotFound=La caractéristique d'id %s n'est pas prévue pour l’échantillonnage +tutti.selectBenthos.title=Choisissez une espèce du benthos tutti.selectCruise.action.chooseCruiseExportFile=Exporter tutti.selectCruise.action.chooseProgramExportFile=Exporter tutti.selectCruise.action.cloneProtocol=Cloner @@ -1175,7 +1175,7 @@ tutti.selectCruise.action.editProgram=Éditer tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné tutti.selectCruise.action.editProtocol=Éditer -tutti.selectCruise.action.editProtocol.tip=Éditer le protocol sélectionné +tutti.selectCruise.action.editProtocol.tip=Éditer le protocole sélectionné tutti.selectCruise.action.exportCruise=Exporter tutti.selectCruise.action.exportCruise.tip=Exporter la campagne sélectionnée tutti.selectCruise.action.exportCruiseForSumatra=Sumatra @@ -1228,7 +1228,7 @@ tutti.splitBenthosBatch.action.cancel.tip=Annuler le sous-échantillonnage tutti.splitBenthosBatch.action.save=Enregistrer tutti.splitBenthosBatch.action.save.mnemonic=E -tutti.splitBenthosBatch.action.save.tip=Enregistrer le sous-échantillonage +tutti.splitBenthosBatch.action.save.tip=Sauver le sous-échantillonnage tutti.splitBenthosBatch.field.batchWeight=Poids total à catégoriser tutti.splitBenthosBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) tutti.splitBenthosBatch.field.category=Catégorie @@ -1246,7 +1246,7 @@ tutti.splitSpeciesBatch.action.cancel.tip=Annuler le sous-échantillonnage tutti.splitSpeciesBatch.action.save=Enregistrer tutti.splitSpeciesBatch.action.save.mnemonic=E -tutti.splitSpeciesBatch.action.save.tip=Enregistrer le sous-échantillonage +tutti.splitSpeciesBatch.action.save.tip=Sauver le sous-échantillonnage tutti.splitSpeciesBatch.field.batchWeight=Poids total à catégoriser tutti.splitSpeciesBatch.field.batchWeightField.tip=Poids du lot père (si renseigné) tutti.splitSpeciesBatch.field.category=Catégorie @@ -1266,9 +1266,9 @@ tutti.update.jre=Java tutti.update.tutti=Tutti tutti.updateApplication.checkUpdates=Recherche de mises à jour -tutti.updateApplication.message.success=La mise à jour nécessite le redémarrage du Tutti.\nL'application va se fermer puis se ré-ouvrir automatiquement. +tutti.updateApplication.message.success=La mise à jour nécessite le redémarrage du l'application tutti.updateApplication.noUpdate=Aucune mise à jour de l'application détectée. -tutti.updateApplication.title.success=Redémarrage de Tutti nécessaire... +tutti.updateApplication.title.success=Redémarrage de l'application nécessaire... tutti.validateCruise.action.export.all.chooseFile.defaultFile=validation_%s tutti.validateCruise.action.export.all.chooseFile.label=Choisir le fichier d'export tutti.validateCruise.action.export.all.chooseFile.title=Exporter les messages de validation de la campagne

1 0

r1016 - in trunk: tutti-persistence/src/license tutti-service/src/license
by tchemit＠users.forge.codelutin.com 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 20:44:37 +0200 (Mon, 27 May 2013) New Revision: 1016 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1016 Log: optimize third parties Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties trunk/tutti-service/src/license/THIRD-PARTY.properties Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-05-27 18:20:42 UTC (rev 1015) +++ trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-05-27 18:44:37 UTC (rev 1016) @@ -3,7 +3,6 @@ # Already used licenses in project : # - Affero General Public License (AGPL) # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 @@ -23,11 +22,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 16 20:54:34 CEST 2013 +#Mon May 27 20:19:31 CEST 2013 antlr--antlr--2.7.6=BSD License -asm--asm--3.1=http://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.andromda--andromda-core--3.3.1=BSD License org.andromda--andromda-utils--3.3.1=BSD License Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-05-27 18:20:42 UTC (rev 1015) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-05-27 18:44:37 UTC (rev 1016) @@ -3,9 +3,12 @@ # Already used licenses in project : # - Affero General Public License (AGPL) # - BSD License +# - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 +# - GNU Affero General Public License v3 +# - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - HSQLDB License @@ -25,10 +28,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 16 20:56:55 CEST 2013 +#Mon May 27 20:20:05 CEST 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.andromda--andromda-core--3.3.1=BSD License org.andromda--andromda-utils--3.3.1=BSD License

1 0

r1015 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 20:20:42 +0200 (Mon, 27 May 2013) New Revision: 1015 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1015 Log: prepare next release Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 17:54:56 UTC (rev 1014) +++ trunk/pom.xml 2013-05-27 18:20:42 UTC (rev 1015) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3-rc-1</version> <modules> <module>tutti-persistence</module> @@ -132,13 +132,13 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.20</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.14.1</xworkVersion> <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.3.7-SNAPSHOT</adagioVersion> + <adagioVersion>3.3.7</adagioVersion> <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-27 17:54:56 UTC (rev 1014) +++ trunk/tutti-persistence/pom.xml 2013-05-27 18:20:42 UTC (rev 1015) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-27 17:54:56 UTC (rev 1014) +++ trunk/tutti-service/pom.xml 2013-05-27 18:20:42 UTC (rev 1015) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-27 17:54:56 UTC (rev 1014) +++ trunk/tutti-ui-swing/pom.xml 2013-05-27 18:20:42 UTC (rev 1015) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1014 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 19:54:56 +0200 (Mon, 27 May 2013) New Revision: 1014 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1014 Log: fix import referential gear + add test Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-27 17:54:12 UTC (rev 1013) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-27 17:54:56 UTC (rev 1014) @@ -809,6 +809,7 @@ result.setId(target.getId().toString()); result.setLabel(source.getLabel()); result.setName(source.getName()); + result.setScientificGear(source.isScientificGear()); setStatus(status, result); return result; }

1 0

r1013 - in trunk/tutti-service/src/test: java/fr/ifremer/tutti/service/referential resources
by tchemit＠users.forge.codelutin.com 27 May '13

27 May '13

Author: tchemit Date: 2013-05-27 19:54:12 +0200 (Mon, 27 May 2013) New Revision: 1013 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1013 Log: fix import referential gear + add test Added: trunk/tutti-service/src/test/resources/tutti-test-write-dbCGFS.properties Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-05-27 16:55:44 UTC (rev 1012) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-05-27 17:54:12 UTC (rev 1013) @@ -25,23 +25,18 @@ */ import com.google.common.base.Charsets; -import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.RessourceClassLoader; -import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.AbstractServiceTest; -import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.config.TuttiServiceConfig; import org.junit.Assert; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import java.io.File; import java.util.List; @@ -50,8 +45,14 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class TuttiReferentialImportExportServiceTest extends AbstractServiceTest { +public class TuttiReferentialImportExportServiceTest { + @ClassRule + public static final ServiceDbResource dbResource = + ServiceDbResource.writeDb("dbCGFS"); + + protected File dataDirectory; + public static final String SPECIES_FILE_CONTENT = "name\n" + "Temporary Species name 1;\n" + @@ -80,119 +81,22 @@ protected TuttiReferentialImportExportService service; - @Override - protected TuttiServiceContext createServiceContext(RessourceClassLoader loader, TuttiServiceConfig config) { - return new TuttiServiceContext(loader, config); - } - @Before public void setUp() throws Exception { - super.setUp(); - serviceContext.getConfig().setCsvSeparator(';'); - service = new TuttiReferentialImportExportService() { + dataDirectory = dbResource.getServiceConfig().getDataDirectory(); - @Override - public void setServiceContext(TuttiServiceContext context) { - this.context = context; - persistenceService = new PersistenceService() { + TuttiServiceContext serviceContext = dbResource.getServiceContext(); - @Override - public List<Species> getAllSpecies() { - return Lists.newArrayList(); - } + serviceContext.getConfig().setCsvSeparator(';'); - @Override - public List<Person> getAllPerson() { - return Lists.newArrayList(); - } - - @Override - public List<Gear> getAllScientificGear() { - return Lists.newArrayList(); - } - - @Override - public List<Gear> getAllFishingGear() { - return Lists.newArrayList(); - } - - @Override - public List<Vessel> getAllScientificVessel() { - return Lists.newArrayList(); - } - - @Override - public List<Vessel> getAllFishingVessel() { - return Lists.newArrayList(); - } - - @Override - public List<Species> importTemporarySpecies(List<Species> species) { - Binder<Species, Species> binder = BinderFactory.newBinder(Species.class); - List<Species> result = Lists.newArrayList(); - int i = 1; - for (Species source : species) { - Species target = TuttiBeanFactory.newSpecies(); - binder.copy(source, target); - target.setId(i++); - result.add(target); - } - return result; - } - - @Override - public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { - Binder<Vessel, Vessel> binder = BinderFactory.newBinder(Vessel.class); - List<Vessel> result = Lists.newArrayList(); - int i = 1; - for (Vessel source : vessels) { - Vessel target = TuttiBeanFactory.newVessel(); - binder.copy(source, target); - target.setId(i++); - result.add(target); - } - return result; - } - - @Override - public List<Person> importTemporaryPerson(List<Person> persons) { - Binder<Person, Person> binder = BinderFactory.newBinder(Person.class); - List<Person> result = Lists.newArrayList(); - int i = 1; - for (Person source : persons) { - Person target = TuttiBeanFactory.newPerson(); - binder.copy(source, target); - target.setId(i++); - result.add(target); - } - return result; - } - - @Override - public List<Gear> importTemporaryGear(List<Gear> gears) { - Binder<Gear, Gear> binder = BinderFactory.newBinder(Gear.class); - List<Gear> result = Lists.newArrayList(); - int i = 1; - for (Gear source : gears) { - Gear target = TuttiBeanFactory.newGear(); - binder.copy(source, target); - target.setId(i++); - result.add(target); - } - return result; - } - }; - persistenceService.setServiceContext(context); - } - }; - service.setServiceContext(serviceContext); + service = serviceContext.getService(TuttiReferentialImportExportService.class); } @Test public void importTemporarySpecies() throws Exception { - File file = new File(datadirectory, "importSpecies.csv"); + File file = new File(dataDirectory, "importSpecies.csv"); Files.createParentDirs(file); @@ -205,14 +109,21 @@ for (int i = 1; i <= 3; i++) { Species actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("-" + i, actual.getId()); Assert.assertEquals("Temporary Species name " + i, actual.getName()); } + // try to reimport them + try { + service.importTemporarySpecies(file); + Assert.fail(); + } catch (TuttiTechnicalException e) { + Assert.assertTrue(true); + } } @Test public void importTemporaryVessel() throws Exception { - File file = new File(datadirectory, "importVessel.csv"); + File file = new File(dataDirectory, "importVessel.csv"); Files.createParentDirs(file); @@ -225,7 +136,7 @@ for (int i = 1; i <= 2; i++) { Vessel actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("#TEMP¿"+actual.getInternationalRegistrationCode(), actual.getId()); Assert.assertEquals("Temporary fishing vessel name " + i, actual.getName()); Assert.assertEquals("International registration code F" + i, actual.getInternationalRegistrationCode()); Assert.assertFalse(actual.isScientificVessel()); @@ -233,16 +144,23 @@ for (int i = 3; i <= 4; i++) { Vessel actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("#TEMP¿"+actual.getInternationalRegistrationCode(), actual.getId()); Assert.assertEquals("Temporary scientific vessel name " + i, actual.getName()); Assert.assertEquals("International registration code S" + i, actual.getInternationalRegistrationCode()); Assert.assertTrue(actual.isScientificVessel()); } + // try to reimport them + try { + service.importTemporaryVessel(file); + Assert.fail(); + } catch (TuttiTechnicalException e) { + Assert.assertTrue(true); + } } @Test public void importTemporaryPerson() throws Exception { - File file = new File(datadirectory, "importPerson.csv"); + File file = new File(dataDirectory, "importPerson.csv"); Files.createParentDirs(file); @@ -255,7 +173,7 @@ for (int i = 1; i <= 3; i++) { Person actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("-" + i, actual.getId()); Assert.assertEquals("First name " + i, actual.getFirstName()); Assert.assertEquals("Last name " + i, actual.getLastName()); } @@ -263,7 +181,7 @@ @Test public void importTemporaryGear() throws Exception { - File file = new File(datadirectory, "importGear.csv"); + File file = new File(dataDirectory, "importGear.csv"); Files.createParentDirs(file); @@ -276,7 +194,7 @@ for (int i = 1; i <= 2; i++) { Gear actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("-" + i, actual.getId()); Assert.assertEquals("Gear fishing name " + i, actual.getName()); Assert.assertEquals("Gear fishing label " + i, actual.getLabel()); Assert.assertFalse(actual.isScientificGear()); @@ -284,7 +202,7 @@ for (int i = 3; i <= 4; i++) { Gear actual = result.get(i - 1); Assert.assertNotNull(actual); - Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("-" + i, actual.getId()); Assert.assertEquals("Gear scientific name " + i, actual.getName()); Assert.assertEquals("Gear scientific label " + i, actual.getLabel()); Assert.assertTrue(actual.isScientificGear()); @@ -294,7 +212,7 @@ @Test public void exportTemporarySpeciesExample() throws Exception { - File file = new File(datadirectory, "importSpecies.csv"); + File file = new File(dataDirectory, "exportSpecies.csv"); Assert.assertFalse(file.exists()); service.exportTemporarySpeciesExample(file); @@ -306,7 +224,7 @@ @Test public void exportTemporaryVesselExample() throws Exception { - File file = new File(datadirectory, "importVessel.csv"); + File file = new File(dataDirectory, "exportVessel.csv"); Assert.assertFalse(file.exists()); service.exportTemporaryVesselExample(file); @@ -318,8 +236,9 @@ @Test public void exportTemporaryPersonExample() throws Exception { - File file = new File(datadirectory, "importPerson.csv"); + File file = new File(dataDirectory, "exportPerson.csv"); + Assert.assertFalse(file.exists()); service.exportTemporaryPersonExample(file); Assert.assertTrue(file.exists()); @@ -330,8 +249,9 @@ @Test public void exportTemporaryGearExample() throws Exception { - File file = new File(datadirectory, "importGear.csv"); + File file = new File(dataDirectory, "exportGear.csv"); + Assert.assertFalse(file.exists()); service.exportTemporaryGearExample(file); Assert.assertTrue(file.exists()); Copied: trunk/tutti-service/src/test/resources/tutti-test-write-dbCGFS.properties (from rev 1009, trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties) =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-write-dbCGFS.properties (rev 0) +++ trunk/tutti-service/src/test/resources/tutti-test-write-dbCGFS.properties 2013-05-27 17:54:12 UTC (rev 1013) @@ -0,0 +1,24 @@ +### +# #%L +# Tutti :: Service +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +tutti.persistence.jdbc.createScript=src/test/dbCGFS/allegro.script \ No newline at end of file

1 0

r1012 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 27 May '13

27 May '13

Author: kmorin Date: 2013-05-27 18:55:44 +0200 (Mon, 27 May 2013) New Revision: 1012 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1012 Log: fixes #2487 [VALIDATION] alertes r?\195?\169p?\195?\169t?\195?\169es et pas d'identification des donn?\195?\169es / lots concern?\195?\169s Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2013-05-27 09:46:58 UTC (rev 1011) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2013-05-27 16:55:44 UTC (rev 1012) @@ -34,24 +34,20 @@ private static final long serialVersionUID = 1L; - public enum CatchType { - SPECIES, BENTHOS, MARINE_LITTER - } + protected String property; - protected CatchType catchType; - protected int index; public TuttiWeightComputingException(String message, - CatchType catchType, + String property, int index) { super(message); - this.catchType = catchType; + this.property = property; this.index = index; } - public CatchType getCatchType() { - return catchType; + public String getProperty() { + return property; } public int getIndex() { 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-05-27 09:46:58 UTC (rev 1011) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-27 16:55:44 UTC (rev 1012) @@ -36,10 +36,8 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.service.AbstractTuttiService; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,11 +61,14 @@ protected ValidationService validationService; + protected DecoratorService decoratorService; + @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); persistenceService = getService(PersistenceService.class); validationService = getService(ValidationService.class); + decoratorService = getService(DecoratorService.class); } /** @@ -359,11 +360,18 @@ int thisIndex = currentSpeciesRowIndex++; Float categoryWeight = batch.getSampleCategoryWeight(); Float rowWeight = batch.getWeight(); + String species = decoratorService.getDecoratorByType(Species.class).toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); NuitonValidatorResult validation = validationService.validateSpeciesBatch(batch); if (!validation.isValid()) { List<String> messages = validation.getErrorMessages(SpeciesBatch.PROPERTY_WEIGHT); - throw new TuttiBusinessException(_(messages.get(0))); + throw new TuttiWeightComputingException(_(messages.get(0), + species, batch.getSampleCategoryType().getLabel(), categoryValue, + batch.getWeight(), batch.getSampleCategoryWeight()), + SpeciesBatch.PROPERTY_WEIGHT, + thisIndex); } List<SpeciesBatch> children = batch.getChildBatchs(); @@ -386,8 +394,10 @@ } else if (categoryWeight < sum) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight"), - TuttiWeightComputingException.CatchType.SPECIES, + _("tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight", + species, batch.getSampleCategoryType().getLabel(), categoryValue, + categoryWeight, sum), + SpeciesBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT, thisIndex); } else { @@ -423,6 +433,14 @@ if (categoryWeight == null && rowWeight != null) { // throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); + } else if (rowWeight != null && !rowWeight.equals(frequencyWeight)) { + throw new TuttiWeightComputingException( + _("tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency", + species, batch.getSampleCategoryType().getLabel(), categoryValue, + frequencyWeight, rowWeight), + SpeciesBatch.PROPERTY_WEIGHT, + thisIndex); + } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, // then this weight is the result @@ -435,18 +453,16 @@ // if the weight of the frequencies is different from the category // weight, then set the weight of the sample if (frequencyWeight > categoryWeight) { - throw new TuttiWeightComputingException(_("tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight"), - TuttiWeightComputingException.CatchType.SPECIES, - thisIndex); + throw new TuttiWeightComputingException( + _("tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight", + species, batch.getSampleCategoryType().getLabel(), categoryValue, + frequencyWeight, categoryWeight), + SpeciesBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT, + thisIndex); } else if (rowWeight == null) { batch.setComputedWeight(frequencyWeight); - } else if (!rowWeight.equals(frequencyWeight)) { - throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency"), - TuttiWeightComputingException.CatchType.SPECIES, - thisIndex); } result = categoryWeight; @@ -458,10 +474,11 @@ result = categoryWeight; } } - if (result == null && batch.getParentBatch() == null) { + if (result == null) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.noWeight"), - TuttiWeightComputingException.CatchType.SPECIES, + _("tutti.service.operations.computeWeights.error.species.noWeight", + species, batch.getSampleCategoryType().getLabel(), categoryValue), + SpeciesBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT, thisIndex); } @@ -495,11 +512,18 @@ int thisIndex = currentBenthosRowIndex++; Float categoryWeight = batch.getSampleCategoryWeight(); Float rowWeight = batch.getWeight(); + String species = decoratorService.getDecoratorByType(Species.class).toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); NuitonValidatorResult validation = validationService.validateBenthosBatch(batch); if (!validation.isValid()) { - List<String> messages = validation.getErrorMessages(SpeciesBatch.PROPERTY_WEIGHT); - throw new TuttiBusinessException(_(messages.get(0))); + List<String> messages = validation.getErrorMessages(BenthosBatch.PROPERTY_WEIGHT); + throw new TuttiWeightComputingException(_(messages.get(0), + species, batch.getSampleCategoryType().getLabel(), categoryValue, + batch.getWeight(), batch.getSampleCategoryWeight()), + BenthosBatch.PROPERTY_WEIGHT, + thisIndex); } List<BenthosBatch> children = batch.getChildBatchs(); @@ -522,8 +546,10 @@ } else if (categoryWeight < sum) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight"), - TuttiWeightComputingException.CatchType.BENTHOS, + _("tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight", + species, batch.getSampleCategoryType().getLabel(), categoryValue, + categoryWeight, sum), + BenthosBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT, thisIndex); } else { @@ -560,6 +586,14 @@ if (categoryWeight == null && rowWeight != null) { // throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); + } else if (!rowWeight.equals(frequencyWeight)) { + throw new TuttiWeightComputingException( + _("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency", + species, batch.getSampleCategoryType().getLabel(), categoryValue, + rowWeight, categoryWeight), + BenthosBatch.PROPERTY_WEIGHT, + thisIndex); + } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, // then this weight is the result @@ -573,18 +607,15 @@ // weight, then set the weight of the sample if (frequencyWeight > categoryWeight) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight"), - TuttiWeightComputingException.CatchType.BENTHOS, + _("tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight", + species, batch.getSampleCategoryType().getLabel(), categoryValue, + frequencyWeight, categoryWeight), + BenthosBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT, thisIndex); } else if (rowWeight == null) { batch.setComputedWeight(frequencyWeight); - } else if (!rowWeight.equals(frequencyWeight)) { - throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency"), - TuttiWeightComputingException.CatchType.BENTHOS, - thisIndex); } result = categoryWeight; @@ -596,11 +627,11 @@ result = categoryWeight; } } - if (result == null - && batch.getParentBatch() == null) { + if (result == null) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.noWeight"), - TuttiWeightComputingException.CatchType.BENTHOS, + _("tutti.service.operations.computeWeights.error.benthos.noWeight", + species, batch.getSampleCategoryType().getLabel(), categoryValue), + BenthosBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT, thisIndex); } @@ -623,7 +654,7 @@ if (checkWeight && batch.getWeight() == null) { throw new TuttiWeightComputingException( _("tutti.validator.warning.marineLitter.weight.required"), - TuttiWeightComputingException.CatchType.MARINE_LITTER, + MarineLitterBatch.PROPERTY_WEIGHT, i); } } 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-05-27 09:46:58 UTC (rev 1011) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-27 16:55:44 UTC (rev 1012) @@ -95,23 +95,23 @@ tutti.service.multipost.import.caracteristics.error=Erreur lors de l'import des caractéristiques tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des mensurations tutti.service.multipost.resolveArchive.error=Erreur lors de l'ouverture de l'archive -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.incoherentCategoryWeight=Benthos - Le poids total des mensurations du lot de %s/%s - %s (%skg) est supérieur au poids de la catégorie (%skg) +tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Benthos - Le poids du lot de %s/%s - %s (%skg) est inférieur à la somme des poids de ses sous-catégories (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. -tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot du benthos est différent du poids du sous-échantillon -tutti.service.operations.computeWeights.error.benthos.incoherentSampleWeight=Le poids de sous-échantillon est supérieur au poids du lot. +tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency=Benthos - Le poids total des mensurations du lot de %s/%s - %s (%skg) est différent du poids du sous-échantillon (%skg) +tutti.service.operations.computeWeights.error.benthos.incoherentSampleWeight=Benthos - Le poids de sous-échantillon du lot %s/%s - %s (%skg) est supérieur au poids du lot (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted=Le poids total Vrac du benthos est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié -tutti.service.operations.computeWeights.error.benthos.noWeight=Un lot du benthos n'a pas de poids +tutti.service.operations.computeWeights.error.benthos.noWeight=Benthos - Le lot de %s/%s - %s n'a pas de poids tutti.service.operations.computeWeights.error.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. tutti.service.operations.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés tutti.service.operations.computeWeights.error.marineLitter.incoherentTotal=Le poids total des macro-déchets est inférieur à la somme des poids des macro-déchets saisis -tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight=Le poids total des mensurations d'un lot des espèces est supérieur au poids de la catégorie -tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot des espèces est différent de la somme des poids de ses sous-catégories +tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight=Espèces - Le poids total des mensurations du lot de %s/%s - %s (%skg) est supérieur au poids de la catégorie (%skg) +tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight=Espèces - Le poids du lot de %s/%s - %s (%skg) est inférieur à la somme des poids de ses sous-catégories (%skg) tutti.service.operations.computeWeights.error.species.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. -tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot des espèces est différent du poids du sous-échantillon -tutti.service.operations.computeWeights.error.species.incoherentSampleWeight=Le poids de sous-échantillon est supérieur au poids du lot. +tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency=Espèces - Le poids total des mensurations du lot de %s/%s - %s (%skg) est différent du poids du sous-échantillon (%skg) +tutti.service.operations.computeWeights.error.species.incoherentSampleWeight=Espèces - Le poids de sous-échantillon du lot %s/%s - %s (%skg) est supérieur au poids du lot (%skg) 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.computeWeights.error.species.noWeight=Espèces - Le lot de %s/%s/%s 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 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-27 09:46:58 UTC (rev 1011) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-27 16:55:44 UTC (rev 1012) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; @@ -61,6 +62,7 @@ import java.beans.PropertyChangeEvent; import java.util.List; import java.util.Map; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -279,7 +281,8 @@ } protected int addMessages(NuitonValidatorScope scope, List<String> messages) { - for (String message : messages) { + Set<String> messageSet = Sets.newHashSet(messages); + for (String message : messageSet) { MessageTreeNode child = new MessageTreeNode(scope, message); this.add(child); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-05-27 09:46:58 UTC (rev 1011) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-05-27 16:55:44 UTC (rev 1012) @@ -26,12 +26,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.BatchContainer; -import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.data.*; import fr.ifremer.tutti.service.catches.TuttiWeightComputingException; import fr.ifremer.tutti.service.catches.TuttiWeightComputingService; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; @@ -39,9 +34,11 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; +import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n._; @@ -71,7 +68,17 @@ } catch (TuttiWeightComputingException e) { getUI().getTabPane().setSelectedIndex(1); - AbstractSelectTableAction.doSelectCell(getUI().getSpeciesTabContent().getTable(), e.getIndex(), 1); + + int index = e.getIndex(); + SpeciesBatchRowModel row = getUI().getSpeciesTabContent().getModel().getRows().get(index); + int column; + if (SpeciesBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT.equals(e.getProperty())) { + column = getFinestCategoryColumn(row.getFinestCategory().getCategoryType()); + } else { + column = 6; + } + AbstractSelectTableAction.doSelectCell(getUI().getSpeciesTabContent().getTable(), index, column); + throw e; } @@ -84,7 +91,17 @@ } catch (TuttiWeightComputingException e) { getUI().getTabPane().setSelectedIndex(2); - AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), e.getIndex(), 1); + + int index = e.getIndex(); + BenthosBatchRowModel row = getUI().getBenthosTabContent().getModel().getRows().get(index); + int column; + if (BenthosBatch.PROPERTY_SAMPLE_CATEGORY_WEIGHT.equals(e.getProperty())) { + column = getFinestCategoryColumn(row.getFinestCategory().getCategoryType()); + } else { + column = 6; + } + AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), index, column); + throw e; } @@ -228,4 +245,18 @@ } return totalSortedWeight; } + + protected int getFinestCategoryColumn(SampleCategoryEnum categoryType) { + int column = 1; + + List<Integer> samplingOrderIds = getConfig().getServiceConfig().getSamplingOrderIds(); + Integer categoryId = categoryType.getFieldValue(); + + int index = samplingOrderIds.indexOf(categoryId); + if (index > -1) { + column += index + 1; + } + + return column; + } }

1 0

r1011 - trunk/tutti-ui-swing/src/main/filtered-resources
by kmorin＠users.forge.codelutin.com 27 May '13

27 May '13

Author: kmorin Date: 2013-05-27 11:46:58 +0200 (Mon, 27 May 2013) New Revision: 1011 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1011 Log: info log level Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-27 09:41:41 UTC (rev 1010) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-27 09:46:58 UTC (rev 1011) @@ -31,7 +31,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n # tutti levels -log4j.logger.fr.ifremer.tutti=DEBUG +log4j.logger.fr.ifremer.tutti=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO

1 0

r1010 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos java/fr/ifremer/tutti/ui/swing/content/operation/catches/species resources/i18n
by kmorin＠users.forge.codelutin.com 27 May '13

27 May '13

Author: kmorin Date: 2013-05-27 11:41:41 +0200 (Mon, 27 May 2013) New Revision: 1010 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1010 Log: fixes #2508 [MELAG] Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.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/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -31,7 +31,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n # tutti levels -log4j.logger.fr.ifremer.tutti=INFO +log4j.logger.fr.ifremer.tutti=DEBUG #log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu May 23 15:38:00 CEST 2013 +#Fri May 24 09:39:08 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -115,6 +115,7 @@ tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.importPupitri.help= tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields @@ -332,7 +333,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions \ No newline at end of file +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu May 23 15:38:00 CEST 2013 +#Fri May 24 09:39:08 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -115,6 +115,7 @@ tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.importPupitri.help= tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields @@ -332,7 +333,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions \ No newline at end of file +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -863,6 +863,7 @@ public void saveRows(Iterable<BenthosBatchRowModel> rows) { for (BenthosBatchRowModel row : rows) { + recomputeRowValidState(row); saveRow(row); } } @@ -970,7 +971,7 @@ enableRemove = selectedRowCount == 1; enableRemoveSub = selectedRowCount == 1; enableRename = selectedRowCount == 1; - enableCreateMelag = selectedRowCount == 1; + enableCreateMelag = selectedRowCount > 1; enableEditFrequencies = selectedRowCount == 1; if (enableSplit) { @@ -1020,20 +1021,14 @@ JXTable table = getTable(); // can add species to a melag if several root are selected + int[] selectedRows = table.getSelectedRows(); + for (int selectedRowIndex : selectedRows) { + BenthosBatchRowModel selectedRow = + tableModel.getEntry(selectedRowIndex); - if (selectedRowCount < 2) { - enableCreateMelag = false; - - } else { - int[] selectedRows = table.getSelectedRows(); - for (int selectedRowIndex : selectedRows) { - BenthosBatchRowModel selectedRow = - tableModel.getEntry(selectedRowIndex); - - if (!selectedRow.isBatchRoot()) { - enableCreateMelag = false; - break; - } + if (!selectedRow.isBatchRoot()) { + enableCreateMelag = false; + break; } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -142,12 +142,18 @@ @Override protected void doAction() throws Exception { + String melagComment = _("tutti.createBenthosMelag.comment.part1"); for (BenthosBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } + melagComment += _("tutti.createBenthosMelag.comment.part2", sampleWeight, decorate(batch.getSpecies())); + } + melagComment += _("tutti.createBenthosMelag.comment.part3", melagWeight); + + for (BenthosBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); if (StringUtils.isBlank(comment)) { comment = ""; @@ -155,7 +161,7 @@ } else { comment += "\n"; } - comment += "issu d'un MELAG de " + melagWeight + "kg"; + comment += melagComment; batch.setComment(comment); } getHandler().saveRows(selectedRows.keySet()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -142,12 +142,18 @@ @Override protected void doAction() throws Exception { + String melagComment = _("tutti.createSpeciesMelag.comment.part1"); for (SpeciesBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } + melagComment += _("tutti.createSpeciesMelag.comment.part2", sampleWeight, decorate(batch.getSpecies())); + } + melagComment += _("tutti.createSpeciesMelag.comment.part3", melagWeight); + + for (SpeciesBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); if (StringUtils.isBlank(comment)) { comment = ""; @@ -155,7 +161,7 @@ } else { comment += "\n"; } - comment += "issu d'un MELAG de " + melagWeight + "kg"; + comment += melagComment; batch.setComment(comment); } getHandler().saveRows(selectedRows.keySet()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -869,6 +869,7 @@ public void saveRows(Iterable<SpeciesBatchRowModel> rows) { for (SpeciesBatchRowModel row : rows) { + recomputeRowValidState(row); saveRow(row); } } @@ -974,7 +975,7 @@ enableRemove = selectedRowCount == 1; enableRemoveSub = selectedRowCount == 1; enableRename = selectedRowCount == 1; - enableCreateMelag = selectedRowCount == 1; + enableCreateMelag = selectedRowCount > 1; enableEditFrequencies = selectedRowCount == 1; if (enableSplit) { @@ -1024,20 +1025,14 @@ JXTable table = getTable(); // can add species to a melag if several root are selected + int[] selectedRows = table.getSelectedRows(); + for (int selectedRowIndex : selectedRows) { + SpeciesBatchRowModel selectedRow = + tableModel.getEntry(selectedRowIndex); - if (selectedRowCount < 2) { - enableCreateMelag = false; - - } else { - int[] selectedRows = table.getSelectedRows(); - for (int selectedRowIndex : selectedRows) { - SpeciesBatchRowModel selectedRow = - tableModel.getEntry(selectedRowIndex); - - if (!selectedRow.isBatchRoot()) { - enableCreateMelag = false; - break; - } + if (!selectedRow.isBatchRoot()) { + enableCreateMelag = false; + break; } } } 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -168,6 +168,9 @@ tutti.createBenthosBatch.field.species= tutti.createBenthosBatch.field.species.tip= tutti.createBenthosBatch.title= +tutti.createBenthosMelag.comment.part1= +tutti.createBenthosMelag.comment.part2= +tutti.createBenthosMelag.comment.part3= tutti.createBenthosMelag.error.message= tutti.createBenthosMelag.error.title= tutti.createIndividualObservationBatch.action.addSpecies= @@ -223,6 +226,9 @@ tutti.createSpeciesMelag.action.validate= tutti.createSpeciesMelag.action.validate.mnemonic= tutti.createSpeciesMelag.action.validate.tip= +tutti.createSpeciesMelag.comment.part1= +tutti.createSpeciesMelag.comment.part2= +tutti.createSpeciesMelag.comment.part3= tutti.createSpeciesMelag.error.message= tutti.createSpeciesMelag.error.title= tutti.createSpeciesMelag.message= 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -162,6 +162,9 @@ tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot +tutti.createBenthosMelag.comment.part1=Traitement issu d'un mélange composé de \:\n +tutti.createBenthosMelag.comment.part2=- %skg de %s\n +tutti.createBenthosMelag.comment.part3=avec un poids d'élévation de %skg tutti.createBenthosMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createBenthosMelag.error.title=Erreur tutti.createIndividualObservationBatch.action.addSpecies=... @@ -217,6 +220,9 @@ tutti.createSpeciesMelag.action.validate=Valider tutti.createSpeciesMelag.action.validate.mnemonic=V tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG +tutti.createSpeciesMelag.comment.part1=Traitement issu d'un mélange composé de \:\n +tutti.createSpeciesMelag.comment.part2=- %skg de %s\n +tutti.createSpeciesMelag.comment.part3=avec un poids d'élévation de %skg tutti.createSpeciesMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createSpeciesMelag.error.title=Erreur tutti.createSpeciesMelag.message=Combien pesait le MELAG (kg) ?

1 0