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

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 June 10, 2013

June 10, 2013

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 June 10, 2013

June 10, 2013

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 June 10, 2013

June 10, 2013

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 June 10, 2013

June 10, 2013

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 June 10, 2013

June 10, 2013

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 June 4, 2013

June 4, 2013

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 June 4, 2013

June 4, 2013

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 June 4, 2013

June 4, 2013

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

r1081 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com June 4, 2013

June 4, 2013

Author: tchemit Date: 2013-06-04 15:30:36 +0200 (Tue, 04 Jun 2013) New Revision: 1081 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1081 Log: tidy poms 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:23:30 UTC (rev 1080) +++ trunk/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -34,27 +33,19 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> <version>2.3-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>tutti-persistence</module> - <module>tutti-service</module> - <module>tutti-ui-swing</module> - </modules> - <name>Tutti</name> - <description> Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. </description> - <inceptionYear>2012</inceptionYear> <url>http://forge.codelutin.com/projects/tutti</url> - + <inceptionYear>2012</inceptionYear> <organization> <name>Ifremer</name> <url>http://www.ifremer.fr/</url> </organization> - <licenses> <license> <name>General Public License (GPL)</name> @@ -88,6 +79,12 @@ </developer> </developers> + <modules> + <module>tutti-persistence</module> + <module>tutti-service</module> + <module>tutti-ui-swing</module> + </modules> + <scm> <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> @@ -97,7 +94,6 @@ scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> - <distributionManagement> <site> <id>${platform}</id> @@ -111,8 +107,6 @@ </snapshotRepository> </distributionManagement> - <packaging>pom</packaging> - <properties> <platform>forge.codelutin.com</platform> @@ -169,6 +163,35 @@ </properties> + <repositories> + <repository> + <id>tutti-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>tutti-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> @@ -415,16 +438,6 @@ </dependencyManagement> <build> - - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> - <pluginManagement> <plugins> @@ -483,40 +496,16 @@ </plugins> </pluginManagement> - + <extensions> +  + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0</version> + </extension> + </extensions> </build> -  - <repositories> - <repository> - <id>tutti-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>tutti-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <reporting> <excludeDefaults>true</excludeDefaults> </reporting> @@ -561,7 +550,6 @@ </plugins> </build> - </profile> <profile> <id>license-profile</id> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/tutti-persistence/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -181,6 +180,21 @@ </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <properties> + <property> + <name>listener</name> + <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> + </property> + </properties> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> @@ -226,23 +240,6 @@ </plugin> </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> - </property> - </properties> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> - </project> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/tutti-service/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -156,7 +155,21 @@ </dependencies> <build> - + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <properties> + <property> + <name>listener</name> + <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> + </property> + </properties> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> @@ -186,24 +199,6 @@ </plugin> </plugins> - - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> - </property> - </properties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/tutti-ui-swing/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -89,8 +88,149 @@ </properties> - <build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-persistence</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-service</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-updater</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + +  + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + </dependency> + +  + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + +  + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> <resources> <resource> <directory>src/main/filtered-resources</directory> @@ -115,7 +255,6 @@ </includes> </resource> </resources> - <plugins> <plugin> @@ -232,151 +371,8 @@ </plugin> </plugins> - </build> - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tutti-persistence</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tutti-service</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-updater</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - -  - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> - -  - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> - -  - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - <profiles>

1 0

r1080 - in trunk: . tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost
by tchemit＠users.forge.codelutin.com June 4, 2013

June 4, 2013

Author: tchemit Date: 2013-06-04 15:23:30 +0200 (Tue, 04 Jun 2013) New Revision: 1080 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1080 Log: updates jaxx to last stable version prepare release Modified: trunk/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-04 10:16:18 UTC (rev 1079) +++ trunk/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.22-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.22</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.14.1</xworkVersion> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-04 10:16:18 UTC (rev 1079) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-04 13:23:30 UTC (rev 1080) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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% + */ + /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-04 10:16:18 UTC (rev 1079) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-04 13:23:30 UTC (rev 1080) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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% + */ + import fr.ifremer.tutti.service.TuttiCsvUtil; /** Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-04 10:16:18 UTC (rev 1079) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-04 13:23:30 UTC (rev 1080) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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% + */ + /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-04 10:16:18 UTC (rev 1079) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-04 13:23:30 UTC (rev 1080) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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% + */ + import fr.ifremer.tutti.service.TuttiCsvUtil; /** Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

Build failed in Jenkins: tutti #887
by admin+hudson＠codelutin.com June 4, 2013

June 4, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/887/changes> Changes: [Kevin Morin] fixes #2424 [TRAIT] le tri sur la liste des traits n'est pas conservé quand on ferme l'écran trait. Concerver le choix comme on conserve le choix des colonnes masquées ------------------------------------------ [...truncated 327 lines...] 2013-06-04 12:36:55,303 4910 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@6c236c40, 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-06-04 12:36:55,309 4916 [main] INFO org.nuiton.i18n.init.I18nInitializer - 6 bundle(s) found, in 16 file(s). 2013-06-04 12:36:55,309 4916 [main] INFO org.nuiton.i18n.I18nStore - 6 bundle(s) found, [16 file(s)]. 2013-06-04 12:36:55,312 4919 [main] INFO org.nuiton.i18n.I18nLanguage - Encoding UTF-8 will be used to load files 2013-06-04 12:36:55,329 4936 [main] INFO org.nuiton.i18n.I18nStore - I18nLanguage <locale: en_GB, nbStences:355>, nbEntries: 6, nbSentences: 355. 2013-06-04 12:36:55,330 4937 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.DecoratorService@43e6b92a Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.433 sec Running fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportServiceTest 2013-06-04 12:36:55,345 4952 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@5c52d28a 2013-06-04 12:36:55,351 4958 [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-06-04 12:36:55,362 4969 [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-06-04 12:36:55,416 5023 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@5c52d28a 2013-06-04 12:36:55,418 5025 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@1c08001b 2013-06-04 12:36:55,476 5083 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@1c08001b 2013-06-04 12:36:55,479 5086 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@7cb5fb86 2013-06-04 12:36:55,479 5086 [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-06-04 12:36:55,485 5092 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@7cb5fb86 2013-06-04 12:36:55,488 5095 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@21c977ef 2013-06-04 12:36:55,495 5102 [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-06-04 12:36:55,503 5110 [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-06-04 12:36:55,508 5115 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@21c977ef 2013-06-04 12:36:55,510 5117 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@398e54e8 2013-06-04 12:36:55,565 5172 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@398e54e8 2013-06-04 12:36:55,568 5175 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@2f2563c6 2013-06-04 12:36:55,568 5175 [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-06-04 12:36:55,571 5178 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@2f2563c6 2013-06-04 12:36:55,574 5181 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3fb97458 2013-06-04 12:36:55,575 5182 [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-06-04 12:36:55,578 5185 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3fb97458 2013-06-04 12:36:55,580 5187 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@28855e17 2013-06-04 12:36:55,580 5187 [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-06-04 12:36:55,583 5190 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@28855e17 2013-06-04 12:36:55,585 5192 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4be44cc9 2013-06-04 12:36:55,585 5192 [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-06-04 12:36:55,607 5214 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4be44cc9 Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.267 sec Running fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-06-04 12:36:55,611 5218 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-06-04 12:36:55,613 5220 [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-06-04 12:36:55,620 5227 [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.014 sec Running fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-06-04 12:36:55,633 5240 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-06-04 12:36:55,634 5241 [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-06-04 12:36:55,637 5244 [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.012 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-SNAPSHOT/tutti-service-2.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-SNAPSHOT/tutti-service-2.3-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.3-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.22-… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target> [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.22-SNAPSHOT:generate (default) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). [INFO] Generated 41 file(s) in 53.234s [INFO] [INFO] --- jaxx-maven-plugin:2.5.22-SNAPSHOT: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 1391/1394 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 fr_FR contains 3/1768 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1682/1846 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 92 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…>:[478,37] error: method add in class SwingSession cannot be applied to given types; [ERROR] required: Component found: JComponent,boolean reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[276,43] [deprecation] getSelectedValues() in JList has been deprecated [INFO] 2 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [38.264s] [INFO] Tutti :: Persistence .............................. SUCCESS [1:05.621s] [INFO] Tutti :: Service .................................. SUCCESS [30.730s] [INFO] Tutti :: UI ....................................... FAILURE [1:34.578s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 3:52.744s [INFO] Finished at: Tue Jun 04 12:38:31 CEST 2013 [INFO] Final Memory: 66M/183M [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-06-04_12-34-25/archive/fr.ifremer.tutti/tutti-service/2.3-SNAPSHOT/tutti-service-2.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-06-04_12-34-25/archive/fr.ifremer.tutti/tutti-service/2.3-SNAPSHOT/tutti-service-2.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-06-04_12-34-26/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-SNAPSHOT/tutti-ui-swing-2.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-06-04_12-34-26/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-SNAPSHOT/tutti-ui-swing-2.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-06-04_12-34-25/archive/fr.ifremer/tutti/2.3-SNAPSHOT/tutti-2.3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.3-SNAPSHOT-s…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-06-04_12-34-25/archive/fr.ifremer/tutti/2.3-SNAPSHOT/tutti-2.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-06-04_12-34-25/archive/fr.ifremer.tutti/tutti-persistence/2.3-SNAPSHOT/tutti-persistence-2.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-06-04_12-34-25/archive/fr.ifremer.tutti/tutti-persistence/2.3-SNAPSHOT/tutti-persistence-2.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 1

Build failed in Jenkins: tutti » Tutti :: UI #887
by admin+hudson＠codelutin.com June 4, 2013

June 4, 2013

1 1

r1079 - in trunk: . tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content
by kmorin＠users.forge.codelutin.com June 4, 2013

June 4, 2013

Author: kmorin Date: 2013-06-04 12:16:18 +0200 (Tue, 04 Jun 2013) New Revision: 1079 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1079 Log: fixes #2424 [TRAIT] le tri sur la liste des traits n'est pas conserv?\195?\169 quand on ferme l'?\195?\169cran trait. Concerver le choix comme on conserve le choix des colonnes masqu?\195?\169es Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-04 08:16:09 UTC (rev 1078) +++ trunk/pom.xml 2013-06-04 10:16:18 UTC (rev 1079) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.21</jaxxVersion> + <jaxxVersion>2.5.22-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.14.1</xworkVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-06-04 08:16:09 UTC (rev 1078) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-06-04 10:16:18 UTC (rev 1079) @@ -475,7 +475,7 @@ } rightDecoration.add(showHelp, 0); this.currentBody = screenUI; - context.getSwingSession().add(currentBody); + context.getSwingSession().add(currentBody, true); ui.getBody().setTitle(screenTitle); ui.getBody().add(currentBody); ui.getBody().setLeftDecoration(new JLabel(icon));

1 0

r1078 - in trunk/tutti-ui-swing/src/main: assembly/full help/fr java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/config
by tchemit＠users.forge.codelutin.com June 4, 2013

June 4, 2013

Author: tchemit Date: 2013-06-04 10:16:09 +0200 (Tue, 04 Jun 2013) New Revision: 1078 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1078 Log: fixes #2608: [AIDE] Int?\195?\169grer le fichier d'aide dans la prochaine release Added: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt Modified: trunk/tutti-ui-swing/src/main/assembly/full/README.txt trunk/tutti-ui-swing/src/main/help/fr/index.html trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java Modified: trunk/tutti-ui-swing/src/main/assembly/full/README.txt =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/README.txt 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/assembly/full/README.txt 2013-06-04 08:16:09 UTC (rev 1078) @@ -0,0 +1,17 @@ +Pour démarrer Allegro Campagne Saisie +------------------------------------- + +# Sous Linux + +./tutti.sh + +# Sous windows + +tutti.bat + +Consulter l'aide +---------------- + +En attendant que l'aide soit finalisée, vous pouvez consulter ce document : + +help/Aide_Allegro_Campagne.odt \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/index.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-06-04 08:16:09 UTC (rev 1078) @@ -34,6 +34,12 @@ Documentation à rédiger +<h2>Documentation temporaire</h2> + +En attendant que la documentation finale soit terminée, vous pouvez consulter ce document : + +<a href="Aide_Allegro_Campagne.odt">Aide_Allegro_Campagne.odt</a> + <h2>Table des matières</h2> <ul> <li><a href="selectCruise.html">Sélection Série / Campagne / Protocole</a></li> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-06-04 08:16:09 UTC (rev 1078) @@ -792,8 +792,8 @@ throw new TuttiTechnicalException(_("tutti.context.helpPage.notFound", helpId)); } - File helpDirectory = getConfig().getHelpDirectoryWithLocale(); - URI resolvedUri = helpDirectory.toURI().resolve(value); + File helpDirectory = getConfig().getHelpResourceWithLocale(value); + URI resolvedUri = helpDirectory.toURI(); TuttiUIUtil.openLink(resolvedUri); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-06-04 08:16:09 UTC (rev 1078) @@ -310,9 +310,11 @@ TuttiApplicationConfigOption.TUTTI_HELP_DIRECTORY.getKey()); } - public File getHelpDirectoryWithLocale() { - File result = getHelpDirectory(); - return new File(result, getI18nLocale().getLanguage()); + public File getHelpResourceWithLocale(String value) { + File directory = new File(getHelpDirectory(), + getI18nLocale().getLanguage()); + File result = new File(directory, value); + return result; } public void setProgramId(String programId) {

1 0

r1077 - trunk
by tchemit＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: tchemit Date: 2013-06-03 23:29:02 +0200 (Mon, 03 Jun 2013) New Revision: 1077 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1077 Log: improve readme Modified: trunk/README.txt Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2013-06-03 21:27:58 UTC (rev 1076) +++ trunk/README.txt 2013-06-03 21:29:02 UTC (rev 1077) @@ -3,10 +3,10 @@ Fournir la version de la base à utiliser, renseigner la propriété *dbVersion* -mvn release:prepare -Darguments="-DdbVersion=2013.02.02" -mvn release:perform -Darguments="-DdbVersion=2013.02.02" +mvn release:prepare -Darguments="-DdbVersion=2013.06.04" +mvn release:perform -Darguments="-DdbVersion=2013.06.04" Pour préparer une release complête, lancer la commande : - mvn release:prepare -Darguments="-DperformFullRelease -DdbVersion=2013.02.02" - mvn release:perform -Darguments="-DperformFullRelease -DdbVersion=2013.02.02" \ No newline at end of file + mvn release:prepare -Darguments="-DperformFullRelease -DdbVersion=2013.06.04" + mvn release:perform -Darguments="-DperformFullRelease -DdbVersion=2013.06.04" \ No newline at end of file

1 0

r1076 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: tchemit Date: 2013-06-03 23:27:58 +0200 (Mon, 03 Jun 2013) New Revision: 1076 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1076 Log: prepare version 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-03 21:27:40 UTC (rev 1075) +++ trunk/pom.xml 2013-06-03 21:27:58 UTC (rev 1076) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-3-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> <modules> <module>tutti-persistence</module> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-03 21:27:40 UTC (rev 1075) +++ trunk/tutti-persistence/pom.xml 2013-06-03 21:27:58 UTC (rev 1076) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-3-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-03 21:27:40 UTC (rev 1075) +++ trunk/tutti-service/pom.xml 2013-06-03 21:27:58 UTC (rev 1076) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-3-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-03 21:27:40 UTC (rev 1075) +++ trunk/tutti-ui-swing/pom.xml 2013-06-03 21:27:58 UTC (rev 1076) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.3-rc-3-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1075 - trunk/tutti-persistence/src/test/resources
by tchemit＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: tchemit Date: 2013-06-03 23:27:40 +0200 (Mon, 03 Jun 2013) New Revision: 1075 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1075 Log: more dynamic config Modified: trunk/tutti-persistence/src/test/resources/tutti-test-read.properties Modified: trunk/tutti-persistence/src/test/resources/tutti-test-read.properties =================================================================== --- trunk/tutti-persistence/src/test/resources/tutti-test-read.properties 2013-06-03 14:00:43 UTC (rev 1074) +++ trunk/tutti-persistence/src/test/resources/tutti-test-read.properties 2013-06-03 21:27:40 UTC (rev 1075) @@ -22,6 +22,6 @@ # #L% ### tutti.persistence.db.directory=src/test/db -#tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/db/allegro -tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro +tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/db/allegro +#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro tutti.persistence.jdbc.createScript=src/test/db/allegro.script

1 0

r1074 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: kmorin Date: 2013-06-03 16:00:43 +0200 (Mon, 03 Jun 2013) New Revision: 1074 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1074 Log: fixes #2542 [MENSURATION] saisie simple d?\195?\169nombrement : doublon du champ ? Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-03 13:47:04 UTC (rev 1073) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-03 14:00:43 UTC (rev 1074) @@ -229,6 +229,10 @@ enabled: false; } +#lengthstepSettingsBlock { + visible: {!model.isSimpleCountingMode()}; +} + #dataFieldLayout { selected: {model.isSimpleCountingMode() ? "noLengthCaracteristicPmfm" : "lengthCaracteristicPmfm"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-06-03 13:47:04 UTC (rev 1073) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-06-03 14:00:43 UTC (rev 1074) @@ -187,7 +187,7 @@ </JPanel> </JPanel> </JPanel> - <Table fill='both' constraints='BorderLayout.SOUTH'> + <Table id="lengthstepSettingsBlock" fill='both' constraints='BorderLayout.SOUTH'> <row> <cell columns='6'> <JSeparator/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-03 13:47:04 UTC (rev 1073) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-03 14:00:43 UTC (rev 1074) @@ -229,6 +229,10 @@ enabled: false; } +#lengthstepSettingsBlock { + visible: {!model.isSimpleCountingMode()}; +} + #dataFieldLayout { selected: {model.isSimpleCountingMode() ? "noLengthCaracteristicPmfm" : "lengthCaracteristicPmfm"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-06-03 13:47:04 UTC (rev 1073) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-06-03 14:00:43 UTC (rev 1074) @@ -187,7 +187,7 @@ </JPanel> </JPanel> </JPanel> - <Table fill='both' constraints='BorderLayout.SOUTH'> + <Table id="lengthstepSettingsBlock" fill='both' constraints='BorderLayout.SOUTH'> <row> <cell columns='6'> <JSeparator/>

1 0

r1073 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/split species/split
by kmorin＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: kmorin Date: 2013-06-03 15:47:04 +0200 (Mon, 03 Jun 2013) New Revision: 1073 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1073 Log: fixes #2541 [MENSURATION] saisie des mensurations, titre de l'?\195?\169cran ?\195?\160 revoir Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2013-06-03 13:43:32 UTC (rev 1072) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2013-06-03 13:47:04 UTC (rev 1073) @@ -27,7 +27,7 @@ } #configurationPanel { - border: {new TitledBorder(null, _("tutti.legend.splitBenthosBatchConfiguration"))}; + border: {new TitledBorder(null, null)}; } #categoryLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-06-03 13:43:32 UTC (rev 1072) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-06-03 13:47:04 UTC (rev 1073) @@ -27,7 +27,7 @@ } #configurationPanel { - border: {new TitledBorder(null, _("tutti.legend.splitSpeciesBatchConfiguration"))}; + border: {new TitledBorder(null, null)}; } #categoryLabel {

1 0

r1072 - trunk/tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: kmorin Date: 2013-06-03 15:43:32 +0200 (Mon, 03 Jun 2013) New Revision: 1072 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1072 Log: fixes #2572 [EXPORT GENERIQUE] - Message d'erreur illisible 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-03 13:06:15 UTC (rev 1071) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-03 13:43:32 UTC (rev 1072) @@ -60,8 +60,8 @@ tutti.service.export.catches.error=Erreur lors de l'export des captures tutti.service.export.closeContext.error=Erreur lors de la fermeture du contexte d'export tutti.service.export.context.error=Erreur lors de la création des fichiers pour l'export -tutti.service.export.invalid.cruise=L'export de la campagne %s ne peut pas être réalisé suite aux erreurs rencontrées sur ses traits lors de l'élévation des poids \:\n%s -tutti.service.export.invalid.fishingOperation=L'élévation des poids ne peut pas être réalisé sur le trait %s, pour la raison suivante %s +tutti.service.export.invalid.cruise=L'export de la campagne %s ne peut pas être réalisé suite aux erreurs rencontrées sur ses traits lors de l'élévation des poids \:<ul>%s</ul> +tutti.service.export.invalid.fishingOperation=<li>L'élévation des poids ne peut pas être réalisée sur le trait %s, pour la raison suivante \:<ul><li>%s</li></ul></li> tutti.service.export.operations.error=Erreur lors de l'export des traits tutti.service.export.parameters.error=Erreur lors de l'export des paramètres tutti.service.export.survey.error=Erreur lors de l'export de la campagne

1 0

r1071 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: kmorin Date: 2013-06-03 15:06:15 +0200 (Mon, 03 Jun 2013) New Revision: 1071 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1071 Log: fixes #2534 [CAPTURE] import des lots sur les diff?\195?\169rents onglet : vide les champs en haut des tableaux... Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/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 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 Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -0,0 +1,44 @@ +package fr.ifremer.tutti.service.catches.multipost; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3 + */ +public class CatchWeightsRow { + + public static final String TOTAL_SORTED_WEIGHT = "totalSortedWeight"; + + public static final String INERT_WEIGHT = "inertWeight"; + + public static final String LIVING_NOT_ITEMIZED_WEIGHT = "livingNotItemizedWeight"; + + protected Float totalSortedWeight; + + protected Float inertWeight; + + protected Float livingNotItemizedWeight; + + public Float getTotalSortedWeight() { + return totalSortedWeight; + } + + public void setTotalSortedWeight(Float totalSortedWeight) { + this.totalSortedWeight = totalSortedWeight; + } + + public Float getInertWeight() { + return inertWeight; + } + + public void setInertWeight(Float inertWeight) { + this.inertWeight = inertWeight; + } + + public Float getLivingNotItemizedWeight() { + return livingNotItemizedWeight; + } + + public void setLivingNotItemizedWeight(Float livingNotItemizedWeight) { + this.livingNotItemizedWeight = livingNotItemizedWeight; + } +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -0,0 +1,23 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3 + */ +public class CatchWeightsRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<CatchWeightsRow> { + + public CatchWeightsRowModel(char separator) { + super(separator); + + newColumnForImportExport(CatchWeightsRow.TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(CatchWeightsRow.INERT_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(CatchWeightsRow.LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); + } + + @Override + public CatchWeightsRow newEmptyInstance() { + return new CatchWeightsRow(); + } +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.service.catches.multipost; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3 + */ +public class MarineLitterWeightRow { + + public static final String TOTAL_WEIGHT = "totalWeight"; + + protected Float totalWeight; + + public Float getTotalWeight() { + return totalWeight; + } + + public void setTotalWeight(Float totalWeight) { + this.totalWeight = totalWeight; + } +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -0,0 +1,21 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3 + */ +public class MarineLitterWeightRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<MarineLitterWeightRow> { + + public MarineLitterWeightRowModel(char separator) { + super(separator); + + newColumnForImportExport(MarineLitterWeightRow.TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + } + + @Override + public MarineLitterWeightRow newEmptyInstance() { + return new MarineLitterWeightRow(); + } +} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -36,18 +36,7 @@ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; -import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; -import fr.ifremer.tutti.persistence.entities.data.Attachment; -import fr.ifremer.tutti.persistence.entities.data.BatchContainer; -import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; -import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; -import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.data.*; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -73,10 +62,7 @@ import java.io.Reader; import java.io.Serializable; import java.io.Writer; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import static org.nuiton.i18n.I18n._; @@ -91,6 +77,8 @@ private static final Log log = LogFactory.getLog(TuttiMultiPostImportExportService.class); + public static final String BATCHES_KEY = "batchesKey"; + protected static final String ATTACHMENTS_DIRECTORY = "attachments"; protected static final String ATTACHMENTS_FILE = "attachments.csv"; @@ -109,6 +97,8 @@ protected static final String CARACTERISTIC_FILE = "caracteristics.csv"; + protected static final String WEIGHTS_FILE = "weights.csv"; + protected PersistenceService persistenceService; protected DecoratorService decoratorService; @@ -148,18 +138,29 @@ */ public void exportSpecies(File file, FishingOperation operation) { - BatchContainer<SpeciesBatch> speciesBatchContainer = - persistenceService.getRootSpeciesBatch(operation.getId()); + String operationId = operation.getId(); + if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { - List<CatchRow> rows = Lists.newArrayList(); - List<CatchFrequencyRow> frequencyRows = Lists.newArrayList(); - List<AttachmentRow> attachmentRows = Lists.newArrayList(); + BatchContainer<SpeciesBatch> speciesBatchContainer = + persistenceService.getRootSpeciesBatch(operationId); - for (SpeciesBatch batch : speciesBatchContainer.getChildren()) { - createSpeciesRow(batch, null, rows, frequencyRows, attachmentRows); + List<CatchRow> rows = Lists.newArrayList(); + List<CatchFrequencyRow> frequencyRows = Lists.newArrayList(); + List<AttachmentRow> attachmentRows = Lists.newArrayList(); + + for (SpeciesBatch batch : speciesBatchContainer.getChildren()) { + createSpeciesRow(batch, null, rows, frequencyRows, attachmentRows); + } + + // export weights + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operationId); + CatchWeightsRow weights = new CatchWeightsRow(); + weights.setTotalSortedWeight(catchBatch.getSpeciesTotalSortedWeight()); + weights.setInertWeight(catchBatch.getSpeciesTotalInertWeight()); + weights.setLivingNotItemizedWeight(catchBatch.getSpeciesTotalLivingNotItemizedWeight()); + + exportCatches(file, SPECIES_FILE, weights, rows, frequencyRows, attachmentRows); } - - exportCatches(file, SPECIES_FILE, rows, frequencyRows, attachmentRows); } /** @@ -169,18 +170,30 @@ * @param operation the operation to export */ public void exportBenthos(File file, FishingOperation operation) { - BatchContainer<BenthosBatch> benthosBatchContainer = - persistenceService.getRootBenthosBatch(operation.getId()); - List<CatchRow> rows = Lists.newArrayList(); - List<CatchFrequencyRow> frequencyRows = Lists.newArrayList(); - List<AttachmentRow> attachmentRows = Lists.newArrayList(); + String operationId = operation.getId(); + if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { - for (BenthosBatch batch : benthosBatchContainer.getChildren()) { - createBenthosRow(batch, null, rows, frequencyRows, attachmentRows); + BatchContainer<BenthosBatch> benthosBatchContainer = + persistenceService.getRootBenthosBatch(operationId); + + List<CatchRow> rows = Lists.newArrayList(); + List<CatchFrequencyRow> frequencyRows = Lists.newArrayList(); + List<AttachmentRow> attachmentRows = Lists.newArrayList(); + + for (BenthosBatch batch : benthosBatchContainer.getChildren()) { + createBenthosRow(batch, null, rows, frequencyRows, attachmentRows); + } + + // export weights + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operationId); + CatchWeightsRow weights = new CatchWeightsRow(); + weights.setTotalSortedWeight(catchBatch.getBenthosTotalSortedWeight()); + weights.setInertWeight(catchBatch.getBenthosTotalInertWeight()); + weights.setLivingNotItemizedWeight(catchBatch.getBenthosTotalLivingNotItemizedWeight()); + + exportCatches(file, BENTHOS_FILE, weights, rows, frequencyRows, attachmentRows); } - - exportCatches(file, BENTHOS_FILE, rows, frequencyRows, attachmentRows); } /** @@ -191,58 +204,82 @@ */ public void exportMarineLitter(File file, FishingOperation operation) { - BatchContainer<MarineLitterBatch> marineLitterBatchContainer = - persistenceService.getRootMarineLitterBatch(operation.getId()); + String operationId = operation.getId(); + if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { - List<MarineLitterRow> rows = Lists.newArrayList(); - List<AttachmentRow> attachmentRows = Lists.newArrayList(); + BatchContainer<MarineLitterBatch> marineLitterBatchContainer = + persistenceService.getRootMarineLitterBatch(operationId); - for (MarineLitterBatch batch : marineLitterBatchContainer.getChildren()) { - MarineLitterRow row = new MarineLitterRow(); + List<MarineLitterRow> rows = Lists.newArrayList(); + List<AttachmentRow> attachmentRows = Lists.newArrayList(); - String id = UUID.randomUUID().toString(); - row.setBatchId(id); + for (MarineLitterBatch batch : marineLitterBatchContainer.getChildren()) { + MarineLitterRow row = new MarineLitterRow(); - row.setCategory(batch.getMarineLitterCategory()); - row.setSizeCategory(batch.getMarineLitterSizeCategory()); - row.setNumber(batch.getNumber()); - row.setWeight(batch.getWeight()); - row.setComment(batch.getComment()); + String id = UUID.randomUUID().toString(); + row.setBatchId(id); - rows.add(row); + row.setCategory(batch.getMarineLitterCategory()); + row.setSizeCategory(batch.getMarineLitterSizeCategory()); + row.setNumber(batch.getNumber()); + row.setWeight(batch.getWeight()); + row.setComment(batch.getComment()); - addAttachments(id, batch.getIdAsInt(), AttachementObjectTypeEnum.BATCH, attachmentRows); - } + rows.add(row); - MarineLitterRowModel csvModel = new MarineLitterRowModel(csvSeparator); + addAttachments(id, batch.getIdAsInt(), AttachementObjectTypeEnum.BATCH, attachmentRows); + } - BufferedWriter writer = null; - File directory = Files.createTempDir(); - List<File> file2zip = Lists.newArrayList(); + MarineLitterRowModel csvModel = new MarineLitterRowModel(csvSeparator); - File speciesFile = new File(directory, MARINE_LITTER_FILE); - file2zip.add(speciesFile); - try { - writer = Files.newWriter(speciesFile, Charsets.UTF_8); - Export export = Export.newExport(csvModel, rows); - export.write(writer); - writer.close(); - } catch (Exception e) { - throw new TuttiTechnicalException(_("tutti.service.multipost.export.batches.error", speciesFile), e); - } finally { - IOUtils.closeQuietly(writer); - } + BufferedWriter writer = null; + File directory = Files.createTempDir(); + List<File> file2zip = Lists.newArrayList(); - exportAttachments(directory, file2zip, attachmentRows); + File speciesFile = new File(directory, MARINE_LITTER_FILE); + file2zip.add(speciesFile); + try { + writer = Files.newWriter(speciesFile, Charsets.UTF_8); + Export export = Export.newExport(csvModel, rows); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.batches.error", speciesFile), e); + } finally { + IOUtils.closeQuietly(writer); + } - try { - ZipUtil.compressFiles(file, directory, file2zip); + // export weight + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operationId); + MarineLitterWeightRow weight = new MarineLitterWeightRow(); + weight.setTotalWeight(catchBatch.getMarineLitterTotalWeight()); - } catch (IOException e) { - throw new TuttiTechnicalException(_("tutti.service.multipost.export.error", file), e); + MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); - } finally { - TuttiIOUtil.deleteDirectory(directory, _("tutti.service.multipost.export.deleteTempDirectory.error", file)); + File weightFile = new File(directory, WEIGHTS_FILE); + file2zip.add(weightFile); + try { + writer = Files.newWriter(weightFile, Charsets.UTF_8); + Export export = Export.newExport(weightModel, Lists.newArrayList(weight)); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.weight.error", weightFile), e); + } finally { + IOUtils.closeQuietly(writer); + } + + exportAttachments(directory, file2zip, attachmentRows); + + try { + ZipUtil.compressFiles(file, directory, file2zip); + + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.error", file), e); + + } finally { + TuttiIOUtil.deleteDirectory(directory, _("tutti.service.multipost.export.deleteTempDirectory.error", file)); + } } } @@ -429,8 +466,9 @@ * @param operation the operation in which to add the batches * @return the list of the species which have not been imported, because there were concurrent batches */ - public Collection<SpeciesBatch> importSpecies(File file, FishingOperation operation) { + public Map<String, Object> importSpecies(File file, FishingOperation operation) { + Map<String, Object> notImportedData = Maps.newHashMap(); final Map<String, SpeciesBatch> notImportedBatches = Maps.newLinkedHashMap(); BatchContainer<SpeciesBatch> speciesBatches = @@ -581,7 +619,50 @@ }; importAttachments(tempDir, getObjetcIdFunction, AttachementObjectTypeEnum.BATCH); - return notImportedBatches.values(); + // import weights + File weightsFile = new File(tempDir, WEIGHTS_FILE); + try { + reader = Files.newReader(weightsFile, Charsets.UTF_8); + + } catch (FileNotFoundException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); + } + + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); + Import<CatchWeightsRow> weights = Import.newImport(weightsModel, reader); + + Iterator<CatchWeightsRow> iterator = weights.iterator(); + if (iterator.hasNext()) { + CatchWeightsRow row = iterator.next(); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + catchBatch.setFishingOperation(operation); + + if (catchBatch.getSpeciesTotalSortedWeight() == null) { + catchBatch.setSpeciesTotalSortedWeight(row.getTotalSortedWeight()); + + } else if (row.getTotalSortedWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, row.getTotalSortedWeight()); + } + + if (catchBatch.getSpeciesTotalInertWeight() == null) { + catchBatch.setSpeciesTotalInertWeight(row.getInertWeight()); + + } else if (row.getInertWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, row.getInertWeight()); + } + + if (catchBatch.getSpeciesTotalLivingNotItemizedWeight() == null) { + catchBatch.setSpeciesTotalLivingNotItemizedWeight(row.getLivingNotItemizedWeight()); + + } else if (row.getLivingNotItemizedWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, + row.getLivingNotItemizedWeight()); + } + persistenceService.saveCatchBatch(catchBatch); + } + + notImportedData.put(BATCHES_KEY, notImportedBatches.values()); + return notImportedData; } /** @@ -591,8 +672,9 @@ * @param operation the operation in which to add the batches * @return the list of the benthos which have not been imported, because there were concurrent batches */ - public Collection<BenthosBatch> importBenthos(File file, FishingOperation operation) { + public Map<String, Object> importBenthos(File file, FishingOperation operation) { + Map<String, Object> notImportedData = Maps.newHashMap(); final Map<String, BenthosBatch> notImportedBatches = Maps.newLinkedHashMap(); BatchContainer<BenthosBatch> benthosBatches = @@ -743,7 +825,51 @@ }; importAttachments(tempDir, getObjetcIdFunction, AttachementObjectTypeEnum.BATCH); - return notImportedBatches.values(); + // import weights + File weightsFile = new File(tempDir, WEIGHTS_FILE); + try { + reader = Files.newReader(weightsFile, Charsets.UTF_8); + + } catch (FileNotFoundException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); + } + + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); + Import<CatchWeightsRow> weights = Import.newImport(weightsModel, reader); + + Iterator<CatchWeightsRow> iterator = weights.iterator(); + if (iterator.hasNext()) { + CatchWeightsRow row = iterator.next(); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + catchBatch.setFishingOperation(operation); + + if (catchBatch.getBenthosTotalSortedWeight() == null) { + catchBatch.setBenthosTotalSortedWeight(row.getTotalSortedWeight()); + + } else if (row.getTotalSortedWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, row.getTotalSortedWeight()); + } + + if (catchBatch.getBenthosTotalInertWeight() == null) { + catchBatch.setBenthosTotalInertWeight(row.getInertWeight()); + + } else if (row.getInertWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, row.getInertWeight()); + } + + if (catchBatch.getBenthosTotalLivingNotItemizedWeight() == null) { + catchBatch.setBenthosTotalLivingNotItemizedWeight(row.getLivingNotItemizedWeight()); + + } else if (row.getLivingNotItemizedWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, + row.getLivingNotItemizedWeight()); + } + + persistenceService.saveCatchBatch(catchBatch); + } + + notImportedData.put(BATCHES_KEY, notImportedBatches.values()); + return notImportedData; } /** @@ -753,12 +879,15 @@ * @param operation the operation in which to add the batches * @return the list of the marine litter which have not been imported, because there were concurrent batches */ - public Collection<MarineLitterBatch> importMarineLitter(File file, FishingOperation operation) { + public Map<String, Object> importMarineLitter(File file, FishingOperation operation) { + String operationId = operation.getId(); + + Map<String, Object> notImportedData = Maps.newHashMap(); final Map<String, MarineLitterBatch> notImportedBatches = Maps.newLinkedHashMap(); BatchContainer<MarineLitterBatch> marineLitterBatches = - persistenceService.getRootMarineLitterBatch(operation.getId()); + persistenceService.getRootMarineLitterBatch(operationId); // map containing the batches by their persistence id final Map<String, MarineLitterBatch> batches = Maps.newHashMap(); @@ -847,7 +976,36 @@ }; importAttachments(tempDir, getObjetcIdFunction, AttachementObjectTypeEnum.BATCH); - return notImportedBatches.values(); + // import weights + File weightsFile = new File(tempDir, WEIGHTS_FILE); + try { + reader = Files.newReader(weightsFile, Charsets.UTF_8); + + } catch (FileNotFoundException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); + } + + MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); + Import<MarineLitterWeightRow> weight = Import.newImport(weightModel, reader); + + Iterator<MarineLitterWeightRow> iterator = weight.iterator(); + if (iterator.hasNext()) { + MarineLitterWeightRow row = iterator.next(); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operationId); + catchBatch.setFishingOperation(operation); + + if (catchBatch.getMarineLitterTotalWeight() == null) { + catchBatch.setMarineLitterTotalWeight(row.getTotalWeight()); + + } else if (row.getTotalWeight() != null) { + notImportedData.put(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, row.getTotalWeight()); + } + + persistenceService.saveCatchBatch(catchBatch); + } + + notImportedData.put(BATCHES_KEY, notImportedBatches.values()); + return notImportedData; } /** @@ -1084,17 +1242,31 @@ protected void exportCatches(File file, String batchFile, + CatchWeightsRow weights, List<CatchRow> rows, List<CatchFrequencyRow> frequencyRows, List<AttachmentRow> attachmentRows) { CatchRowModel csvModel = new CatchRowModel(csvSeparator); CatchFrequencyRowModel csvFrequencyModel = new CatchFrequencyRowModel(csvSeparator); - AttachmentRowModel csvAttachmentModel = new AttachmentRowModel(csvSeparator); + CatchWeightsRowModel catchWeightsModel = new CatchWeightsRowModel(csvSeparator); BufferedWriter writer = null; File directory = Files.createTempDir(); List<File> file2zip = Lists.newArrayList(); + File weightsFile = new File(directory, WEIGHTS_FILE); + file2zip.add(weightsFile); + try { + writer = Files.newWriter(weightsFile, Charsets.UTF_8); + Export export = Export.newExport(catchWeightsModel, Lists.newArrayList(weights)); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.weights.error", weightsFile), e); + } finally { + IOUtils.closeQuietly(writer); + } + File speciesFile = new File(directory, batchFile); file2zip.add(speciesFile); try { Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-03 13:06:15 UTC (rev 1071) @@ -94,11 +94,14 @@ tutti.service.multipost.export.error= tutti.service.multipost.export.frequencies.error= tutti.service.multipost.export.species.error= +tutti.service.multipost.export.weight.error= +tutti.service.multipost.export.weights.error= tutti.service.multipost.import.attachments.error= tutti.service.multipost.import.batches.error= tutti.service.multipost.import.caracteristics.error= tutti.service.multipost.import.frequencies.error= tutti.service.multipost.import.species.error= +tutti.service.multipost.import.weights.error= tutti.service.multipost.resolveArchive.error= tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= 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-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-03 13:06:15 UTC (rev 1071) @@ -90,10 +90,13 @@ tutti.service.multipost.export.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire tutti.service.multipost.export.error=Erreur lors de la création du fichier d'export tutti.service.multipost.export.frequencies.error=Erreur lors de l'export des mensurations +tutti.service.multipost.export.weight.error=Erreur lors de l'export des poids +tutti.service.multipost.export.weights.error=Erreur lors de l'export des poids tutti.service.multipost.import.attachments.error=Erreur lors de l'import des pièces-jointes tutti.service.multipost.import.batches.error=Erreur lors de l'import des lots 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.import.weights.error=Erreur lors de l'import des poids tutti.service.multipost.resolveArchive.error=Erreur lors de l'ouverture de l'archive 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) 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-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -25,13 +25,17 @@ */ import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; import javax.swing.JTextArea; import java.awt.Dialog; import java.util.Collection; +import java.util.Map; import static org.nuiton.i18n.I18n._; @@ -41,7 +45,7 @@ */ public class ImportMultiPostAction extends AbstractImportMultiPostAction<BenthosBatchUIModel, BenthosBatchUI, BenthosBatchUIHandler> { - protected Collection<BenthosBatch> notImportedBenthosBatches; + protected Map<String, Object> notImportedData; public ImportMultiPostAction(BenthosBatchUIHandler handler) { super(handler); @@ -69,23 +73,43 @@ @Override protected void releaseAction() { - notImportedBenthosBatches = null; + notImportedData = null; super.releaseAction(); } @Override protected void importBatches(FishingOperation operation) { - notImportedBenthosBatches = multiPostImportExportService.importBenthos(file, operation); + notImportedData = multiPostImportExportService.importBenthos(file, operation); } @Override public void postSuccessAction() { super.postSuccessAction(); - if (!notImportedBenthosBatches.isEmpty()) { + if (!notImportedData.isEmpty()) { MultiPostImportLogDialog dialog = new MultiPostImportLogDialog((Dialog) getContext().getActionUI()); + Collection<BenthosBatch> notImportedBenthosBatches = + (Collection<BenthosBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); + JTextArea batchList = dialog.getBatchList(); + + Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT); + if (totalSortedWeight != null) { + batchList.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"); + } + + Float livingNotItemizedWeight = + (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); + if (livingNotItemizedWeight != null) { + batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + } + for (BenthosBatch sb : notImportedBenthosBatches) { batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } 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-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -24,14 +24,17 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; +import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; import javax.swing.JTextArea; import java.awt.Dialog; import java.util.Collection; +import java.util.Map; import static org.nuiton.i18n.I18n._; @@ -41,7 +44,7 @@ */ public class ImportMultiPostAction extends AbstractImportMultiPostAction<MarineLitterBatchUIModel, MarineLitterBatchUI, MarineLitterBatchUIHandler> { - protected Collection<MarineLitterBatch> notImportedMarineLitterBatches; + protected Map<String, Object> notImportedData; public ImportMultiPostAction(MarineLitterBatchUIHandler handler) { super(handler); @@ -69,23 +72,32 @@ @Override protected void releaseAction() { - notImportedMarineLitterBatches = null; + notImportedData = null; super.releaseAction(); } @Override protected void importBatches(FishingOperation operation) { - notImportedMarineLitterBatches = multiPostImportExportService.importMarineLitter(file, operation); + notImportedData = multiPostImportExportService.importMarineLitter(file, operation); } @Override public void postSuccessAction() { super.postSuccessAction(); - if (!notImportedMarineLitterBatches.isEmpty()) { + if (!notImportedData.isEmpty()) { MultiPostImportLogDialog dialog = new MultiPostImportLogDialog((Dialog) getContext().getActionUI()); + Collection<MarineLitterBatch> notImportedMarineLitterBatches = + (Collection<MarineLitterBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); + JTextArea batchList = dialog.getBatchList(); + + Float totalWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); + if (totalWeight != null) { + batchList.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); + } + for (MarineLitterBatch mlb : notImportedMarineLitterBatches) { batchList.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); } 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-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-03 13:06:15 UTC (rev 1071) @@ -24,14 +24,17 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; import javax.swing.JTextArea; import java.awt.Dialog; import java.util.Collection; +import java.util.Map; import static org.nuiton.i18n.I18n._; @@ -41,7 +44,7 @@ */ public class ImportMultiPostAction extends AbstractImportMultiPostAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - protected Collection<SpeciesBatch> notImportedSpeciesBatches; + protected Map<String, Object> notImportedData; public ImportMultiPostAction(SpeciesBatchUIHandler handler) { super(handler); @@ -69,23 +72,43 @@ @Override protected void releaseAction() { - notImportedSpeciesBatches = null; + notImportedData = null; super.releaseAction(); } @Override protected void importBatches(FishingOperation operation) { - notImportedSpeciesBatches = multiPostImportExportService.importSpecies(file, operation); + notImportedData = multiPostImportExportService.importSpecies(file, operation); } @Override public void postSuccessAction() { super.postSuccessAction(); - if (!notImportedSpeciesBatches.isEmpty()) { + if (!notImportedData.isEmpty()) { MultiPostImportLogDialog dialog = new MultiPostImportLogDialog((Dialog) getContext().getActionUI()); + Collection<SpeciesBatch> notImportedSpeciesBatches = + (Collection<SpeciesBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); + JTextArea batchList = dialog.getBatchList(); + + Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); + if (totalSortedWeight != null) { + batchList.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"); + } + + Float livingNotItemizedWeight = + (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); + if (livingNotItemizedWeight != null) { + batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + } + for (SpeciesBatch sb : notImportedSpeciesBatches) { batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } 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-06-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-06-03 13:06:15 UTC (rev 1071) @@ -1200,8 +1200,12 @@ tutti.multiPostImportLog.close= tutti.multiPostImportLog.close.mnemonic= tutti.multiPostImportLog.close.tip= +tutti.multiPostImportLog.inertWeight= +tutti.multiPostImportLog.livingNotItemizedWeight= tutti.multiPostImportLog.message= tutti.multiPostImportLog.title= +tutti.multiPostImportLog.totalSortedWeight= +tutti.multiPostImportLog.totalWeight= tutti.property.= tutti.property.get.error= tutti.property.set.error= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-06-02 20:20:45 UTC (rev 1070) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-06-03 13:06:15 UTC (rev 1071) @@ -1157,8 +1157,12 @@ tutti.multiPostImportLog.close=Fermer tutti.multiPostImportLog.close.mnemonic=F tutti.multiPostImportLog.close.tip=Fermer la popup -tutti.multiPostImportLog.message=Des lots n'ont pas été importés car des lots existants avaient déjà les mêmes espèces et catégorie de tri +tutti.multiPostImportLog.inertWeight=Poids inerte trié \: %s kg +tutti.multiPostImportLog.livingNotItemizedWeight=Poids vivant non détaillé \: %s kg +tutti.multiPostImportLog.message=Des données n'ont pas été importées car ces données avaient déjà été saisies \: tutti.multiPostImportLog.title=Lots non importés +tutti.multiPostImportLog.totalSortedWeight=Poids total trié \: %s kg +tutti.multiPostImportLog.totalWeight=Poids total \: %s kg 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’échantillonnage

1 0

r1070 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com June 2, 2013

June 2, 2013

Author: kmorin Date: 2013-06-02 22:20:45 +0200 (Sun, 02 Jun 2013) New Revision: 1070 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1070 Log: refs #2541 [MENSURATION] saisie des mensurations, titre de l'?\195?\169cran ?\195?\160 revoir Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-02 20:19:36 UTC (rev 1069) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-02 20:20:45 UTC (rev 1070) @@ -170,7 +170,7 @@ } #configurationPanel { - border: {new TitledBorder(null, _("tutti.legend.frequencyConfiguration"))}; + border: {new TitledBorder(null, null)}; } #modeConfigurationLayout { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-02 20:19:36 UTC (rev 1069) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-02 20:20:45 UTC (rev 1070) @@ -170,7 +170,7 @@ } #configurationPanel { - border: {new TitledBorder(null, _("tutti.legend.frequencyConfiguration"))}; + border: {new TitledBorder(null, null)}; } #modeConfigurationLayout {

1 0

r1069 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com June 2, 2013

June 2, 2013

Author: kmorin Date: 2013-06-02 22:19:36 +0200 (Sun, 02 Jun 2013) New Revision: 1069 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1069 Log: fixes #2499 [MENSURATION] possibilit?\195?\169 de mettre plusieurs lignes avec la m?\195?\170me classe de taille Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-02 12:30:41 UTC (rev 1068) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-02 20:19:36 UTC (rev 1069) @@ -599,7 +599,7 @@ // already exist doublon = lengthStep; - continue; + break; } index++; } @@ -608,7 +608,7 @@ // can't save mensurations (found doublon) String message = _("tutti.editBenthosFrequencies.error.length.doublon", - doublon, index); + doublon, index + 1); TuttiUIContext.getErrorHelper().showErrorDialog( message); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-06-02 12:30:41 UTC (rev 1068) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-06-02 20:19:36 UTC (rev 1069) @@ -604,7 +604,7 @@ // already exist doublon = lengthStep; - continue; + break; } index++; } @@ -613,7 +613,7 @@ // can't save mensurations (found doublon) String message = _("tutti.editSpeciesFrequencies.error.length.doublon", - doublon, index); + doublon, index + 1); TuttiUIContext.getErrorHelper().showErrorDialog( message);

1 0

r1068 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches util/table
by kmorin＠users.forge.codelutin.com June 2, 2013

June 2, 2013

Author: kmorin Date: 2013-06-02 14:30:41 +0200 (Sun, 02 Jun 2013) New Revision: 1068 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1068 Log: fixes #2451 [ERGO] - ESPECES et MENSURATIONS : Probl?\195?\168me de saisie et de navigation dans les tableaux Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-05-31 16:47:10 UTC (rev 1067) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-06-02 12:30:41 UTC (rev 1068) @@ -102,6 +102,10 @@ editor.add(BorderLayout.CENTER, numberEditor); } + public NumberEditor getNumberEditor() { + return numberEditor; + } + @Override public Component getTableCellEditorComponent(JTable table, Object value, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-31 16:47:10 UTC (rev 1067) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-06-02 12:30:41 UTC (rev 1068) @@ -28,11 +28,13 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent.SampleCategoryEditor; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.editor.TuttiComputedOrNotDataTableCell.TuttiComputedOrNotDataTableCellEditor; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.apache.commons.collections.CollectionUtils; @@ -473,6 +475,15 @@ if (cellEditor instanceof NumberCellEditor) { NumberCellEditor editor = (NumberCellEditor) cellEditor; editor.getNumberEditor().getTextField().addKeyListener(keyAdapter); + + } else if (cellEditor instanceof TuttiComputedOrNotDataTableCellEditor) { + TuttiComputedOrNotDataTableCellEditor editor = + (TuttiComputedOrNotDataTableCellEditor) cellEditor; + editor.getNumberEditor().getTextField().addKeyListener(keyAdapter); + + } else if (cellEditor instanceof SampleCategoryEditor) { + SampleCategoryEditor editor = (SampleCategoryEditor) cellEditor; + editor.getNumberEditor().getTextField().addKeyListener(keyAdapter); } } }

1 0