Author: kmorin Date: 2013-04-19 14:22:49 +0200 (Fri, 19 Apr 2013) New Revision: 830 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/830 Log: fixes #2339 [ERGONOMIE] - Listes d?\195?\169roulantes - Certaines listes filtrables n'?\195?\169taient pas triables Modified: trunk/pom.xml 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/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/pom.xml 2013-04-19 12:22:49 UTC (rev 830) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.17</jaxxVersion> + <jaxxVersion>2.5.18-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/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -182,16 +182,16 @@ }); initBeanFilterableComboBox(ui.getProgramComboBox(), - persistenceService.getAllProgram(), + Lists.newArrayList(persistenceService.getAllProgram()), model.getProgram(), DecoratorService.ONLY_NAME); initBeanFilterableComboBox(ui.getDepartureLocationComboBox(), - persistenceService.getAllHarbour(), + Lists.newArrayList(persistenceService.getAllHarbour()), model.getDepartureLocation()); initBeanFilterableComboBox(ui.getReturnLocationComboBox(), - persistenceService.getAllHarbour(), + Lists.newArrayList(persistenceService.getAllHarbour()), model.getReturnLocation()); initBeanFilterableComboBox(ui.getVesselComboBox(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -141,15 +141,15 @@ SelectCruiseUIModel model = getModel(); initBeanFilterableComboBox(ui.getProgramCombobox(), - model.getPrograms(), + Lists.newArrayList(model.getPrograms()), model.getProgram()); initBeanFilterableComboBox(ui.getCruiseCombobox(), - model.getCruises(), + Lists.newArrayList(model.getCruises()), model.getCruise()); initBeanFilterableComboBox(ui.getProtocolCombobox(), - model.getProtocols(), + Lists.newArrayList(model.getProtocols()), model.getProtocol()); ui.getEditCruiseComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -278,13 +278,13 @@ String zoneId = zone.getId(); List<TuttiLocation> stratas = - persistenceService.getAllFishingOperationStrata(zoneId); + Lists.newArrayList(persistenceService.getAllFishingOperationStrata(zoneId)); List<TuttiLocation> subStratas = - persistenceService.getAllFishingOperationSubStrata(zoneId, strataId); + Lists.newArrayList(persistenceService.getAllFishingOperationSubStrata(zoneId, strataId)); List<TuttiLocation> locations = - persistenceService.getAllFishingOperationLocation(zoneId, strataId, substrataId); + Lists.newArrayList(persistenceService.getAllFishingOperationLocation(zoneId, strataId, substrataId)); initBeanFilterableComboBox(ui.getStrataComboBox(), stratas, strata); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -22,6 +22,7 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -71,19 +72,19 @@ initUI(ui); initBeanFilterableComboBox(ui.getAccidentalSpeciesComboBox(), - getDataContext().getReferentSpecies(), + Lists.newArrayList(getDataContext().getReferentSpecies()), null); initBeanFilterableComboBox(ui.getAccidentalGenderComboBox(), - getDataContext().getGenderValues(), + Lists.newArrayList(getDataContext().getGenderValues()), null); initBeanFilterableComboBox(ui.getAccidentalLengthStepCaracteristicComboBox(), - getDataContext().getLengthStepCaracteristics(), + Lists.newArrayList(getDataContext().getLengthStepCaracteristics()), null); initBeanFilterableComboBox(ui.getAccidentalDeadOrAliveComboBox(), - getDataContext().getDeadOrAliveValues(), + Lists.newArrayList(getDataContext().getDeadOrAliveValues()), null); listenValidatorValid(ui.getValidator(), getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -102,7 +102,7 @@ persistenceService.getSortedUnsortedCaracteristic(); initBeanFilterableComboBox(ui.getSortedUnsortedCategoryComboBox(), - caracteristic.getQualitativeValue(), + Lists.newArrayList(caracteristic.getQualitativeValue()), null); getModel().addPropertyChangeListener(CreateBenthosBatchUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -23,6 +23,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; @@ -82,12 +83,12 @@ initUI(ui); initBeanFilterableComboBox(ui.getIndividualObservationSpeciesComboBox(), - getDataContext().getReferentSpeciesWithSurveyCode(), + Lists.newArrayList(getDataContext().getReferentSpeciesWithSurveyCode()), null); List<Caracteristic> lengthStepCaracteristics = getDataContext().getLengthStepCaracteristics(); initBeanFilterableComboBox(ui.getIndividualObservationLengthStepCaracteristicComboBox(), - lengthStepCaracteristics, + Lists.newArrayList(lengthStepCaracteristics), null); if (context.isProtocolFilled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -83,14 +84,14 @@ Caracteristic marineLitterCategoryCaracteristic = persistenceService.getMarineLitterCategoryCaracteristic(); initBeanFilterableComboBox(ui.getMarineLitterCategoryComboBox(), - marineLitterCategoryCaracteristic.getQualitativeValue(), + Lists.newArrayList(marineLitterCategoryCaracteristic.getQualitativeValue()), null); Caracteristic marineLitterSizeCategoryCaracteristic = persistenceService.getMarineLitterSizeCategoryCaracteristic(); initBeanFilterableComboBox(ui.getMarineLitterSizeCategoryComboBox(), - marineLitterSizeCategoryCaracteristic.getQualitativeValue(), + Lists.newArrayList(marineLitterSizeCategoryCaracteristic.getQualitativeValue()), null); listenValidatorValid(ui.getValidator(), getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; @@ -108,7 +109,7 @@ EditProgramUIModel model = getModel(); initBeanFilterableComboBox(ui.getZoneComboBox(), - persistenceService.getAllProgramZone(), + Lists.newArrayList(persistenceService.getAllProgramZone()), model.getZone()); SwingValidator validator = ui.getValidator();