Author: kmorin Date: 2013-07-09 12:02:33 +0200 (Tue, 09 Jul 2013) New Revision: 1120 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1120 Log: fixes #2441 [REF TEMPORAIRE] Positionnement des taxons temporaires dans les listes Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.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/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/pom.xml 2013-07-09 10:02:33 UTC (rev 1120) @@ -126,7 +126,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.22</jaxxVersion> + <jaxxVersion>2.5.24-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15</xworkVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -108,6 +108,7 @@ #departureLocationComboBox { property: departureLocation; + beanType: {TuttiLocation.class}; selectedItem: {model.getDepartureLocation()}; _validatorLabel: {_("tutti.editCruise.field.departureLocation")}; } @@ -121,6 +122,7 @@ #returnLocationComboBox { property: returnLocation; + beanType: {TuttiLocation.class}; selectedItem: {model.getReturnLocation()}; _validatorLabel: {_("tutti.editCruise.field.returnLocation")}; } @@ -134,6 +136,7 @@ #programComboBox { property: program; + beanType: {Program.class}; selectedItem: {model.getProgram()}; _validatorLabel: {_("tutti.editCruise.field.program")}; } @@ -218,6 +221,7 @@ #vesselComboBox { property: vessel; + beanType: {Vessel.class}; selectedItem: {model.getVessel()}; toolTipText: "tutti.editCruise.field.vessel.tip"; _validatorLabel: {_("tutti.editCruise.field.vessel")}; @@ -226,6 +230,7 @@ #gearList { property: gear; + beanType: {Gear.class}; border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.gear"))}; _validatorLabel: {_("tutti.editCruise.field.gear")}; toolTipText: "tutti.editCruise.field.gear.tip"; @@ -234,6 +239,7 @@ #headOfMissionList { property: headOfMission; + beanType: {Person.class}; border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfMission"))}; _validatorLabel: {_("tutti.editCruise.field.headOfMission")}; toolTipText: "tutti.editCruise.field.headOfMission.tip"; @@ -242,6 +248,7 @@ #headOfSortRoomList { property: headOfSortRoom; + beanType: {Person.class}; border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfSortRoom"))}; _validatorLabel: {_("tutti.editCruise.field.headOfSortRoom")}; toolTipText: "tutti.editCruise.field.headOfSortRoom.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -26,6 +26,7 @@ #newRowKey { property: selectedCaracteristic; + beanType: {Caracteristic.class}; enabled: {model.isEditable() && !newRowKey.isEmpty()}; visible: {model.isEditable()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -99,6 +99,7 @@ #cruiseCombobox { property: cruise; + beanType: {Cruise.class}; selectedItem: {model.getCruise()}; enabled: {!cruiseCombobox.isEmpty()}; _validatorLabel: {_("tutti.selectCruise.field.cruise")}; @@ -162,6 +163,7 @@ #protocolCombobox { property: protocol; + beanType: {TuttiProtocol.class}; selectedItem: {model.getProtocol()}; enabled: {!protocolCombobox.isEmpty()}; _validatorLabel: {_("tutti.selectCruise.field.protocol")}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -121,6 +121,7 @@ #strataComboBox { property: strata; + beanType: {TuttiLocation.class}; selectedItem: {model.getStrata()}; _validatorLabel: {_("tutti.editFishingOperation.field.strata")}; } @@ -134,6 +135,7 @@ #subStrataComboBox { property: subStrata; + beanType: {TuttiLocation.class}; selectedItem: {model.getSubStrata()}; _validatorLabel: {_("tutti.editFishingOperation.field.subStrata")}; } @@ -147,6 +149,7 @@ #locationComboBox { property: location; + beanType: {TuttiLocation.class}; selectedItem: {model.getLocation()}; _validatorLabel: {_("tutti.editFishingOperation.field.location")}; } @@ -222,6 +225,7 @@ #gearComboBox { property: gear; + beanType: {Gear.class}; selectedItem: {model.getGear()}; _validatorLabel: {_("tutti.editFishingOperation.field.gear")}; } @@ -537,6 +541,7 @@ #recorderPersonList { property: recorderPerson; + beanType: {Person.class}; border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.recorderPerson"))}; _validatorLabel: {_("tutti.editFishingOperation.field.recorderPerson")}; toolTipText: "tutti.editFishingOperation.field.recorderPerson.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -51,6 +51,7 @@ #fishingOperationComboBox { property: selectedFishingOperation; + beanType: {FishingOperation.class}; selectedItem: {model.getSelectedFishingOperation()}; _help: {"tutti.fishingOperations.field.fishingOperation.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -44,6 +44,7 @@ #accidentalSpeciesComboBox { property: species; + beanType: {Species.class}; selectedItem: {model.getSpecies()}; } @@ -56,6 +57,7 @@ #accidentalGenderComboBox { property: gender; + beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getGender()}; } @@ -98,6 +100,7 @@ #accidentalLengthStepCaracteristicComboBox { property: lengthStepCaracteristic; + beanType: {Caracteristic.class}; selectedItem: {model.getLengthStepCaracteristic()}; } @@ -110,6 +113,7 @@ #accidentalDeadOrAliveComboBox { property: deadOrAlive; + beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getDeadOrAlive()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -47,6 +47,7 @@ #speciesComboBox { property: species; + beanType: {Species.class}; selectedItem: {model.getSpecies()}; data: {model.getAvailableSpecies()}; } @@ -60,6 +61,7 @@ #sortedUnsortedCategoryComboBox { property: sortedUnsortedCategory; + beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getSortedUnsortedCategory()}; } 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-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -114,6 +114,7 @@ #lengthStepCaracteristicComboBox { property: lengthStepCaracteristic; + beanType: {Caracteristic.class}; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; _validatorLabel: {_("tutti.editBenthosFrequencies.field.lengthStepCaracteristic")}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -44,6 +44,7 @@ #individualObservationSpeciesComboBox { property: species; + beanType: {Species.class}; selectedItem: {model.getSpecies()}; } @@ -86,6 +87,7 @@ #individualObservationLengthStepCaracteristicComboBox { property: lengthStepCaracteristic; + beanType: {Caracteristic.class}; selectedItem: {model.getLengthStepCaracteristic()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -46,6 +46,7 @@ #marineLitterCategoryComboBox { property: marineLitterCategory; + beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getMarineLitterCategory()}; } @@ -58,6 +59,7 @@ #marineLitterSizeCategoryComboBox { property: marineLitterSizeCategory; + beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getMarineLitterSizeCategory()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -47,6 +47,7 @@ #speciesComboBox { property: species; + beanType: {Species.class}; selectedItem: {model.getSpecies()}; data: {model.getAvailableSpecies()}; } @@ -60,6 +61,7 @@ #sortedUnsortedCategoryComboBox { property: sortedUnsortedCategory; + beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getSortedUnsortedCategory()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -114,6 +114,7 @@ #lengthStepCaracteristicComboBox { property: lengthStepCaracteristic; + beanType: {Caracteristic.class}; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; _validatorLabel: {_("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -29,6 +29,7 @@ #newRowKey { property: selectedCaracteristic; + beanType: {Caracteristic.class}; enabled: {!newRowKey.isEmpty()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -29,6 +29,7 @@ #newRowKey { property: selectedCaracteristic; + beanType: {Caracteristic.class}; enabled: {!newRowKey.isEmpty()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -72,6 +72,7 @@ #zoneComboBox { property: zone; + beanType: {TuttiLocation.class}; selectedItem: {model.getZone()}; _validatorLabel: {_("tutti.editProgram.field.zone")}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -79,6 +79,7 @@ } #speciesComboBox { + beanType: {Species.class}; enabled: {!speciesComboBox.isEmpty()}; toolTipText: "tutti.editProtocol.field.species.tip"; _help: {"tutti.editProtocol.field.species.help"}; @@ -97,6 +98,7 @@ } #benthosComboBox { + beanType: {Species.class}; enabled: {!benthosComboBox.isEmpty()}; toolTipText: "tutti.editProtocol.field.benthos.tip"; _help: {"tutti.editProtocol.field.benthos.help"}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-07-09 10:02:33 UTC (rev 1120) @@ -529,6 +529,8 @@ (data == null ? 0 : data.size())); } + comboBox.setSortOnDecoratedValues(true); + // add data list to combo box comboBox.init((JXPathDecorator<E>) decorator, data); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -26,6 +26,7 @@ #newRowKey { property: selectedCaracteristic; + beanType: {Caracteristic.class}; enabled: {!newRowKey.isEmpty()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java 2013-07-09 10:02:33 UTC (rev 1120) @@ -88,6 +88,8 @@ final BeanFilterableComboBox<TuttiLocation> component = new BeanFilterableComboBox<TuttiLocation>(); component.setI18nPrefix("tutti.property."); component.setShowReset(true); + component.setSortOnDecoratedValues(true); + component.setBeanType(TuttiLocation.class); setClickCountToStart(1); editorComponent = component; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-07-09 10:02:33 UTC (rev 1120) @@ -87,6 +87,8 @@ final BeanFilterableComboBox<Vessel> component = new BeanFilterableComboBox<Vessel>(); component.setI18nPrefix("tutti.property."); component.setShowReset(true); + component.setSortOnDecoratedValues(true); + component.setBeanType(Vessel.class); setClickCountToStart(1); editorComponent = component; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2013-07-09 08:06:39 UTC (rev 1119) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2013-07-09 10:02:33 UTC (rev 1120) @@ -25,6 +25,7 @@ showReset: true; i18nPrefix: "tutti.property."; bean: {model}; + beanType: {Species.class}; property: selectedSpecies; selectedItem: {model.getSelectedSpecies()}; data: {model.getSpecies()};