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

r1287 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/catches/multipost resources/i18n
by tchemit＠users.forge.codelutin.com 08 Oct '13

08 Oct '13

Author: tchemit Date: 2013-10-08 16:12:38 +0200 (Tue, 08 Oct 2013) New Revision: 1287 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1287 Log: fixes #3460: [CAPTURE] test des imports exports mutipostes quel est la clef ? Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2013-10-08 13:47:04 UTC (rev 1286) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2013-10-08 14:12:38 UTC (rev 1287) @@ -74,6 +74,8 @@ import java.io.File; import java.io.Reader; import java.io.Serializable; +import java.util.Calendar; +import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -1188,24 +1190,26 @@ return Pair.of(categoryId, value); } - protected void checkSameOperation(File directory, - AbstractFishingOperationRowModel fishingOperationRowModel, - FishingOperation operation) { + protected <FO extends AbstractFishingOperationRow> void checkSameOperation(File directory, + AbstractFishingOperationRowModel<FO> fishingOperationRowModel, + FishingOperation operation) { Reader reader = TuttiIOUtil.newReader( new File(directory, WEIGHTS_FILE), n_("tutti.service.multipost.import.operation.error")); try { - Import<AbstractFishingOperationRow> importer = Import.<AbstractFishingOperationRow>newImport(fishingOperationRowModel, reader); + Import<FO> importer = Import.newImport(fishingOperationRowModel, reader); - Iterator<AbstractFishingOperationRow> iterator = importer.iterator(); + Iterator<FO> iterator = importer.iterator(); try { if (iterator.hasNext()) { - AbstractFishingOperationRow row = iterator.next(); + FO row = iterator.next(); + Date rowDate = dateWithNoTime(row.getDate()); + Date operationDate = dateWithNoTime(operation.getGearShootingStartDate()); if (ObjectUtils.notEqual(row.getStationNumber(), operation.getStationNumber()) || ObjectUtils.notEqual(row.getOperationNumber(), operation.getFishingOperationNumber()) || ObjectUtils.notEqual(row.getMultirigAggregation(), operation.getMultirigAggregation()) - || ObjectUtils.notEqual(row.getDate(), operation.getGearShootingStartDate())) { + || ObjectUtils.notEqual(rowDate, operationDate)) { throw new TuttiBusinessException(_("tutti.service.multipost.import.wrongOperation.error", decoratorService.getDecoratorByType(FishingOperation.class) @@ -1274,6 +1278,17 @@ } } + protected Date dateWithNoTime(Date date) { + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + return calendar.getTime(); + } + protected <R extends TuttiEntity> void importAttachments(File directory, final Map<String, R> data, AttachementObjectTypeEnum objectType) { 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-10-08 13:47:04 UTC (rev 1286) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-10-08 14:12:38 UTC (rev 1287) @@ -113,6 +113,7 @@ tutti.service.multipost.uncompress.error= tutti.service.operations.cleanWeights.benthos.batch= tutti.service.operations.cleanWeights.error.redundant.frequencyWeight= +tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight= tutti.service.operations.cleanWeights.error.redundant.weight= tutti.service.operations.cleanWeights.species.batch= tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=

1 0

r1286 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 08 Oct '13

08 Oct '13

Author: tchemit Date: 2013-10-08 15:47:04 +0200 (Tue, 08 Oct 2013) New Revision: 1286 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1286 Log: fixes #3458: [CONFIGURATION] Am?\195?\169liorer la description de la configuration Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.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/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2013-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2013-10-08 13:47:04 UTC (rev 1286) @@ -485,8 +485,7 @@ if (sampleCategoryWeight != null && ObjectUtils.equals(parentSampleCategoryWeight, sampleCategoryWeight)) { - result = _( - "tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", + result = _("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", weightUnit.fromEntity(sampleCategoryWeight), weightUnit.getShortLabel(), getCategoryLabel(batch), @@ -516,8 +515,7 @@ persistenceService.countFrequenciesWeight(frequencies, true); if (ObjectUtils.equals(weight, frequenciesWeigth)) { - result = _( - "tutti.service.operations.cleanWeights.error.redundant.frequencyWeight", + result = _("tutti.service.operations.cleanWeights.error.redundant.frequencyWeight", weightUnit.fromEntity(weight), weightUnit.getShortLabel(), getCategoryLabel(batch)); @@ -539,8 +537,7 @@ Float sampleCategoryWeight = batch.getSampleCategoryWeight(); if (weight != null && ObjectUtils.equals(weight, sampleCategoryWeight)) { - result = _( - "tutti.service.operations.cleanWeights.error.redundant.weight", + result = _("tutti.service.operations.cleanWeights.error.redundant.weight", weightUnit.fromEntity(weight), weightUnit.getShortLabel(), getCategoryLabel(batch)); 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-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-10-08 13:47:04 UTC (rev 1286) @@ -69,7 +69,6 @@ tutti.service.export.closeContext.error= tutti.service.export.context.error= tutti.service.export.invalid.cruise= -tutti.service.export.invalid.cruise2= tutti.service.export.invalid.fishingOperation= tutti.service.export.operations.error= tutti.service.export.parameters.error= @@ -113,6 +112,8 @@ tutti.service.multipost.import.wrongOperation.error= tutti.service.multipost.uncompress.error= tutti.service.operations.cleanWeights.benthos.batch= +tutti.service.operations.cleanWeights.error.redundant.frequencyWeight= +tutti.service.operations.cleanWeights.error.redundant.weight= tutti.service.operations.cleanWeights.species.batch= tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight= tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight= 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-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-10-08 13:47:04 UTC (rev 1286) @@ -1,8 +1,8 @@ -tutti.common.unit= -tutti.common.unit.g= -tutti.common.unit.kg= -tutti.common.unit.short.g= -tutti.common.unit.short.kg= +tutti.common.unit=Unité +tutti.common.unit.g=Gramme +tutti.common.unit.kg=Kilogramme +tutti.common.unit.short.g=g +tutti.common.unit.short.kg=kg tutti.config.option.basedir.description=Répertoire principale tutti.config.option.csv.separator.description=Caractère séparateur pour les import / export de fichier au format csv. tutti.config.option.data.directory.description=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). @@ -69,7 +69,6 @@ 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=Erreur d'élévation de poids sur les traits de la campagne %s \:<ul>%s</ul> -tutti.service.export.invalid.cruise2=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 Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-10-08 13:47:04 UTC (rev 1286) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Oct 03 13:39:06 CEST 2013 +#Tue Oct 08 15:36:15 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -96,6 +96,7 @@ tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.reset.help= tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-10-08 13:47:04 UTC (rev 1286) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Oct 03 13:39:06 CEST 2013 +#Tue Oct 08 15:36:15 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -96,6 +96,7 @@ tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.reset.help= tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-10-08 13:47:04 UTC (rev 1286) @@ -47,6 +47,7 @@ import javax.swing.JComponent; import java.awt.BorderLayout; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -128,19 +129,28 @@ n_("tutti.config.category.applications.description"), CALLBACK_APPLICATION) .addOption(TuttiServiceConfigOption.CSV_SEPARATOR) + .setOptionShortLabel(_("tutti.config.option.csv.separator.shortLabel")) + .addOption(TuttiApplicationConfigOption.UI_CONFIG_FILE) + .setOptionShortLabel(_("tutti.config.option.ui.config.file.shortLabel")) + .addOption(TuttiApplicationConfigOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE) - .addOption(TuttiApplicationConfigOption.MAX_INDIVIDUAL_OBSERVATION_ROW_TO_CREATE); + .setOptionShortLabel(_("tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel")) + .addOption(TuttiApplicationConfigOption.MAX_INDIVIDUAL_OBSERVATION_ROW_TO_CREATE) + .setOptionShortLabel(_("tutti.config.option.ui.individualObservationRowsToCreate.shortLabel")); + if (context.isDbLoaded()) { VesselTableCell vesselTableCellComponent = new VesselTableCell(context); helper.addOption(TuttiApplicationConfigOption.TREMIE_CAROUSSEL_VESSEL_ID) + .setOptionShortLabel(_("tutti.config.option.tremieCarousselVessel.shortLabel")) .setOptionEditor(vesselTableCellComponent.getNewTableCellEditor()) .setOptionRenderer(vesselTableCellComponent.getNewTableCellRenderer()); TuttiLocationTableCell tuttiLocationTableCellComponent = new TuttiLocationTableCell(context); helper.addOption(TuttiServiceConfigOption.EXPORT_COUNTRY_ID) + .setOptionShortLabel(_("tutti.config.option.export.countryId.shortLabel")) .setOptionEditor(tuttiLocationTableCellComponent.getNewTableCellEditor()) .setOptionRenderer(tuttiLocationTableCellComponent.getNewTableCellRenderer()); } @@ -151,47 +161,107 @@ n_("tutti.config.category.ui.description"), CALLBACK_UI) .addOption(TuttiApplicationConfigOption.COLOR_ALTERNATE_ROW) + .setOptionShortLabel(_("tutti.config.option.ui.color.alternateRow.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_SELECTED_ROW) + .setOptionShortLabel(_("tutti.config.option.ui.color.selectedRow.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_ROW_INVALID) + .setOptionShortLabel(_("tutti.config.option.ui.color.rowInvalid.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_ROW_READ_ONLY) + .setOptionShortLabel(_("tutti.config.option.ui.color.rowReadOnly.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_CELL_WITH_VALUE) + .setOptionShortLabel(_("tutti.config.option.ui.color.cellWithValue.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_ROW_TO_CONFIRM) + .setOptionShortLabel(_("tutti.config.option.ui.color.rowToConfirm.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_COMPUTED_WEIGHTS) + .setOptionShortLabel(_("tutti.config.option.ui.color.computedWeights.shortLabel")) + .addOption(TuttiApplicationConfigOption.COLOR_BLOCKING_LAYER) + .setOptionShortLabel(_("tutti.config.option.ui.color.blockingLayer.shortLabel")) + .addOption(TuttiApplicationConfigOption.DATE_FORMAT) - .addOption(TuttiApplicationConfigOption.COORDINATE_EDITOR_TYPE); + .setOptionShortLabel(_("tutti.config.option.ui.dateFormat.shortLabel")) + .addOption(TuttiApplicationConfigOption.COORDINATE_EDITOR_TYPE) + .setOptionShortLabel(_("tutti.config.option.ui.coordinateEditorType.shortLabel")); + // Weight Unit category helper.addCategory(n_("tutti.config.category.weightUnit"), n_("tutti.config.category.weightUnit.description"), CALLBACK_UI) .addOption(TuttiServiceConfigOption.WEIGHT_UNIT_SPECIES) + .setOptionShortLabel(_("tutti.config.option.weight.unit.species.shortLabel")) + .addOption(TuttiServiceConfigOption.WEIGHT_UNIT_BENTHOS) + .setOptionShortLabel(_("tutti.config.option.weight.unit.benthos.shortLabel")) + .addOption(TuttiServiceConfigOption.WEIGHT_UNIT_MARINE_LITTER) + .setOptionShortLabel(_("tutti.config.option.weight.unit.marineLitter.shortLabel")) + .addOption(TuttiServiceConfigOption.WEIGHT_UNIT_INDIVIDUAL_OBSERVATION) - .addOption(TuttiServiceConfigOption.WEIGHT_UNIT_ACCIDENTAL_CATCH); + .setOptionShortLabel(_("tutti.config.option.weight.unit.individualObservation.shortLabel")) + .addOption(TuttiServiceConfigOption.WEIGHT_UNIT_ACCIDENTAL_CATCH) + .setOptionShortLabel(_("tutti.config.option.weight.unit.accidentalCatch.shortLabel")); + // Technical category helper.addCategory(n_("tutti.config.category.technical"), n_("tutti.config.category.technical.description")) .addOption(TuttiServiceConfigOption.BASEDIR) + .setOptionShortLabel(_("tutti.config.option.basedir.shortLabel")) + .addOption(TuttiServiceConfigOption.DATA_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.data.directory.shortLabel")) + .addOption(TuttiServiceConfigOption.TMP_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.tmp.directory.shortLabel")) + .addOption(TuttiApplicationConfigOption.TUTTI_I18N_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.i18n.directory.shortLabel")) + .addOption(TuttiApplicationConfigOption.TUTTI_HELP_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.help.directory.shortLabel")) + .addOption(TuttiPersistenceConfigOption.DB_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.persistence.db.directory.shortLabel")) + .addOption(TuttiPersistenceConfigOption.DB_ATTACHMENT_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.persistence.db.attachment.directory.shortLabel")) + .addOption(TuttiPersistenceConfigOption.DB_PROTOCOL_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.persistence.db.protocol.directory.shortLabel")) + .addOption(TuttiPersistenceConfigOption.DB_CACHE_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.persistence.db.cache.directory.shortLabel")) + + .addOption(TuttiPersistenceConfigOption.DB_BACKUP_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.persistence.db.backup.directory.shortLabel")) + .addOption(TuttiPersistenceConfigOption.DB_CONFIGURATION_PATH) + .setOptionShortLabel(_("tutti.config.option.persistence.db.configurationPath.shortLabel")) + .addOption(TuttiPersistenceConfigOption.DB_ENUMERATION_PATH) + .setOptionShortLabel(_("tutti.config.option.persistence.db.enumerationPath.shortLabel")) + .addOption(TuttiPersistenceConfigOption.JDBC_URL) + .setOptionShortLabel(_("tutti.config.option.persistence.jdbc.url.shortLabel")) + .addOption(TuttiServiceConfigOption.SITE_URL) + .setOptionShortLabel(_("tutti.config.option.site.url.shortLabel")) + .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_APPLICATION_URL) - .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_DB_URL); + .setOptionShortLabel(_("tutti.config.option.update.application.url.shortLabel")) + .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_DB_URL) + .setOptionShortLabel(_("tutti.config.option.update.db.url.shortLabel")); + helper.setFinalizer(new MainCallBackFinalizer(CALLBACK_APPLICATION)); helper.setCloseAction(new Runnable() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-10-08 13:47:04 UTC (rev 1286) @@ -331,6 +331,7 @@ actionIcon: export; text: "tutti.editCatchBatch.action.exportFishingOperationReport"; toolTipText: "tutti.editCatchBatch.action.exportFishingOperationReport.tip"; + i18nMnemonic: "tutti.editCatchBatch.action.exportFishingOperationReport.mnemonic"; _tuttiAction: {ExportFishingOperationReportAction.class}; _help: {"tutti.editCatchBatch.action.exportFishingOperationReport.help"}; } @@ -339,6 +340,7 @@ actionIcon: export; text: "tutti.editCatchBatch.action.exportFishingOperationReportForSumatra"; toolTipText: "tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.tip"; + i18nMnemonic: "tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.mnemonic"; _tuttiAction: {ExportFishingOperationForSumatraAction.class}; _help: {"tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help"}; } 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-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-10-08 13:47:04 UTC (rev 1286) @@ -304,8 +304,8 @@ #resetButton { actionIcon: reset; - text: "tutti.editSpeciesFrequencies.action.reset"; - toolTipText: "tutti.editSpeciesFrequencies.action.reset.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.reset.mnemonic"; - _help: {"tutti.editSpeciesFrequencies.action.reset.help"}; + text: "tutti.editBenthosFrequencies.action.reset"; + toolTipText: "tutti.editBenthosFrequencies.action.reset.tip"; + i18nMnemonic: "tutti.editBenthosFrequencies.action.reset.mnemonic"; + _help: {"tutti.editBenthosFrequencies.action.reset.help"}; } \ No newline at end of file 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-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-10-08 13:47:04 UTC (rev 1286) @@ -86,11 +86,6 @@ tutti.common.file.tuttiMarineLitter= tutti.common.file.tuttiSpecies= tutti.common.file.zip= -tutti.common.unit=Unit -tutti.common.unit.g=Gramme -tutti.common.unit.kg=kilogram -tutti.common.unit.short.g=g -tutti.common.unit.short.kg=Kg tutti.common.validate= tutti.common.validate.mnemonic= tutti.config.action.reload.actions= @@ -105,39 +100,71 @@ tutti.config.category.ui.description= tutti.config.category.weightUnit= tutti.config.category.weightUnit.description= +tutti.config.option.basedir.shortLabel= tutti.config.option.cruiseId.description= +tutti.config.option.csv.separator.shortLabel= +tutti.config.option.data.directory.shortLabel= +tutti.config.option.export.countryId.shortLabel= tutti.config.option.help.directory.description= +tutti.config.option.help.directory.shortLabel= tutti.config.option.i18n.directory.description= +tutti.config.option.i18n.directory.shortLabel= tutti.config.option.i18n.locale.description= tutti.config.option.launch.mode.description= +tutti.config.option.persistence.db.attachment.directory.shortLabel= +tutti.config.option.persistence.db.backup.directory.shortLabel= +tutti.config.option.persistence.db.cache.directory.shortLabel= +tutti.config.option.persistence.db.configurationPath.shortLabel= +tutti.config.option.persistence.db.directory.shortLabel= +tutti.config.option.persistence.db.enumerationPath.shortLabel= +tutti.config.option.persistence.db.protocol.directory.shortLabel= +tutti.config.option.persistence.jdbc.url.shortLabel= tutti.config.option.programId.description= tutti.config.option.protocolId.description= +tutti.config.option.site.url.shortLabel= tutti.config.option.startActionFile.description= +tutti.config.option.tmp.directory.shortLabel= tutti.config.option.tremieCarousselVessel.description= +tutti.config.option.tremieCarousselVessel.shortLabel= tutti.config.option.ui.adminPassword.description= tutti.config.option.ui.autoPopupNumberEditor.description= tutti.config.option.ui.color.alternateRow.description= +tutti.config.option.ui.color.alternateRow.shortLabel= tutti.config.option.ui.color.blockingLayer.description= +tutti.config.option.ui.color.blockingLayer.shortLabel= tutti.config.option.ui.color.cellWithValue.description= +tutti.config.option.ui.color.cellWithValue.shortLabel= tutti.config.option.ui.color.computedWeights.description= +tutti.config.option.ui.color.computedWeights.shortLabel= tutti.config.option.ui.color.rowInvalid.description= +tutti.config.option.ui.color.rowInvalid.shortLabel= tutti.config.option.ui.color.rowReadOnly.description= +tutti.config.option.ui.color.rowReadOnly.shortLabel= tutti.config.option.ui.color.rowToConfirm.description= +tutti.config.option.ui.color.rowToConfirm.shortLabel= tutti.config.option.ui.color.selectedRow.description= +tutti.config.option.ui.color.selectedRow.shortLabel= tutti.config.option.ui.config.file.description= +tutti.config.option.ui.config.file.shortLabel= tutti.config.option.ui.coordinateEditorType.description= +tutti.config.option.ui.coordinateEditorType.shortLabel= tutti.config.option.ui.dateFormat.description= +tutti.config.option.ui.dateFormat.shortLabel= tutti.config.option.ui.individualObservationRowsToCreate.description= +tutti.config.option.ui.individualObservationRowsToCreate.shortLabel= tutti.config.option.ui.shortcut.closePopup.description= tutti.config.option.ui.showNumberEditorButton.description= -tutti.config.option.ui.weight.unit.accidentalCatch.description= -tutti.config.option.ui.weight.unit.benthos.description= -tutti.config.option.ui.weight.unit.individualObservation.description= -tutti.config.option.ui.weight.unit.marineLitter.description= -tutti.config.option.ui.weight.unit.species.description= tutti.config.option.update.application.url.description= +tutti.config.option.update.application.url.shortLabel= tutti.config.option.update.db.url.description= +tutti.config.option.update.db.url.shortLabel= +tutti.config.option.weight.unit.accidentalCatch.shortLabel= +tutti.config.option.weight.unit.benthos.shortLabel= +tutti.config.option.weight.unit.individualObservation.shortLabel= +tutti.config.option.weight.unit.marineLitter.shortLabel= +tutti.config.option.weight.unit.species.shortLabel= tutti.config.option.weights.rate.difference.totalAndSorted.description= +tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel= tutti.config.parse.error= tutti.config.save.error= tutti.config.title= @@ -220,8 +247,6 @@ tutti.createIndividualObservationBatch.field.individualObservationSpecies.tip= tutti.createIndividualObservationBatch.field.individualObservationWeight= tutti.createIndividualObservationBatch.field.individualObservationWeight.tip= -tutti.createIndividualObservationBatch.help= -tutti.createIndividualObservationBatch.message= tutti.createIndividualObservationBatch.title= tutti.createMarineLitterBatch.action.cancel= tutti.createMarineLitterBatch.action.cancel.mnemonic= @@ -265,7 +290,6 @@ tutti.createSpeciesBatch.field.sampleWeight.tip= tutti.createSpeciesBatch.field.species= tutti.createSpeciesBatch.field.species.tip= -tutti.createSpeciesBatch.message.countOrCategorize= tutti.createSpeciesBatch.title= tutti.createSpeciesMelag.action.cancel= tutti.createSpeciesMelag.action.cancel.mnemonic= @@ -463,6 +487,9 @@ tutti.editBenthosFrequencies.action.generate= tutti.editBenthosFrequencies.action.generate.mnemonic= tutti.editBenthosFrequencies.action.generate.tip= +tutti.editBenthosFrequencies.action.reset= +tutti.editBenthosFrequencies.action.reset.mnemonic= +tutti.editBenthosFrequencies.action.reset.tip= tutti.editBenthosFrequencies.action.saveAndClose= tutti.editBenthosFrequencies.action.saveAndClose.mnemonic= tutti.editBenthosFrequencies.action.saveAndClose.tip= @@ -506,11 +533,9 @@ tutti.editCatchBatch.action.cleanWeights= tutti.editCatchBatch.action.cleanWeights.done= tutti.editCatchBatch.action.cleanWeights.double.weight.detected= -tutti.editCatchBatch.action.cleanWeights.errors.found= tutti.editCatchBatch.action.cleanWeights.help= tutti.editCatchBatch.action.cleanWeights.mnemonic= tutti.editCatchBatch.action.cleanWeights.no.double.weight.detected= -tutti.editCatchBatch.action.cleanWeights.no.weight.to.remove= tutti.editCatchBatch.action.cleanWeights.tip= tutti.editCatchBatch.action.cleanWieghts.resume.title= tutti.editCatchBatch.action.computeWeights= @@ -524,14 +549,14 @@ tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title= tutti.editCatchBatch.action.computeWeights.tip= tutti.editCatchBatch.action.exportFishingOperationReport= +tutti.editCatchBatch.action.exportFishingOperationReport.mnemonic= tutti.editCatchBatch.action.exportFishingOperationReport.tip= tutti.editCatchBatch.action.exportFishingOperationReportForSumatra= +tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.mnemonic= tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.tip= tutti.editCatchBatch.action.saveCatchBatch= tutti.editCatchBatch.action.saveCatchBatch.mnemonic= tutti.editCatchBatch.action.saveCatchBatch.tip= -tutti.editCatchBatch.action.sendCruiseReport= -tutti.editCatchBatch.action.sendCruiseReport.tip= tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch= tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch= tutti.editCatchBatch.field.benthosTotalSampleSortedWeight= @@ -1097,9 +1122,6 @@ tutti.exportFishingOperationReport.action.chooseFile= tutti.exportFishingOperationReport.action.success= tutti.exportFishingOperationReport.title.choose.exportFile= -tutti.exportFishingOperationReportForSumatra.action.chooseFile= -tutti.exportFishingOperationReportForSumatra.action.success= -tutti.exportFishingOperationReportForSumatra.title.choose.exportFile= tutti.exportProgram.action.exportErrors= tutti.exportProgram.action.success= tutti.exportProtocol.action.success= @@ -1407,9 +1429,6 @@ tutti.sendCruiseReport.mail.body= tutti.sendCruiseReport.mail.subject= tutti.sendCruiseReport.title.choose.exportFile= -tutti.sendFishingOperationReport.action.chooseFile= -tutti.sendFishingOperationReport.action.success= -tutti.sendFishingOperationReport.title.choose.exportFile= tutti.splitBenthosBatch.action.cancel= tutti.splitBenthosBatch.action.cancel.mnemonic= tutti.splitBenthosBatch.action.cancel.tip= @@ -1443,7 +1462,6 @@ tutti.splitSpeciesBatch.table.header.weight= tutti.splitSpeciesBatch.title= tutti.timeeditor.H= -tutti.update.= tutti.update.db= tutti.update.help= tutti.update.i18n= @@ -1480,7 +1498,6 @@ tutti.validator.error.createMarineLitterBatch.number.invalidValue= tutti.validator.error.createMarineLitterBatch.number.required= tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue= -tutti.validator.error.createSpeciesBatch.countAndCategories.notPossible= tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= tutti.validator.error.createSpeciesBatch.species.required= tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable= 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-10-08 13:32:03 UTC (rev 1285) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-10-08 13:47:04 UTC (rev 1286) @@ -1,4 +1,3 @@ -enthosBatch.field.batchWeight=Poids total à catégoriser swing.error.cannot.mail=Erreur lors de l'ouverture du client mail swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de l'application swing.error.cannot.open.link=Impossible d'ouvrir le fichier %s @@ -87,11 +86,6 @@ tutti.common.file.tuttiMarineLitter=Fichier d'import/export des lots de déchets tutti.common.file.tuttiSpecies=Fichier d'import/export des lots d'espèces tutti.common.file.zip=Extension d'une archive zip -tutti.common.unit=Unité -tutti.common.unit.g=Gramme -tutti.common.unit.kg=Kilogramme -tutti.common.unit.short.g=g -tutti.common.unit.short.kg=kg tutti.common.validate=Valider tutti.common.validate.mnemonic=V tutti.config.action.reload.actions=Recharger les actions @@ -106,39 +100,71 @@ tutti.config.category.ui.description=Options de l'interface utilisateur tutti.config.category.weightUnit=Unité des poids tutti.config.category.weightUnit.description=Configurer les Unités des poids capturés selon de type de capture (espèce, benthos, ...) +tutti.config.option.basedir.shortLabel=Répertoire principale tutti.config.option.cruiseId.description=Identifiant de la dernière campagne utilisée +tutti.config.option.csv.separator.shortLabel=Caractère séparateur (csv) +tutti.config.option.data.directory.shortLabel=Répertoire de données +tutti.config.option.export.countryId.shortLabel=Id du pays à utiliser (export) tutti.config.option.help.directory.description=Répertoire des fichiers d'aide +tutti.config.option.help.directory.shortLabel=Répertoire des fichiers d'aide tutti.config.option.i18n.directory.description=Répertoire des fichiers de traductions +tutti.config.option.i18n.directory.shortLabel=Répertoire des fichiers de traductions tutti.config.option.i18n.locale.description=Langue utilisée dans l'application tutti.config.option.launch.mode.description=Mode de démarrage de l'application +tutti.config.option.persistence.db.attachment.directory.shortLabel=Répertoire des pieèces-jointes +tutti.config.option.persistence.db.backup.directory.shortLabel=Répertoire des sauvegardes +tutti.config.option.persistence.db.cache.directory.shortLabel=Répertoire du cache de base +tutti.config.option.persistence.db.configurationPath.shortLabel=Chemin vers la configuration +tutti.config.option.persistence.db.directory.shortLabel=Répertoire de la base de données +tutti.config.option.persistence.db.enumerationPath.shortLabel=Chemin vers le fichier constantes +tutti.config.option.persistence.db.protocol.directory.shortLabel=Répertoire des protocoles +tutti.config.option.persistence.jdbc.url.shortLabel=Url jdbc de connexion tutti.config.option.programId.description=Identifiant de la dernière série de campagne utilisée tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé +tutti.config.option.site.url.shortLabel=URL du site technique tutti.config.option.startActionFile.description=Fichier +tutti.config.option.tmp.directory.shortLabel=Répertoire temporaire tutti.config.option.tremieCarousselVessel.description=Navire ayant un carrousel et une trémie (ex. Thalassa) +tutti.config.option.tremieCarousselVessel.shortLabel=Navire ayant un carrousel et une trémie tutti.config.option.ui.adminPassword.description=MD5 du mot de passe des zones sensibles tutti.config.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.config.option.ui.color.alternateRow.description=Couleur de fond des lignes paires (non sélectionnée) dans un tableau +tutti.config.option.ui.color.alternateRow.shortLabel=Couleur alternée tutti.config.option.ui.color.blockingLayer.description=Couleur utilisée pour bloquer l'interface lors d'une action longue +tutti.config.option.ui.color.blockingLayer.shortLabel=Couleur d'attente tutti.config.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données +tutti.config.option.ui.color.cellWithValue.shortLabel=Couleur cellule avec donnée tutti.config.option.ui.color.computedWeights.description=Couleur des données calculées +tutti.config.option.ui.color.computedWeights.shortLabel=Couleur de valeur calculée tutti.config.option.ui.color.rowInvalid.description=Ligne invalide +tutti.config.option.ui.color.rowInvalid.shortLabel=Couleur d'une ligne invalide tutti.config.option.ui.color.rowReadOnly.description=Cellule non éditable +tutti.config.option.ui.color.rowReadOnly.shortLabel=Couleur d'une cellule en lecture seule tutti.config.option.ui.color.rowToConfirm.description=Ligne à confirmer +tutti.config.option.ui.color.rowToConfirm.shortLabel=Couleur d'une espèce à confirmer tutti.config.option.ui.color.selectedRow.description=Couleur de fond d'une ligne sélectionnée dans un tableau +tutti.config.option.ui.color.selectedRow.shortLabel=Couleur d'une ligne sélectionnée tutti.config.option.ui.config.file.description=Chemin du fichier de configuration des interfaces graphiques +tutti.config.option.ui.config.file.shortLabel=Chemin du fichier de confirmation tutti.config.option.ui.coordinateEditorType.description=Type de l'éditeur de coordonnées +tutti.config.option.ui.coordinateEditorType.shortLabel=Formateur de coordonnées tutti.config.option.ui.dateFormat.description=Format de dates +tutti.config.option.ui.dateFormat.shortLabel=Format des dates tutti.config.option.ui.individualObservationRowsToCreate.description=Nombre maximum de données individuelles à créer sans demande de confirmation +tutti.config.option.ui.individualObservationRowsToCreate.shortLabel=Nombre max de données individuelles tutti.config.option.ui.shortcut.closePopup.description=Fermer une popup tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie -tutti.config.option.ui.weight.unit.accidentalCatch.description=Unité de poids à utiliser dans la saisies des captures accidentelles -tutti.config.option.ui.weight.unit.benthos.description=Unité de poids à utiliser dans la saisies du benthos -tutti.config.option.ui.weight.unit.individualObservation.description=Unité de poids à utiliser dans la saisies des données individuelles -tutti.config.option.ui.weight.unit.marineLitter.description=Unité de poids à utiliser dans la saisies des macro-déchêts -tutti.config.option.ui.weight.unit.species.description=Unité de poids à utiliser dans la saisies des espèces tutti.config.option.update.application.url.description=URL de mise à jour des applicatifs +tutti.config.option.update.application.url.shortLabel=URL de mise à jour des applicatifs tutti.config.option.update.db.url.description=URL de mise à jour de la base de données +tutti.config.option.update.db.url.shortLabel=URL de mise à jour de la base de données +tutti.config.option.weight.unit.accidentalCatch.shortLabel=Unité capture accidentelle +tutti.config.option.weight.unit.benthos.shortLabel=Unité Benthos +tutti.config.option.weight.unit.individualObservation.shortLabel=Unité données individuelles +tutti.config.option.weight.unit.marineLitter.shortLabel=Unité Macro-déchêts +tutti.config.option.weight.unit.species.shortLabel=Unité Espèces tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie +tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.save.error=Erreur lors de la sauvegarde de la configuration dans le fichier %s tutti.config.title=Configuration @@ -462,6 +488,7 @@ tutti.editBenthosFrequencies.action.generate.mnemonic=G tutti.editBenthosFrequencies.action.generate.tip=Générer les mensurations tutti.editBenthosFrequencies.action.reset=Réinitialiser +tutti.editBenthosFrequencies.action.reset.mnemonic=R tutti.editBenthosFrequencies.action.reset.tip=Supprimer toutes les mensurations saisies tutti.editBenthosFrequencies.action.saveAndClose=Enregistrer et Fermer tutti.editBenthosFrequencies.action.saveAndClose.mnemonic=F @@ -1069,7 +1096,6 @@ tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé tutti.editSpeciesFrequencies.title=Mensuration -tutti.editbenthosFrequencies.action.reset.mnemonic=R tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url %s n'est pas joignable) tutti.error.delete.startActionFile=Impossible de supprimer le fichier %s tutti.error.errorpane.htmlmessage=<html><body>Une erreur s'est produite\: %s</body></html> @@ -1096,9 +1122,6 @@ tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport tutti.exportFishingOperationReport.action.success=Le trait a été exporté dans le fichier %s tutti.exportFishingOperationReport.title.choose.exportFile=Exporter le trait de la campagne -tutti.exportFishingOperationReportForSumatra.action.chooseFile=Choisir le fichier d'export -tutti.exportFishingOperationReportForSumatra.action.success=Les captures du trait ont correctement été exporté dans le fichier %s -tutti.exportFishingOperationReportForSumatra.title.choose.exportFile=Exporter les captures du trait sélectionné tutti.exportProgram.action.exportErrors=Des erreurs sont apparues pendant l'élévation des poids d'une campagne de la série %s. L'export a cependant été réalisé.<hr/>Erreur(s) rencontrée(s) \: %s tutti.exportProgram.action.success=La série de campagne %s a été exportée dans le fichier %s. tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier %2s. @@ -1160,7 +1183,6 @@ tutti.importDb.step.closeDb=Fermeture de la base tutti.importDb.step.openDb=Ouverture de la base de données %s tutti.importDb.step.unzipArchive=Décompression de l'archive -tutti.importDb.step.updateReferential=Mise à jour des référentiels tutti.importDb.step.will.migrateSchema=Démarrage de la mise à jour du schéma de la base depuis la version %s vers la version %s tutti.importProtocol.action.success=Protocole [%s] lu depuis le fichier. tutti.importPupitri.carrouselFile.extension=car @@ -1423,7 +1445,6 @@ tutti.splitBenthosBatch.table.header.selected=Sélection tutti.splitBenthosBatch.table.header.weight=Poids tutti.splitBenthosBatch.title=Catégorisation du lot -tutti.splitBtutti.exportFishingOperationReport.action.success=Le trait a correctement été exporté dans le fichier %s tutti.splitSpeciesBatch.action.cancel=Annuler tutti.splitSpeciesBatch.action.cancel.mnemonic=A tutti.splitSpeciesBatch.action.cancel.tip=Annuler le sous-échantillonnage

1 0

r1285 - trunk
by tchemit＠users.forge.codelutin.com 08 Oct '13

08 Oct '13

Author: tchemit Date: 2013-10-08 15:32:03 +0200 (Tue, 08 Oct 2013) New Revision: 1285 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1285 Log: fix adagio version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-08 13:29:46 UTC (rev 1284) +++ trunk/pom.xml 2013-10-08 13:32:03 UTC (rev 1285) @@ -137,7 +137,7 @@ <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.4.0</adagioVersion> + <adagioVersion>3.4</adagioVersion>  <i18n.bundles>fr_FR,en_GB</i18n.bundles>

1 0

r1284 - trunk
by tchemit＠users.forge.codelutin.com 08 Oct '13

08 Oct '13

Author: tchemit Date: 2013-10-08 15:29:46 +0200 (Tue, 08 Oct 2013) New Revision: 1284 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1284 Log: refs #3461: [TECH] Updates jaxx to 2.5.29 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-08 12:16:36 UTC (rev 1283) +++ trunk/pom.xml 2013-10-08 13:29:46 UTC (rev 1284) @@ -131,13 +131,14 @@ <eugenePluginVersion>2.7.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.28</jaxxVersion> + <jaxxVersion>2.5.29-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15.1</xworkVersion> <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.4</adagioVersion> + <adagioVersion>3.4.0</adagioVersion> +  <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent>

1 0

r1283 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by tchemit＠users.forge.codelutin.com 08 Oct '13

08 Oct '13

Author: tchemit Date: 2013-10-08 14:16:36 +0200 (Tue, 08 Oct 2013) New Revision: 1283 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1283 Log: fixes #3457: [CAPTURES] Supprimer les info bulles vides sur les cellules de cat?\195?\169gorisation non renseign?\195?\169es Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.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-10-07 14:46:55 UTC (rev 1282) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-10-08 12:16:36 UTC (rev 1283) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.editor.NumberEditor; +import org.apache.commons.lang3.StringUtils; import org.nuiton.decorator.Decorator; import javax.swing.AbstractCellEditor; @@ -276,8 +277,8 @@ String tip = null; - if (prefixText != null) { - tip = String.format("%s%s", prefixText, valueText); + if (StringUtils.isNotBlank(prefixText)) { + tip = String.format("%s %s", prefixText, valueText); if (isSelected) { tip = String.format("%s", tip);

1 0

r1282 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by tchemit＠users.forge.codelutin.com 07 Oct '13

07 Oct '13

Author: tchemit Date: 2013-10-07 16:46:55 +0200 (Mon, 07 Oct 2013) New Revision: 1282 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1282 Log: fixes #3452: [CAMPAGNE] Ne pas modifier la camapgne lors que changement de type de navire Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-10-07 14:26:19 UTC (rev 1281) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-10-07 14:46:55 UTC (rev 1282) @@ -417,6 +417,10 @@ protected Set<String> getPropertiesToIgnore() { Set<String> result = super.getPropertiesToIgnore(); result.add(EditCruiseUIModel.PROPERTY_ATTACHMENT); + result.add(EditCruiseUIModel.PROPERTY_VESSEL_TYPE); + result.add(EditCruiseUIModel.PROPERTY_VESSEL_TYPE_ALL); + result.add(EditCruiseUIModel.PROPERTY_VESSEL_TYPE_SCIENTIFIC); + result.add(EditCruiseUIModel.PROPERTY_VESSEL_TYPE_FISHING); result.add(EditCruiseUIModel.PROPERTY_CAN_EDIT_GEAR_CARACTERISTIC); result.add(EditCruiseUIModel.PROPERTY_CAN_SHOW_GEAR_CARACTERISTIC); return result;

1 0

r1281 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation
by tchemit＠users.forge.codelutin.com 07 Oct '13

07 Oct '13

Author: tchemit Date: 2013-10-07 16:26:19 +0200 (Mon, 07 Oct 2013) New Revision: 1281 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1281 Log: fixes #3444: [DONNEES INDIVIDUELLES] pouvoir copier les mensurations depuis la page ESPECES Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-10-07 09:40:57 UTC (rev 1280) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-10-07 14:26:19 UTC (rev 1281) @@ -97,6 +97,8 @@ */ protected final WeightUnit weightUnit; + protected final WeightUnit speciesWeightUnit; + public final Integer PMFM_ID_SORTED_UNSORTED; public IndividualObservationBatchUIHandler(TuttiUI<?, ?> parentUi, IndividualObservationBatchUI ui) { @@ -111,6 +113,7 @@ IndividualObservationBatchRowModel.PROPERTY_ATTACHMENT); weightUnit = getConfig().getIndividualObservationWeightUnit(); + speciesWeightUnit = getConfig().getSpeciesWeightUnit(); PMFM_ID_SORTED_UNSORTED = persistenceService.getSortedUnsortedCaracteristic().getIdAsInt(); @@ -519,18 +522,36 @@ newRow.setSpecies(species); newRow.getCaracteristics().putAll(batchCaracteristics); - //FIXME Keep this ? - newRow.getDefaultCaracteristics().putAll(defaultCaracteristics); - //FIXME Keep this? - newRow.setWeight(model.getWeight()); - //FIXME Keep this? - newRow.setSize(model.getSize()); - //FIXME Keep this? - newRow.setLengthStepCaracteristic(model.getLengthStepCaracteristic()); +// //FIXME Keep this ? +// newRow.getDefaultCaracteristics().putAll(defaultCaracteristics); +// //FIXME Keep this? +// newRow.setWeight(model.getWeight()); +// //FIXME Keep this? +// newRow.setSize(model.getSize()); +// //FIXME Keep this? +// newRow.setLengthStepCaracteristic(model.getLengthStepCaracteristic()); rowsToCreate.add(newRow); + } + if (nbRow == 1) { + + // apply also weight found + IndividualObservationBatchRowModel lastRow = + rowsToCreate.get(rowsToCreate.size() - 1); + Float weight = TuttiEntities.getValueOrComputedValue( + leaf.getWeight(), + leaf.getFinestCategory().getCategoryWeight()); + if (weight != null) { + + // convert weight units + weight = speciesWeightUnit.toEntity(weight); + weight = weightUnit.fromEntity(weight); + } + lastRow.setWeight(weight); + } + } else { for (SpeciesFrequencyRowModel frequency : frequencies) { @@ -543,6 +564,12 @@ if (nbRow > 0) { weight /= nbRow; } + + + // convert weight units + weight = speciesWeightUnit.toEntity(weight); + weight = weightUnit.fromEntity(weight); + for (int i = 0; i < nbRow; i++) { IndividualObservationBatchRowModel newRow = tableModel.createNewRow(); newRow.setSpecies(species); @@ -551,8 +578,8 @@ newRow.setLengthStepCaracteristic(frequency.getLengthStepCaracteristic()); newRow.getCaracteristics().putAll(batchCaracteristics); - //FIXME Keep this ? - newRow.getDefaultCaracteristics().putAll(defaultCaracteristics); +// //FIXME Keep this ? +// newRow.getDefaultCaracteristics().putAll(defaultCaracteristics); rowsToCreate.add(newRow); }

1 0

[ANN] - Tutti 2.7 released
by forge.codelutin.com Release Notification 07 Oct '13

07 Oct '13

The Tutti team is pleased to announce the tutti-2.7 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [RAPPORT] ajouter sur onglet "Résumé" un bouton pour obtenir la composition de la capture Issue: 3414. Thanks to Tony Chemit. Resolved by tchemit. o [DONNEES INDIVIDUELLES] pouvoir copier les mensurations depuis la page ESPECES Issue: 3319. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Améliorer le temps d'ouverture de l'écran protocole Issue: 3424. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] - Lisibilité des tableaux (captures, protocole) Issue: 3331. Thanks to Tony Chemit. Resolved by tchemit. o [CAMPAGNE] gestion des navires asocié (ex. chalutage en boeuf) Issue: 3334. Thanks to Tony Chemit. Resolved by tchemit. o [CAMPAGNE] pouvoir ajouter plusieur engins professionnels de même type à une campagne Issue: 3333. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [EXPORT SUMATRA] le nombre d'individus dans la capture est faux Issue: 3412. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURES] Impossible de saisir des mensurations si pas de protocole renseigné Issue: 3419. Thanks to Tony Chemit. Resolved by tchemit. o [DONNEES INDIVIDUELLES] Mauvaise liste de choix d'espèces Issue: 3420. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURES] Les caractéristiques d'engin affichées dans l'écran capture ne sont pas correcteds Issue: 3404. Thanks to Tony Chemit. Resolved by tchemit. Changes: o [TECH] updates JAXX to 2.5.28 Issue: 3418. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] Alignement des cellules contenant les chiffres Issue: 3326. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1280 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 07 Oct '13

07 Oct '13

Author: maven-release Date: 2013-10-07 11:40:57 +0200 (Mon, 07 Oct 2013) New Revision: 1280 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1280 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-10-07 09:40:51 UTC (rev 1279) +++ trunk/pom.xml 2013-10-07 09:40:57 UTC (rev 1280) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7</version> + <version>2.8-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.7</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.7 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.7 + 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-10-07 09:40:51 UTC (rev 1279) +++ trunk/tutti-persistence/pom.xml 2013-10-07 09:40:57 UTC (rev 1280) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-10-07 09:40:51 UTC (rev 1279) +++ trunk/tutti-service/pom.xml 2013-10-07 09:40:57 UTC (rev 1280) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-10-07 09:40:51 UTC (rev 1279) +++ trunk/tutti-ui-swing/pom.xml 2013-10-07 09:40:57 UTC (rev 1280) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1279 - tags
by maven-release＠users.forge.codelutin.com 07 Oct '13

07 Oct '13

Author: maven-release Date: 2013-10-07 11:40:51 +0200 (Mon, 07 Oct 2013) New Revision: 1279 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1279 Log: [maven-release-plugin] copy for tag tutti-2.7 Added: tags/tutti-2.7/

1 0