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

r955 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 18:09:46 +0200 (Thu, 16 May 2013) New Revision: 955 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/955 Log: fixes #2451 [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/util/table/AbstractTuttiTableUIHandler.java 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-16 16:00:37 UTC (rev 954) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-16 16:09:46 UTC (rev 955) @@ -434,8 +434,7 @@ } previousCellAction.actionPerformed(null); - } else if (//e.getKeyCode() == KeyEvent.VK_ENTER || - keyCode == KeyEvent.VK_RIGHT || + } else if (keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_TAB) { e.consume(); if (editor != null) { @@ -450,7 +449,8 @@ } previousRowAction.actionPerformed(null); - } else if (keyCode == KeyEvent.VK_DOWN) { + } else if (e.getKeyCode() == KeyEvent.VK_ENTER || + keyCode == KeyEvent.VK_DOWN) { e.consume(); if (editor != null) { editor.stopCellEditing();

1 0

r954 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/referential resources/i18n
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 18:00:37 +0200 (Thu, 16 May 2013) New Revision: 954 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/954 Log: fixes #2433 [ERGO] intitul?\195?\169 du bouton dans r?\195?\169f?\195?\169rentiel temporaire Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -67,7 +67,7 @@ "exportGearExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -68,7 +68,7 @@ "exportPersonExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -67,7 +67,7 @@ "exportSpeciesExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -67,7 +67,7 @@ "exportVesselExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export"), "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -65,7 +65,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -65,7 +65,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -64,7 +64,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-05-16 16:00:37 UTC (rev 954) @@ -64,7 +64,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), "^.*\\.csv", _("tutti.common.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-16 16:00:37 UTC (rev 954) @@ -1092,16 +1092,24 @@ tutti.main.title.selectedProgram= tutti.main.title.selectedProtocol= tutti.manageTemporaryReferential.action.chooseReferentialGearFile= +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export= tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import= tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile= +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile= +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile= +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success= +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success= tutti.manageTemporaryReferential.action.exportTemporaryGearExample= tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-16 15:40:07 UTC (rev 953) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-16 16:00:37 UTC (rev 954) @@ -1054,17 +1054,21 @@ tutti.main.title.selectedCruise=Campagne %s tutti.main.title.selectedProgram=Série de campagne %s tutti.main.title.selectedProtocol=Protocole %s -tutti.manageTemporaryReferential.action.chooseReferentialGearFile=Choisir le fichier de référentiel engin +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success=Exemple de référentiel temporaire d'engins exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success=Référentiel temporaire d'engins importé depuis le fichier %s -tutti.manageTemporaryReferential.action.chooseReferentialPersonFile=Choisir le fichier de référentiel personne +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success=Exemple de référentiel temporaire de personnes exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success=Référentiel temporaire de personnes importé depuis le fichier %s -tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile=Choisir le fichier de référentiel espèce +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success=Exemple de référentiel temporaire d'espèces exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success=Référentiel temporaire d'espèces importé depuis le fichier %s -tutti.manageTemporaryReferential.action.chooseReferentialVesselFile=Choisir le fichier de référentiel navire +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export=Exporter tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success=Exemple de référentiel temporaire de navires exporté dans le fichier %s +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import=Importer tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success=Référentiel temporaire de navires importé depuis le fichier %s tutti.manageTemporaryReferential.action.exportTemporaryGearExample=Exporter tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin

1 0

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

16 May '13

Author: kmorin Date: 2013-05-16 17:40:07 +0200 (Thu, 16 May 2013) New Revision: 953 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/953 Log: add progression on validation loading Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.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-05-16 15:38:53 UTC (rev 952) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-16 15:40:07 UTC (rev 953) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.InvalidBatchModelException; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -48,6 +49,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.Decorator; import org.nuiton.validator.NuitonValidatorResult; import org.nuiton.validator.NuitonValidatorScope; @@ -90,17 +92,22 @@ * * @return a map containing the operations and the validation results */ - public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations() { + public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations(ProgressionModel progressionModel) { Map<FishingOperation, NuitonValidatorResult> result = Maps.newHashMap(); TuttiDataContext dataContext = context.getDataContext(); List<FishingOperation> operations = persistenceService.getAllFishingOperation(dataContext.getCruiseId()); + progressionModel.setTotal(operations.size()); + + Decorator<FishingOperation> decorator = decoratorService.getDecoratorByType(FishingOperation.class); for (FishingOperation operation : operations) { operation = persistenceService.getFishingOperation(operation.getId()); + progressionModel.setMessage(_("tutti.service.validateCruise.operations.progress", decorator.toString(operation))); NuitonValidatorResult validator = validationService.validateFishingOperation(operation, ValidationService.VALIDATION_CONTEXT_VALIDATE); checkOperation(operation, validator); result.put(operation, validator); + progressionModel.increments(1); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-16 15:38:53 UTC (rev 952) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-16 15:40:07 UTC (rev 953) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; @@ -34,6 +35,7 @@ import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUIModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -85,7 +87,11 @@ ValidateCruiseUIModel model = new ValidateCruiseUIModel(); - model.setValidator(validationService.validateCruiseOperations()); + ProgressionModel progressionModel = new ProgressionModel(); + TuttiActionUIModel actionUIModel = context.getActionUI().getModel(); + actionUIModel.setProgressionModel(progressionModel); + model.setValidator(validationService.validateCruiseOperations(progressionModel)); + actionUIModel.setProgressionModel(null); model.addPropertyChangeListener(ValidateCruiseUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new RemoveablePropertyChangeListener() {

1 0

r952 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/referential resources/i18n
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 17:38:53 +0200 (Thu, 16 May 2013) New Revision: 952 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/952 Log: fixes #2430 [REF TEMPORAIRE] erreur sur import navire temporaire Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.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 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-16 15:38:53 UTC (rev 952) @@ -26,10 +26,11 @@ import com.google.common.base.Charsets; import com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import com.google.common.base.Optional; +import com.google.common.base.Predicate; +import com.google.common.collect.*; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -40,6 +41,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Export; @@ -49,8 +51,7 @@ import java.io.File; import java.io.IOException; import java.io.Reader; -import java.util.List; -import java.util.Set; +import java.util.*; import static org.nuiton.i18n.I18n._; @@ -122,31 +123,35 @@ log.info("Will import vessels from file: " + file); } - // get all vessel names - Set<String> existingVesselName = Sets.newHashSet(Iterables.transform(persistenceService.getAllFishingVessel(), new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { - return input.getName(); - } - })); + // get all vessels + List<Vessel> existingVessels = Lists.newArrayList(persistenceService.getAllFishingVessel()); + existingVessels.addAll(persistenceService.getAllScientificVessel()); - existingVesselName.addAll(Lists.transform(persistenceService.getAllScientificVessel(), new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { - return input.getName(); - } - })); - List<Vessel> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); - VesselModel csvModel = new VesselModel(getCsvSeparator(), existingVesselName); + VesselModel csvModel = new VesselModel(getCsvSeparator()); try { Import<Vessel> importer = Import.newImport(csvModel, reader); try { - for (Vessel bean : importer) { + for (final Vessel bean : importer) { + Optional<Vessel> found = Iterables.tryFind(existingVessels, new Predicate<Vessel>() { + @Override + public boolean apply(Vessel input) { + String name1 = input.getName(); + String name2 = bean.getName(); + String code1 = input.getInternationalRegistrationCode(); + String code2 = bean.getInternationalRegistrationCode(); + boolean result = StringUtils.equals(name1, name2) && StringUtils.equals(code1, code2); + return result; + } + }); + if (found.isPresent()) { + throw new TuttiTechnicalException(_("tutti.service.referential.import.vessels.existingValue.error", + bean.getName(), bean.getInternationalRegistrationCode())); + } toImport.add(bean); } importer.close(); @@ -309,7 +314,7 @@ v.setScientificVessel(true); toExport.add(v); - VesselModel csvModel = new VesselModel(getCsvSeparator(), null); + VesselModel csvModel = new VesselModel(getCsvSeparator()); BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); try { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-05-16 15:38:53 UTC (rev 952) @@ -39,12 +39,12 @@ */ public class VesselModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<Vessel> { - public VesselModel(char separator, Set<String> existingVesselName) { + public VesselModel(char separator) { super(separator); // import definition - newNotExistingValueColumn(Vessel.PROPERTY_NAME, existingVesselName); + newMandatoryColumn(Vessel.PROPERTY_NAME); newMandatoryColumn(Vessel.PROPERTY_INTERNATIONAL_REGISTRATION_CODE); newMandatoryColumn(Vessel.PROPERTY_SCIENTIFIC_VESSEL, Common.PRIMITIVE_BOOLEAN); 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-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-16 15:38:53 UTC (rev 952) @@ -171,6 +171,7 @@ tutti.service.referential.import.persons.error= tutti.service.referential.import.species.error= tutti.service.referential.import.vessels.error= +tutti.service.referential.import.vessels.existingValue.error= tutti.service.sumatra.export.error= tutti.service.validateCruise.exportResult.error= tutti.service.validateCruise.operations.progress= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-16 14:19:51 UTC (rev 951) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-16 15:38:53 UTC (rev 952) @@ -141,6 +141,7 @@ tutti.service.referential.import.persons.error=Erreur lors de l'import des personnes du fichier %s tutti.service.referential.import.species.error=Erreur lors de l'import des espèces du fichier %s tutti.service.referential.import.vessels.error=Erreur lors de l'import des navires du fichier %s +tutti.service.referential.import.vessels.existingValue.error=Un navire avec le nom %1s et l'immatriculation %2s existe déjà dans le référentiel tutti.service.sumatra.export.error=Erreur lors de l'export Sumatra dans le fichier %s tutti.service.validateCruise.exportResult.error=Erreur lors de l'export des résultats de validation de la campagne dans le fichier %s tutti.service.validateCruise.operations.progress=Vérification du trait %s

1 0

r951 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/referential resources/i18n
by kmorin＠users.forge.codelutin.com 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 16:19:51 +0200 (Thu, 16 May 2013) New Revision: 951 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/951 Log: fixes #2430 [REF TEMPORAIRE] erreur sur import navire temporaire Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.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 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-15 16:49:16 UTC (rev 950) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-16 14:19:51 UTC (rev 951) @@ -91,8 +91,8 @@ List<Species> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); + SpeciesModel csvModel = new SpeciesModel(getCsvSeparator(), existingSpeciesName); try { - SpeciesModel csvModel = new SpeciesModel(getCsvSeparator(), existingSpeciesName); Import<Species> importer = Import.newImport(csvModel, reader); try { @@ -105,8 +105,8 @@ IOUtils.closeQuietly(importer); } reader.close(); - } catch (Exception e) { - throw new IOException("Could not import species from file " + file, e); + } catch (IOException e) { + throw new IOException(_("tutti.service.referential.import.species.error", file), e); } finally { IOUtils.closeQuietly(reader); @@ -140,8 +140,8 @@ List<Vessel> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); + VesselModel csvModel = new VesselModel(getCsvSeparator(), existingVesselName); try { - VesselModel csvModel = new VesselModel(getCsvSeparator(), existingVesselName); Import<Vessel> importer = Import.newImport(csvModel, reader); try { @@ -154,8 +154,8 @@ IOUtils.closeQuietly(importer); } reader.close(); - } catch (Exception e) { - throw new IOException("Could not import vessels from file " + file, e); + } catch (IOException e) { + throw new IOException(_("tutti.service.referential.import.vessels.error", file), e); } finally { IOUtils.closeQuietly(reader); @@ -173,8 +173,8 @@ List<Person> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); + PersonModel csvModel = new PersonModel(getCsvSeparator()); try { - PersonModel csvModel = new PersonModel(getCsvSeparator()); Import<Person> importer = Import.newImport(csvModel, reader); try { @@ -187,8 +187,8 @@ IOUtils.closeQuietly(importer); } reader.close(); - } catch (Exception e) { - throw new IOException("Could not import persons from file " + file, e); + } catch (IOException e) { + throw new IOException(_("tutti.service.referential.import.persons.error", file), e); } finally { IOUtils.closeQuietly(reader); @@ -221,8 +221,8 @@ List<Gear> toImport = Lists.newArrayList(); Reader reader = Files.newReader(file, Charsets.UTF_8); + GearModel csvModel = new GearModel(getCsvSeparator(), existingGearName); try { - GearModel csvModel = new GearModel(getCsvSeparator(), existingGearName); Import<Gear> importer = Import.newImport(csvModel, reader); try { @@ -235,8 +235,8 @@ IOUtils.closeQuietly(importer); } reader.close(); - } catch (Exception e) { - throw new IOException("Could not import gears from file " + file, e); + } catch (IOException e) { + throw new IOException(_("tutti.service.referential.import.gears.error", file), e); } finally { IOUtils.closeQuietly(reader); 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-05-15 16:49:16 UTC (rev 950) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-16 14:19:51 UTC (rev 951) @@ -167,8 +167,13 @@ tutti.service.referential.export.person.error= tutti.service.referential.export.species.error= tutti.service.referential.export.vessel.error= +tutti.service.referential.import.gears.error= +tutti.service.referential.import.persons.error= +tutti.service.referential.import.species.error= +tutti.service.referential.import.vessels.error= tutti.service.sumatra.export.error= tutti.service.validateCruise.exportResult.error= +tutti.service.validateCruise.operations.progress= tutti.validator.error.accidental.species.required= tutti.validator.error.benthosBatch.species.required= tutti.validator.error.comment.too.long= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-15 16:49:16 UTC (rev 950) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-16 14:19:51 UTC (rev 951) @@ -137,8 +137,13 @@ tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s tutti.service.referential.export.species.error=Erreur lors de l'export des espèces dans le fichier %s tutti.service.referential.export.vessel.error=Erreur lors de l'export des navires dans le fichier %s +tutti.service.referential.import.gears.error=Erreur lors de l'import des engins du fichier %s +tutti.service.referential.import.persons.error=Erreur lors de l'import des personnes du fichier %s +tutti.service.referential.import.species.error=Erreur lors de l'import des espèces du fichier %s +tutti.service.referential.import.vessels.error=Erreur lors de l'import des navires du fichier %s tutti.service.sumatra.export.error=Erreur lors de l'export Sumatra dans le fichier %s tutti.service.validateCruise.exportResult.error=Erreur lors de l'export des résultats de validation de la campagne dans le fichier %s +tutti.service.validateCruise.operations.progress=Vérification du trait %s tutti.validator.error.accidental.species.required=L'espèce est obligatoire tutti.validator.error.benthosBatch.species.required=L'espèce est obligatoire tutti.validator.error.comment.too.long=Taille de commentaire trop longue (limitée à %s caractères)

1 0

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

15 May '13

See <http://ci.nuiton.org/jenkins/job/tutti/777/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 337 lines...] 2013-05-15 19:02:12,644 4877 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4931d47 2013-05-15 19:02:12,646 4879 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@566722a9 2013-05-15 19:02:12,647 4880 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…> 2013-05-15 19:02:12,649 4882 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@566722a9 2013-05-15 19:02:12,650 4883 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@d14b190 2013-05-15 19:02:12,651 4884 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol caracteristic from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…> 2013-05-15 19:02:12,672 4905 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@d14b190 Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.276 sec Running fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-05-15 19:02:12,687 4920 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,690 4923 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,696 4929 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,697 4930 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,697 4930 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import persons from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…> 2013-05-15 19:02:12,698 4931 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Person - fr.ifremer.tutti.persistence.entities.referential.Person > [null] , will create a new default one. 2013-05-15 19:02:12,701 4934 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,702 4935 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,702 4935 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import vessels from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…> 2013-05-15 19:02:12,719 4952 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Vessel - fr.ifremer.tutti.persistence.entities.referential.Vessel > [null] , will create a new default one. 2013-05-15 19:02:12,722 4955 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,722 4955 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,728 4961 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,728 4961 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,731 4964 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,731 4964 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,737 4970 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,737 4970 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,737 4970 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…> 2013-05-15 19:02:12,738 4971 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Species - fr.ifremer.tutti.persistence.entities.referential.Species > [null] , will create a new default one. 2013-05-15 19:02:12,741 4974 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-05-15 19:02:12,742 4975 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-05-15 19:02:12,742 4975 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import gears from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…> 2013-05-15 19:02:12,744 4977 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Gear - fr.ifremer.tutti.persistence.entities.referential.Gear > [null] , will create a new default one. Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.076 sec Running fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-05-15 19:02:12,758 4991 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.export.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec Results : Tests run: 28, Failures: 0, Errors: 0, Skipped: 2 [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/trunk2/tutti-service/target/tutti…> [INFO] [INFO] --- maven-site-plugin:3.2: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/trunk2/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/trunk2/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/tutti-group/org/nuiton/jaxx/2.… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.20-… 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/public/org/nuiton/jaxx/jaxx-co… 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-wi… 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… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.20-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 23.551s [INFO] [INFO] --- jaxx-maven-plugin:2.5.20-SNAPSHOT:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/fi…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/fi…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1328/1328 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5: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/trunk2/tutti-ui-swing/target/i18n…> [INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/i18n…> [INFO] [INFO] --- i18n-maven-plugin:2.5:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 37/1692 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1604/1764 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.4:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.4: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/trunk2/tutti-ui-swing/src/license…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/license…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/license…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:2.3.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 312 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/clas…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] package jaxx.runtime.swing.session <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[28,49] ValidationContext is internal proprietary API and may be removed in a future release [INFO] 1warning [INFO] ------------------------------------------------------------- [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/trunk2/tutti-ui-swing/src/main/ja…>:[60,33] error: cannot find symbol [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[289,63] error: cannot find symbol [ERROR] class TuttiUIContext <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[290,28] error: constructor SwingSession in class SwingSession cannot be applied to given types; [INFO] 3 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.224s] [INFO] Tutti :: Persistence .............................. SUCCESS [23.004s] [INFO] Tutti :: Service .................................. SUCCESS [14.835s] [INFO] Tutti :: UI ....................................... FAILURE [49.016s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:34.739s [INFO] Finished at: Wed May 15 19:03:02 CEST 2013 [INFO] Final Memory: 92M/201M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-15_19-01-22/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/trunk2/tutti-service/target/tutti…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-15_19-01-22/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/trunk2/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-15_19-01-22/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/trunk2/tutti-ui-swing/src/license…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-15_19-01-22/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/trunk2/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-15_19-01-22/archive/fr.ifremer/tutti/2.3-SNAPSHOT/tutti-2.3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target/tutti-2.3-SNAPSHOT-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-15_19-01-22/archive/fr.ifremer/tutti/2.3-SNAPSHOT/tutti-2.3-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-15_19-01-22/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/trunk2/tutti-persistence/target/t…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-15_19-01-22/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.3.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.3.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:656) 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 #777
by admin+hudson＠codelutin.com 15 May '13

15 May '13

1 1

r950 - in trunk: . tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by kmorin＠users.forge.codelutin.com 15 May '13

15 May '13

Author: kmorin Date: 2013-05-15 18:49:16 +0200 (Wed, 15 May 2013) New Revision: 950 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/950 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/TuttiUIContext.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-15 14:34:46 UTC (rev 949) +++ trunk/pom.xml 2013-05-15 16:49:16 UTC (rev 950) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.19</jaxxVersion> + <jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion> 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-05-15 14:34:46 UTC (rev 949) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-05-15 16:49:16 UTC (rev 950) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.PropagatePropertyChangeListener; import fr.ifremer.tutti.TuttiIOUtil; @@ -53,8 +54,11 @@ import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import jaxx.runtime.JAXXContext; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.help.JAXXHelpUIHandler; +import jaxx.runtime.swing.session.BeanFilterableComboBoxState; +import jaxx.runtime.swing.session.State; import jaxx.runtime.swing.session.SwingSession; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -72,6 +76,7 @@ import java.io.InputStream; import java.net.URI; import java.util.Locale; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -279,7 +284,11 @@ this.config = config; this.resourceLoader = new RessourceClassLoader(Thread.currentThread().getContextClassLoader()); this.serviceContext = new TuttiServiceContext(resourceLoader, config.getServiceConfig()); - this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false); + + Map<Class, State> additionalStates = Maps.newHashMap(); + additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); + this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); + this.errorHelper = new TuttiErrorHelper(this); this.dataContext = serviceContext.getDataContext(); PropagatePropertyChangeListener.listenAndPropagateAll(dataContext, this);

1 0

r949 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/resources tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics
by kmorin＠users.forge.codelutin.com 15 May '13

15 May '13

Author: kmorin Date: 2013-05-15 16:34:46 +0200 (Wed, 15 May 2013) New Revision: 949 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/949 Log: fixes #2148 [OBSERVATIONS INDIVIDUELLS] Autres caract?\195?\169ristiques = tous les psfm sauf celui utilis?\195?\169 pour la mesure de l'individu Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-05-15 14:34:46 UTC (rev 949) @@ -212,6 +212,12 @@ List<Caracteristic> getAllCaracteristic(); /** + * @return all caracteristics of the system with the ones which are protected. + * @since 2.3 + */ + List<Caracteristic> getAllCaracteristicWithProtected(); + + /** * @return all numeric caracteristics of the system. * @since 1.0.2 */ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-05-15 14:34:46 UTC (rev 949) @@ -285,6 +285,11 @@ } @Override + public List<Caracteristic> getAllCaracteristicWithProtected() { + return referentialService.getAllCaracteristicWithProtected(); + } + + @Override public List<Caracteristic> getAllNumericCaracteristic() { return referentialService.getAllNumericCaracteristic(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-05-15 14:34:46 UTC (rev 949) @@ -142,6 +142,11 @@ } @Override + public List<Caracteristic> getAllCaracteristicWithProtected() { + throw notImplemented(); + } + + @Override public List<Caracteristic> getAllNumericCaracteristic() { throw notImplemented(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-05-15 14:34:46 UTC (rev 949) @@ -197,6 +197,13 @@ List<Caracteristic> getAllCaracteristic(); /** + * @return all caracteristics of the system with the ones which are kind of protected. + * @since 2.3 + */ + @Cacheable(value = "pmfmsWithProtected") + List<Caracteristic> getAllCaracteristicWithProtected(); + + /** * @return all numeric caracteristics of the system. * @since 1.0.2 */ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-15 14:34:46 UTC (rev 949) @@ -464,6 +464,15 @@ @Override public List<Caracteristic> getAllCaracteristic() { + return getAllCaracteristics(false); + } + + @Override + public List<Caracteristic> getAllCaracteristicWithProtected() { + return getAllCaracteristics(true); + } + + protected List<Caracteristic> getAllCaracteristics(boolean withProtected) { Iterator<Object[]> sources = queryListWithStatus( "allPmfm", "unitIdNone", IntegerType.INSTANCE, enumeration.UNIT_ID_NONE); @@ -474,7 +483,7 @@ Integer pmfmId = (Integer) source[0]; Caracteristic target = loadCaracteristic(source); // Skip some protected PSFM - if (!enumeration.isProtectedCaracteristic(pmfmId)) { + if (withProtected || !enumeration.isProtectedCaracteristic(pmfmId)) { result.add(target); } pmfmByIdCache.put(pmfmId, target); Modified: trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml 2013-05-15 14:34:46 UTC (rev 949) @@ -92,6 +92,9 @@ <bean id="tuttiPmfmsCache" parent="tuttiAbstractEternalCache"> <property name="cacheName" value="pmfms" /> </bean> + <bean id="tuttiPmfmsWithProtectedCache" parent="tuttiAbstractEternalCache"> + <property name="cacheName" value="pmfmsWithProtected" /> + </bean> <bean id="tuttiPmfmByIdCache" parent="tuttiAbstractEternalCache"> <property name="cacheName" value="pmfmById" /> </bean> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-05-15 14:34:46 UTC (rev 949) @@ -338,6 +338,11 @@ } @Override + public List<Caracteristic> getAllCaracteristicWithProtected() { + return driver.getAllCaracteristicWithProtected(); + } + + @Override public List<Caracteristic> getAllNumericCaracteristic() { return driver.getAllNumericCaracteristic(); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-05-15 14:34:46 UTC (rev 949) @@ -122,6 +122,8 @@ protected List<Caracteristic> caracteristics; + protected List<Caracteristic> caracteristicsWithProtected; + protected List<Caracteristic> lengthStepCaracteristics; protected List<CaracteristicQualitativeValue> genderValues; @@ -455,6 +457,17 @@ return caracteristics; } + public List<Caracteristic> getCaracteristicWithProtected() { + checkOpened(); + if (caracteristicsWithProtected == null) { + if (log.isInfoEnabled()) { + log.info("Loading allCaracteristicWithProtected"); + } + caracteristicsWithProtected = service.getAllCaracteristicWithProtected(); + } + return caracteristicsWithProtected; + } + public List<Caracteristic> getLengthStepCaracteristics() { checkOpened(); if (lengthStepCaracteristics == null) { 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-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-05-15 14:34:46 UTC (rev 949) @@ -520,7 +520,7 @@ } CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, - dataContext.getCaracteristics()); + dataContext.getLengthStepCaracteristics()); Import<CatchFrequencyRow> frequencyImporter = Import.newImport(frequencyModel, reader); @@ -682,7 +682,7 @@ } CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, - dataContext.getCaracteristics()); + dataContext.getLengthStepCaracteristics()); Import<CatchFrequencyRow> frequencyImporter = Import.newImport(frequencyModel, reader); @@ -864,7 +864,7 @@ TuttiDataContext dataContext = context.getDataContext(); List<Species> speciesList = dataContext.getReferentSpecies(); - List<Caracteristic> caracteristics = dataContext.getCaracteristics(); + List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); IndividualObservationRowModel csvModel = new IndividualObservationRowModel(csvSeparator, speciesList, @@ -977,7 +977,7 @@ TuttiDataContext dataContext = context.getDataContext(); List<Species> speciesList = dataContext.getReferentSpecies(); List<CaracteristicQualitativeValue> genderValues = dataContext.getGenderValues(); - List<Caracteristic> caracteristics = dataContext.getCaracteristics(); + List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); List<CaracteristicQualitativeValue> dedOrAliveValues = dataContext.getDeadOrAliveValues(); AccidentalCatchRowModel csvModel = new AccidentalCatchRowModel(csvSeparator, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-15 14:34:46 UTC (rev 949) @@ -50,6 +50,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.Serializable; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -143,6 +146,8 @@ protected CaracteristicMapColumnRowModel editRow; + protected Set<Caracteristic> caracteristicsUsed; + protected Integer rowIndex; protected Integer columnIndex; @@ -183,9 +188,20 @@ log.info("Will edit frequencies for row: " + rowIndex); } + // get the caracteristics set to the other rows + if (caracteristicsUsed == null) { + caracteristicsUsed = new HashSet<Caracteristic>(); + for (CaracteristicMapColumnRowModel row : tableModel.getRows()) { + CaracteristicMap map = row.getCaracteristics(); + if (map != null) { + caracteristicsUsed.addAll(map.keySet()); + } + } + } + CaracteristicMapColumnUIHandler handler = (CaracteristicMapColumnUIHandler) ui.getHandler(); CaracteristicMapEditorUI caracteristicMapEditor = handler.getCaracteristicMapEditor(); - caracteristicMapEditor.getHandler().editBatch(editRow, this); + caracteristicMapEditor.getHandler().editBatch(editRow, this, caracteristicsUsed); handler.showCaracteristicMapEditor(); } @@ -196,6 +212,7 @@ component.setText(map); component.setToolTipText(map); editRow.setCaracteristics(map); + caracteristicsUsed.addAll(map.keySet()); } int r = rowIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java 2013-05-15 14:34:46 UTC (rev 949) @@ -25,12 +25,15 @@ */ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import java.io.Serializable; /** @author kmorin <kmorin(a)codelutin.com> */ public interface CaracteristicMapColumnRowModel extends Serializable { + Caracteristic getLengthStepCaracteristic(); + CaracteristicMap getCaracteristics(); void setCaracteristics(CaracteristicMap map); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2013-05-15 14:34:46 UTC (rev 949) @@ -24,6 +24,10 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; + +import java.util.Set; + /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.0 @@ -35,4 +39,5 @@ void showCaracteristicMapEditor(); void hideCaracteristicMapEditor(); + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-15 13:42:02 UTC (rev 948) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-15 14:34:46 UTC (rev 949) @@ -22,8 +22,11 @@ * #L% */ +import com.google.common.base.Function; +import com.google.common.base.Functions; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; @@ -35,13 +38,16 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import javax.swing.JComponent; +import java.io.Serializable; import java.util.List; +import java.util.Set; import static fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapCellComponent.CaracteristicMapCellEditor; @@ -122,7 +128,7 @@ initUI(getUI()); initBeanFilterableComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); - getModel().setAvailableCaracteristics(getDataContext().getCaracteristics()); + getModel().setAvailableCaracteristics(getDataContext().getCaracteristicWithProtected()); JXTable table = getTable(); @@ -232,8 +238,17 @@ recomputeRowValidState(row); } + /** + * Edit the batch caracteristics + * + * @param caracteristicMapColumnRowModel the row to edit + * @param caracteristicMapCellEditor the editor + * @param caracteristicsUsed the set of the caracteristics used in the other rows. + * If no caracteristic is set on this row, add automatically these caracteristics with a null value + */ public void editBatch(CaracteristicMapColumnRowModel caracteristicMapColumnRowModel, - CaracteristicMapCellEditor caracteristicMapCellEditor) { + CaracteristicMapCellEditor caracteristicMapCellEditor, + Set<Caracteristic> caracteristicsUsed) { this.caracteristicMapCellEditor = caracteristicMapCellEditor; @@ -241,8 +256,9 @@ CaracteristicMapEditorUIModel model = getModel(); CaracteristicMap caracteristicMap = caracteristicMapColumnRowModel.getCaracteristics(); - if (caracteristicMap == null) { + if (MapUtils.isEmpty(caracteristicMap)) { caracteristicMap = new CaracteristicMap(); + caracteristicMap.putAll(Maps.asMap(caracteristicsUsed, Functions.constant((Serializable) null))); } model.setCaracteristicMap(caracteristicMap); @@ -260,6 +276,9 @@ model.setRows(rows); + // add the lengthstep caracteristic in the caracteristics which cannot be added + caracteristics.add(caracteristicMapColumnRowModel.getLengthStepCaracteristic()); + List<Caracteristic> caracteristicList = Lists.newArrayList(); for (Caracteristic caracteristic : availableCaracteristics) {

1 0

r948 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by kmorin＠users.forge.codelutin.com 15 May '13

15 May '13

Author: kmorin Date: 2013-05-15 15:42:02 +0200 (Wed, 15 May 2013) New Revision: 948 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/948 Log: fixes #2422 [CAMPAGNE] ecran de visualisation des caract?\195?\169ristiques d'un engin pas assez large Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2013-05-15 12:43:52 UTC (rev 947) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2013-05-15 13:42:02 UTC (rev 948) @@ -52,7 +52,7 @@ <JButton id='addRow' onActionPerformed='handler.addRow()'/> </cell> </row> - <row fill='both' weighty='1'> + <row fill='both' weighty='1' weightx='1'> <cell fill='both' columns='2'> <JScrollPane> <JXTable id='gearCaracteristicsEditorTable'

1 0