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

r1057 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 21:50:25 +0200 (Thu, 30 May 2013) New Revision: 1057 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1057 Log: fixes #2538: [EXPORT GENERIQUE] c'est ti donc pourquoi que les lignes sont r?\195?\169p?\195?\169t?\195?\169es dans la table species ? Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 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-30 16:10:16 UTC (rev 1056) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-30 19:50:25 UTC (rev 1057) @@ -623,7 +623,7 @@ SpeciesExportModel speciesModel; - final Set<SpeciesExportRow> speciesToExport = Sets.newHashSet(); + final Map<String, SpeciesExportRow> speciesToExport = Maps.newTreeMap(); TuttiCsvUtil.TuttiRepeatableExport<SurveyExportRow> surveyExport; @@ -755,15 +755,20 @@ } public void addSpecies(Species species) { - Species fullSpecies = speciesById.get(species.getId()); - SpeciesExportRow row = new SpeciesExportRow(); - row.setSpecies(fullSpecies); - speciesToExport.add(row); + String speciesId = species.getId(); + if (!speciesToExport.containsKey(speciesId)) { + + // not treated species, add a new row + Species fullSpecies = speciesById.get(speciesId); + SpeciesExportRow row = new SpeciesExportRow(); + row.setSpecies(fullSpecies); + speciesToExport.put(speciesId, row); + } } public List<SpeciesExportRow> getSpeciesToExport() { List<SpeciesExportRow> result = - Lists.newArrayList(speciesToExport); + Lists.newArrayList(speciesToExport.values()); Collections.sort(result, new Comparator<SpeciesExportRow>() { @Override

1 0

Build failed in Jenkins: tutti #867
by admin+hudson＠codelutin.com 30 May '13

30 May '13

See <http://ci.nuiton.org/jenkins/job/tutti/867/changes> Changes: [Kevin Morin] revert some commited files [Kevin Morin] fixes #2470 [CAPTURE] modification des caractéristiques du trait non pris en compte dans les identifiants affichés ------------------------------------------ [...truncated 315 lines...] <I18nBundleEntry@c9b8aa90, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_fr_FR.properties> 2013-05-30 17:46:48,944 4775 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@50f5db13, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config, size:3> <I18nBundleEntry@f421d43e, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_en_GB.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@3d01e5eb, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:1> <I18nBundleEntry@b447fcc5, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_en_GB.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@3d01e5eb, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:2> <I18nBundleEntry@89ded317, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_fr_FR.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@3d01e5eb, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:3> <I18nBundleEntry@1b56fe57, locale:es_ES, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_es_ES.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@479dc697, bundlePrefix:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…,> size:1> <I18nBundleEntry@89a839b5, locale:en_GB, scope FULL, path:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…>> 2013-05-30 17:46:48,946 4777 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@479dc697, bundlePrefix:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…,> size:2> <I18nBundleEntry@5f3f1007, locale:fr_FR, scope FULL, path:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…>> 2013-05-30 17:46:48,946 4777 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4759083c, bundlePrefix:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…,> size:1> <I18nBundleEntry@56537c39, locale:fr_FR, scope FULL, path:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…>> 2013-05-30 17:46:48,946 4777 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4759083c, bundlePrefix:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…,> size:2> <I18nBundleEntry@80bca5e7, locale:en_GB, scope FULL, path:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…>> 2013-05-30 17:46:48,947 4778 [main] INFO org.nuiton.i18n.init.I18nInitializer - 6 bundle(s) found, in 16 file(s). 2013-05-30 17:46:48,947 4778 [main] INFO org.nuiton.i18n.I18nStore - 6 bundle(s) found, [16 file(s)]. 2013-05-30 17:46:48,951 4782 [main] INFO org.nuiton.i18n.I18nLanguage - Encoding UTF-8 will be used to load files 2013-05-30 17:46:48,960 4791 [main] INFO org.nuiton.i18n.I18nStore - I18nLanguage <locale: en_GB, nbStences:351>, nbEntries: 6, nbSentences: 351. 2013-05-30 17:46:48,961 4792 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.DecoratorService@1cafc935 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.285 sec Running fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportServiceTest 2013-05-30 17:46:48,982 4813 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@10e47408 2013-05-30 17:46:48,996 4827 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export species to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,013 4844 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol - fr.ifremer.tutti.service.protocol.SpeciesRow > [null] , will create a new default one. 2013-05-30 17:46:49,072 4903 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@10e47408 2013-05-30 17:46:49,074 4905 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@cf9091c 2013-05-30 17:46:49,130 4961 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@cf9091c 2013-05-30 17:46:49,133 4964 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@49392dd5 2013-05-30 17:46:49,133 4964 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,139 4970 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@49392dd5 2013-05-30 17:46:49,141 4972 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@28b51c44 2013-05-30 17:46:49,148 4979 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol [null] species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,156 4987 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.service.protocol.SpeciesRow - fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol > [null] , will create a new default one. 2013-05-30 17:46:49,160 4991 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@28b51c44 2013-05-30 17:46:49,162 4993 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3a315883 2013-05-30 17:46:49,216 5047 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3a315883 2013-05-30 17:46:49,220 5051 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@61e7e602 2013-05-30 17:46:49,220 5051 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export benthos to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,224 5055 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@61e7e602 2013-05-30 17:46:49,226 5057 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3fadbf85 2013-05-30 17:46:49,227 5058 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol [null] species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,230 5061 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3fadbf85 2013-05-30 17:46:49,233 5064 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@27f8d56c 2013-05-30 17:46:49,233 5064 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,235 5066 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@27f8d56c 2013-05-30 17:46:49,238 5069 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4183b9f4 2013-05-30 17:46:49,238 5069 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol caracteristic from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,260 5091 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4183b9f4 Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.294 sec Running fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-05-30 17:46:49,264 5095 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-05-30 17:46:49,265 5096 [main] INFO org.nuiton.util.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-05-30 17:46:49,266 5097 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec Running fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-05-30 17:46:49,286 5117 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-05-30 17:46:49,291 5122 [main] INFO org.nuiton.util.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-05-30 17:46:49,293 5124 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/test/dbCG…,> test [class fr.ifremer.tutti.service.export.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.022 sec Results : Tests run: 22, Failures: 0, Errors: 0, Skipped: 4 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service --- [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti-service --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.3-rc-3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). [INFO] Generated 41 file(s) in 23.957s [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1388/1388 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5.1:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 11 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1675/1836 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-c… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-u… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/metafacade… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/metaf… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 312 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/class…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[275,43] [deprecation] getSelectedValues() in JList has been deprecated [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[84,53] error: cannot find symbol [ERROR] symbol: method getFishingOperationTitle(FishingOperation) location: class EditFishingOperationAction <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[86,23] error: method loadCatchBatch in class EditFishingOperationAction cannot be applied to given types; [INFO] 3 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.112s] [INFO] Tutti :: Persistence .............................. SUCCESS [21.269s] [INFO] Tutti :: Service .................................. SUCCESS [10.797s] [INFO] Tutti :: UI ....................................... FAILURE [39.369s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:19.089s [INFO] Finished at: Thu May 30 17:47:29 CEST 2013 [INFO] Final Memory: 69M/217M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-rc-3-SNAPSHOT/tutti-ui-swing-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-rc-3-SNAPSHOT/tutti-ui-swing-2.3-rc-3-SNAPSHOT-third-party.properties [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-30_17-46-05/archive/fr.ifremer/tutti/2.3-rc-3-SNAPSHOT/tutti-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.3-rc-3-SNAPS…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-30_17-46-05/archive/fr.ifremer/tutti/2.3-rc-3-SNAPSHOT/tutti-2.3-rc-3-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-persistence/2.3-rc-3-SNAPSHOT/tutti-persistence-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-persistence/2.3-rc-3-SNAPSHOT/tutti-persistence-2.3-rc-3-SNAPSHOT.jar Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: tutti-commits(a)list.forge.codelutin.com kmorin(a)codelutin.com channel stopped

1 2

Build failed in Jenkins: tutti » Tutti :: UI #867
by admin+hudson＠codelutin.com 30 May '13

30 May '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/867/…> Changes: [Kevin Morin] revert some commited files [Kevin Morin] fixes #2470 [CAPTURE] modification des caractéristiques du trait non pris en compte dans les identifiants affichés ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.3-rc-3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). [INFO] Generated 41 file(s) in 23.957s [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1388/1388 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5.1:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 11 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1675/1836 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-c… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-u… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/metafacade… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/metaf… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 312 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [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-ui-swing/ws/s…>:[275,43] [deprecation] getSelectedValues() in JList has been deprecated [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[84,53] error: cannot find symbol [ERROR] symbol: method getFishingOperationTitle(FishingOperation) location: class EditFishingOperationAction <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[86,23] error: method loadCatchBatch in class EditFishingOperationAction cannot be applied to given types; [INFO] 3 errors [INFO] -------------------------------------------------------------

1 2

r1056 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 18:10:16 +0200 (Thu, 30 May 2013) New Revision: 1056 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1056 Log: fix failed build Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-05-30 15:47:02 UTC (rev 1055) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-05-30 16:10:16 UTC (rev 1056) @@ -81,9 +81,7 @@ FishingOperation operation = getModel().getFishingOperation(); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); - - getEditAction().loadCatchBatch(operation, fishingOperationText, true); + getEditAction().loadCatchBatch(operation, true); } } \ No newline at end of file

1 0

r1055 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 17:47:02 +0200 (Thu, 30 May 2013) New Revision: 1055 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1055 Log: fixes #2539 [SUMATRA] erreur de g?\195?\169n?\195?\169ration du rapport si des traits n'ont pas de benthos Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-05-30 15:43:16 UTC (rev 1054) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-05-30 15:47:02 UTC (rev 1055) @@ -142,36 +142,38 @@ tuttiWeightComputingService.getComputedBenthosBatches(operation); rowMap.clear(); - List<BenthosBatch> benthosBatches = benthosBatchContainer.getChildren(); - for (BenthosBatch batch : benthosBatches) { - Species sp = batch.getSpecies(); + if (benthosBatchContainer != null) { + List<BenthosBatch> benthosBatches = benthosBatchContainer.getChildren(); + for (BenthosBatch batch : benthosBatches) { + Species sp = batch.getSpecies(); - Float weight = batch.getSampleCategoryWeight(); - if (weight == null) { - weight = batch.getSampleCategoryComputedWeight(); - } + Float weight = batch.getSampleCategoryWeight(); + if (weight == null) { + weight = batch.getSampleCategoryComputedWeight(); + } - Integer nb = batch.getNumber(); - if (nb == null) { - nb = batch.getComputedNumber(); - } - if (nb == null) { - nb = 0; - } + Integer nb = batch.getNumber(); + if (nb == null) { + nb = batch.getComputedNumber(); + } + if (nb == null) { + nb = 0; + } - CatchRow row = rowMap.get(sp); - if (row == null) { - row = new CatchRow(); - row.setFishingOperation(operation); - row.setSpecies(sp); - row.setWeight(weight); - row.setNumber(nb); + CatchRow row = rowMap.get(sp); + if (row == null) { + row = new CatchRow(); + row.setFishingOperation(operation); + row.setSpecies(sp); + row.setWeight(weight); + row.setNumber(nb); - } else { - row.setWeight(row.getWeight() + weight); - row.setNumber(row.getNumber() + nb); + } else { + row.setWeight(row.getWeight() + weight); + row.setNumber(row.getNumber() + nb); + } + rowMap.put(sp, row); } - rowMap.put(sp, row); } rows.addAll(rowMap.values());

1 0

r1054 - in trunk: tutti-service/src/test/resources tutti-ui-swing/src/main/filtered-resources
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 17:43:16 +0200 (Thu, 30 May 2013) New Revision: 1054 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1054 Log: revert some commited files Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:41:32 UTC (rev 1053) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:43:16 UTC (rev 1054) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -tutti.persistence.db.directory=/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS -tutti.persistence.jdbc.url=jdbc:hsqldb:file:/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS/allegro +tutti.persistence.db.directory=src/test/dbCGFS +tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro #tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro #tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:41:32 UTC (rev 1053) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:43:16 UTC (rev 1054) @@ -36,8 +36,6 @@ #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO -log4j.logger.jaxx.runtime.editor=DEBUG - log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} log4j.appender.file.MaxFileSize=10MB

1 0

r1053 - in trunk: tutti-service/src/test/resources tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 17:41:32 +0200 (Thu, 30 May 2013) New Revision: 1053 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1053 Log: fixes #2470 [CAPTURE] modification des caract?\195?\169ristiques du trait non pris en compte dans les identifiants affich?\195?\169s Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:41:32 UTC (rev 1053) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -tutti.persistence.db.directory=src/test/dbCGFS -tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro +tutti.persistence.db.directory=/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS +tutti.persistence.jdbc.url=jdbc:hsqldb:file:/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS/allegro #tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro #tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:41:32 UTC (rev 1053) @@ -36,6 +36,8 @@ #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO +log4j.logger.jaxx.runtime.editor=DEBUG + log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} log4j.appender.file.MaxFileSize=10MB Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -331,12 +331,10 @@ // now fishing operation is edited model.setEditFishingOperation(fishingOperation); - String fishingOperationText = getFishingOperationTitle(fishingOperation); + loadFishingOperation(fishingOperation); - loadFishingOperation(fishingOperation, fishingOperationText); + loadCatchBatch(fishingOperation, true); - loadCatchBatch(fishingOperation, fishingOperationText, true); - JTabbedPane form = ui.getTabPane(); JLabel noContentPane = ui.getNoTraitPane(); @@ -373,8 +371,7 @@ getUI().repaint(); } - public void loadFishingOperation(FishingOperation bean, - String fishingOperationText) { + public void loadFishingOperation(FishingOperation bean) { EditFishingOperationUI ui = getUI().getFishingOperationTabContent(); @@ -465,34 +462,26 @@ editFishingOperationUIModel.setLoadingData(false); - ui.getTraitGeneralTabPane().setTitle(fishingOperationText); - ui.getVesselUseFeatureTabPane().setTitle(fishingOperationText); - ui.getGearUseFeatureTabPane().setTitle(fishingOperationText); - handler.installStartDateListener(); handler.installCoordinatesListener(); } - public String getFishingOperationTitle(FishingOperation bean) { - Decorator<FishingOperation> decorator = - getDecorator(FishingOperation.class, null); +// public String getFishingOperationTitle(FishingOperation bean) { +// String fishingOperationText; +// +// if (bean == null) { +// fishingOperationText = null; +// } else if (TuttiEntities.isNew(bean)) { +// fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", +// _("tutti.editFishingOperation.label.traitReminder.inCreation")); +// } else { +// fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", +// decorate(bean)); +// } +// return fishingOperationText; +// } - String fishingOperationText; - - if (bean == null) { - fishingOperationText = null; - } else if (TuttiEntities.isNew(bean)) { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - _("tutti.editFishingOperation.label.traitReminder.inCreation")); - } else { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - decorator.toString(bean)); - } - return fishingOperationText; - } - public void loadCatchBatch(FishingOperation bean, - String fishingOperationText, boolean loadOtherTabs) { boolean empty = bean == null || TuttiEntities.isNew(bean); @@ -580,14 +569,6 @@ catchesUIModel.setModify(false); catchBatchMonitor.clearModified(); - // 3) Propagate title to others tabs - ui.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); - ui.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); - if (loadOtherTabs) { // 4) Propagate new selected fishingoperation to others tabs Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -25,11 +25,13 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.CloseableUI; @@ -140,12 +142,11 @@ log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION); } + // selected fishing operation is now the editing one + FishingOperation newValue = (FishingOperation) evt.getNewValue(); + if (!getModel().isEditionAdjusting()) { - // selected fishing operation is now the editing one - - FishingOperation newValue = (FishingOperation) evt.getNewValue(); - FishingOperation operation; if (newValue == null) { operation = null; @@ -165,6 +166,23 @@ TuttiActionHelper.runInternalAction(editFishingOperationAction); } } + + // done here instead of in the action in order to update the headers + // when the operation is saved + String fishingOperationText = getFishingOperationTitle(newValue); + + EditFishingOperationUI efoUI = getUI().getFishingOperationTabContent(); + efoUI.getTraitGeneralTabPane().setTitle(fishingOperationText); + efoUI.getVesselUseFeatureTabPane().setTitle(fishingOperationText); + efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationText); + + EditCatchesUI ecUI = getUI().getCatchesTabContent(); + ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); + ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); } }); @@ -286,4 +304,19 @@ return getModel().getEditFishingOperation() != null && getUI().getCatchesTabContent().getModel().isValid(); } + + public String getFishingOperationTitle(FishingOperation bean) { + String fishingOperationText; + + if (bean == null) { + fishingOperationText = null; + } else if (TuttiEntities.isNew(bean)) { + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + _("tutti.editFishingOperation.label.traitReminder.inCreation")); + } else { + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + decorate(bean)); + } + return fishingOperationText; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -107,9 +107,7 @@ importBatches(operation); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); - - getEditAction().loadCatchBatch(operation, fishingOperationText, true); + getEditAction().loadCatchBatch(operation, true); } protected abstract void importBatches(FishingOperation operation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -121,10 +121,8 @@ operation, catchBatch); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); + getEditAction().loadCatchBatch(operation, true); - getEditAction().loadCatchBatch(operation, fishingOperationText, true); - sendMessage(_("tutti.editSpeciesBatch.action.importPupitri.success", getModel().getRootNumber(), rejectedSpeciesNb)); }

1 0

r1052 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 May '13

30 May '13

Author: maven-release Date: 2013-05-30 16:41:16 +0200 (Thu, 30 May 2013) New Revision: 1052 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1052 Log: [maven-release-plugin] prepare for next development iteration 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-30 14:41:00 UTC (rev 1051) +++ trunk/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/tutti-persistence/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/tutti-service/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-30 14:41:00 UTC (rev 1051) +++ trunk/tutti-ui-swing/pom.xml 2013-05-30 14:41:16 UTC (rev 1052) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2</version> + <version>2.3-rc-3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1051 - tags
by maven-release＠users.forge.codelutin.com 30 May '13

30 May '13

Author: maven-release Date: 2013-05-30 16:41:00 +0200 (Thu, 30 May 2013) New Revision: 1051 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1051 Log: [maven-release-plugin] copy for tag tutti-2.3-rc-2 Added: tags/tutti-2.3-rc-2/

1 0

r1050 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 May '13

30 May '13

Author: maven-release Date: 2013-05-30 16:40:49 +0200 (Thu, 30 May 2013) New Revision: 1050 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1050 Log: [maven-release-plugin] prepare release tutti-2.3-rc-2 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-30 14:39:36 UTC (rev 1049) +++ trunk/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3-rc-2 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/tutti-persistence/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/tutti-service/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-05-30 14:39:36 UTC (rev 1049) +++ trunk/tutti-ui-swing/pom.xml 2013-05-30 14:40:49 UTC (rev 1050) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-2-SNAPSHOT</version> + <version>2.3-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0