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

r1090 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 10 Jun '13

10 Jun '13

Author: tchemit Date: 2013-06-10 15:16:14 +0200 (Mon, 10 Jun 2013) New Revision: 1090 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1090 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv (renommage de la colonne Vrac) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 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-06-10 09:50:08 UTC (rev 1089) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 13:16:14 UTC (rev 1090) @@ -76,7 +76,7 @@ switch (sampleCategoryEnum) { case sortedUnsorted: - addSampleCategory("Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + addSampleCategory("VracHorVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); break; case size: addSampleCategory("Cat_Tri", CatchExportRow.SIZE_SAMPLE_CATEGORY);

1 0

Build failed in Jenkins: tutti #893
by admin+hudson＠codelutin.com 10 Jun '13

10 Jun '13

See <http://ci.nuiton.org/jenkins/job/tutti/893/changes> Changes: [Kevin Morin] fixes #2689 [ERGO] Erreur de balise sur le libellé du traitement lors de l'export des données ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/tutti/ws/> Updating http://svn.forge.codelutin.com/svn/tutti/trunk at revision '2013-06-10T11:31:00.636 +0200' U tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties At revision 1088 Parsing POMs [trunk] $ /opt/jdk/bin/java -Xmx256m -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-agent-1.2.jar:/opt/maven3/boot/plexus-classworlds-2.4.2.jar org.jvnet.hudson.maven3.agent.Maven3Main /opt/maven3 /opt/repository/apache-tomcat-7.0.40/webapps/jenkins/WEB-INF/lib/remoting-2.22.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-1.2.jar 55832 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> -U -e clean install java.lang.reflect.InvocationTargetException 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:331) 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: java.lang.NoClassDefFoundError: org/apache/maven/cli/MavenLoggerManager at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:73) ... 18 more Caused by: java.lang.ClassNotFoundException: org.apache.maven.cli.MavenLoggerManager at org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230) ... 19 more channel stopped ERROR: Failed to parse POMs hudson.util.IOException2: java.lang.reflect.InvocationTargetException at hudson.maven.Maven3Builder.call(Maven3Builder.java:162) 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: java.lang.Exception: java.lang.reflect.InvocationTargetException at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:161) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) ... 10 more Caused by: java.lang.reflect.InvocationTargetException 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:331) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) ... 11 more Caused by: java.lang.NoClassDefFoundError: org/apache/maven/cli/MavenLoggerManager at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:73) ... 18 more Caused by: java.lang.ClassNotFoundException: org.apache.maven.cli.MavenLoggerManager at org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230) ... 19 more

1 3

r1089 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos marinelitter species
by kmorin＠users.forge.codelutin.com 10 Jun '13

10 Jun '13

Author: kmorin Date: 2013-06-10 11:50:08 +0200 (Mon, 10 Jun 2013) New Revision: 1089 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1089 Log: fixes #2632 [IMP/EXP] - Import/Export multi-postes : message avertissant que certaines donn?\195?\169es ne sont pas import?\195?\169es (alors que tout est import?\195?\169) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -92,31 +92,34 @@ Collection<BenthosBatch> notImportedBenthosBatches = (Collection<BenthosBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (BenthosBatch sb : notImportedBenthosBatches) { - batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); + stringBuffer.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editBenthosBatch.action.importMultiPost.success", file)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -91,20 +91,23 @@ Collection<MarineLitterBatch> notImportedMarineLitterBatches = (Collection<MarineLitterBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); if (totalWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); } for (MarineLitterBatch mlb : notImportedMarineLitterBatches) { - batchList.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); + stringBuffer.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editMarineLitterBatch.action.importMultiPost.success", file)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -91,31 +91,34 @@ Collection<SpeciesBatch> notImportedSpeciesBatches = (Collection<SpeciesBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (SpeciesBatch sb : notImportedSpeciesBatches) { - batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); + stringBuffer.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editSpeciesBatch.action.importMultiPost.success", file));

1 0

r1088 - trunk/tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 10 Jun '13

10 Jun '13

Author: kmorin Date: 2013-06-10 11:16:20 +0200 (Mon, 10 Jun 2013) New Revision: 1088 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1088 Log: fixes #2689 [ERGO] Erreur de balise sur le libell?\195?\169 du traitement lors de l'export des donn?\195?\169es Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 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-06-10 08:46:40 UTC (rev 1087) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 09:16:20 UTC (rev 1088) @@ -68,14 +68,14 @@ tutti.service.export.zip.error=Erreur lors de la création du zip d'export %s tutti.service.exportCruise.buildZip=Création de l'archive de l'export (fichier %s) tutti.service.exportCruise.checkCruise=Vérification de la campagne %s -tutti.service.exportCruise.exportAccidentalCatches=Export du fichier accidentalCatch.csv pour la campagne %s -tutti.service.exportCruise.exportCatches=Export du fichier catch.csv pour la campagne %s -tutti.service.exportCruise.exportIndividualObservations=Export du fichier individualObservation.csv pour la campagne %s -tutti.service.exportCruise.exportMarineLitters=Export du fichier marineLitter.csv pour la campagne %s -tutti.service.exportCruise.exportOperations=Export du fichier operations.csv pour la campagne %s -tutti.service.exportCruise.exportParameters=Export du fichier parameters.csv pour la campagne %s -tutti.service.exportCruise.exportSpecies=Export du fichier species.csv pour la campagne %s -tutti.service.exportCruise.exportSurvey=Export du fichier survey.csv pour la campagne %s +tutti.service.exportCruise.exportAccidentalCatches=<html>Export du fichier accidentalCatch.csv pour la campagne %s</html> +tutti.service.exportCruise.exportCatches=<html>Export du fichier catch.csv pour la campagne %s</html> +tutti.service.exportCruise.exportIndividualObservations=<html>Export du fichier individualObservation.csv pour la campagne %s</html> +tutti.service.exportCruise.exportMarineLitters=<html>Export du fichier marineLitter.csv pour la campagne %s</html> +tutti.service.exportCruise.exportOperations=<html>Export du fichier operations.csv pour la campagne %s</html> +tutti.service.exportCruise.exportParameters=<html>Export du fichier parameters.csv pour la campagne %s</html> +tutti.service.exportCruise.exportSpecies=<html>Export du fichier species.csv pour la campagne %s</html> +tutti.service.exportCruise.exportSurvey=<html>Export du fichier survey.csv pour la campagne %s</html> tutti.service.exportSumatra.error.species.null=L'espèce est nulle tutti.service.exportSumatra.error.station.null=Le trait est nul tutti.service.exportSumatra.header.number=NbIndividus

1 0

r1087 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by kmorin＠users.forge.codelutin.com 10 Jun '13

10 Jun '13

Author: kmorin Date: 2013-06-10 10:46:40 +0200 (Mon, 10 Jun 2013) New Revision: 1087 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1087 Log: fixes #2618 [PROTOCOLE] modification de la liste des param?\195?\168tres : le bouton enregistr?\195?\169 ne s'active pas donc on ne peut pas enregistrer les modifications Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-06-10 08:22:47 UTC (rev 1086) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-06-10 08:46:40 UTC (rev 1087) @@ -307,7 +307,7 @@ public void setGearUseFeaturePmfmId(List<String> gearUseFeaturePmfmId) { Object oldValue = getGearUseFeaturePmfmId(); editObject.setGearUseFeaturePmfmId(gearUseFeaturePmfmId); - firePropertyChange(PROPERTY_GEAR_USE_FEATURE_PMFM_ID, oldValue, gearUseFeaturePmfmId); + firePropertyChange(PROPERTY_GEAR_USE_FEATURE_PMFM_ID, null, gearUseFeaturePmfmId); } @Override @@ -319,7 +319,7 @@ public void setVesselUseFeaturePmfmId(List<String> vesselUseFeaturePmfmId) { Object oldValue = getVesselUseFeaturePmfmId(); editObject.setVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); - firePropertyChange(PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, oldValue, vesselUseFeaturePmfmId); + firePropertyChange(PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, null, vesselUseFeaturePmfmId); } @Override

1 0

r1086 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 10 Jun '13

10 Jun '13

Author: kmorin Date: 2013-06-10 10:22:47 +0200 (Mon, 10 Jun 2013) New Revision: 1086 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1086 Log: fixes #2612 [ERGO] Erreur d'orthographe sur le libell?\195?\169 du bandeau d'ex?\195?\169cution en cours fixes #2617 [PROTOCOLE] harmoniser l'intitul?\195?\169 de l'onglet "mise ne oeuvre du navire" ?\195?\160 "autres param?\195?\168tres" (donc idem avec les intitul?\195?\169s dans trait) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 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-06-10 08:17:28 UTC (rev 1085) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-06-10 08:22:47 UTC (rev 1086) @@ -779,7 +779,7 @@ tutti.editProtocol.tab.caracteristic=Caractéristiques tutti.editProtocol.tab.caracteristic.gearUseFeature=Mise en œuvre de l'engin tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille -tutti.editProtocol.tab.caracteristic.vesselUseFeature=Mise en œuvre du navire +tutti.editProtocol.tab.caracteristic.vesselUseFeature=Autres caractéristiques tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.table.header.age=Age @@ -1153,7 +1153,7 @@ 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.message.action.running=<html>Action %s en cours d'exécution...<hr/></html> tutti.multiPostImportLog.close=Fermer tutti.multiPostImportLog.close.mnemonic=F tutti.multiPostImportLog.close.tip=Fermer la popup

1 0

r1085 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com 10 Jun '13

10 Jun '13

Author: kmorin Date: 2013-06-10 10:17:28 +0200 (Mon, 10 Jun 2013) New Revision: 1085 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1085 Log: fixes #2622 [CONTROLE] - Erreur blocante ?\195?\160 la validation Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-06-04 13:43:20 UTC (rev 1084) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-06-10 08:17:28 UTC (rev 1085) @@ -314,27 +314,31 @@ Map<String, List<String>> warningMap = Maps.newHashMap(); Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); - for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { - if (isSpeciesBatchInvalid(batch, protocol)) { - String species = speciesDecorator.toString(batch.getSpecies()); - String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) - .toString(batch.getSampleCategoryValue()); - warningMap.put("species", - Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected", - species, categoryValue))); - break; + if (rootSpeciesBatch != null) { + for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { + if (isSpeciesBatchInvalid(batch, protocol)) { + String species = speciesDecorator.toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); + warningMap.put("species", + Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected", + species, categoryValue))); + break; + } } } - for (BenthosBatch batch : rootBenthosBatch.getChildren()) { - if (isBenthosBatchInvalid(batch, protocol)) { - String species = speciesDecorator.toString(batch.getSpecies()); - String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) - .toString(batch.getSampleCategoryValue()); - warningMap.put("benthos", - Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected", - species, categoryValue))); - break; + if (rootBenthosBatch != null) { + for (BenthosBatch batch : rootBenthosBatch.getChildren()) { + if (isBenthosBatchInvalid(batch, protocol)) { + String species = speciesDecorator.toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); + warningMap.put("benthos", + Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected", + species, categoryValue))); + break; + } } }

1 0

r1084 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 04 Jun '13

04 Jun '13

Author: maven-release Date: 2013-06-04 15:43:20 +0200 (Tue, 04 Jun 2013) New Revision: 1084 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1084 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-06-04 13:43:12 UTC (rev 1083) +++ trunk/pom.xml 2013-06-04 13:43:20 UTC (rev 1084) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3</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 + 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 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-04 13:43:12 UTC (rev 1083) +++ trunk/tutti-persistence/pom.xml 2013-06-04 13:43:20 UTC (rev 1084) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-04 13:43:12 UTC (rev 1083) +++ trunk/tutti-service/pom.xml 2013-06-04 13:43:20 UTC (rev 1084) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-04 13:43:12 UTC (rev 1083) +++ trunk/tutti-ui-swing/pom.xml 2013-06-04 13:43:20 UTC (rev 1084) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1083 - tags
by maven-release＠users.forge.codelutin.com 04 Jun '13

04 Jun '13

Author: maven-release Date: 2013-06-04 15:43:12 +0200 (Tue, 04 Jun 2013) New Revision: 1083 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1083 Log: [maven-release-plugin] copy for tag tutti-2.3 Added: tags/tutti-2.3/

1 0

r1082 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 04 Jun '13

04 Jun '13

Author: maven-release Date: 2013-06-04 15:43:02 +0200 (Tue, 04 Jun 2013) New Revision: 1082 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1082 Log: [maven-release-plugin] prepare release tutti-2.3 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-06-04 13:30:36 UTC (rev 1081) +++ trunk/pom.xml 2013-06-04 13:43:02 UTC (rev 1082) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3</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 </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 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) +++ trunk/tutti-persistence/pom.xml 2013-06-04 13:43:02 UTC (rev 1082) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) +++ trunk/tutti-service/pom.xml 2013-06-04 13:43:02 UTC (rev 1082) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) +++ trunk/tutti-ui-swing/pom.xml 2013-06-04 13:43:02 UTC (rev 1082) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0