Author: tchemit Date: 2013-07-10 14:23:26 +0200 (Wed, 10 Jul 2013) New Revision: 1128 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1128 Log: use jaxx 24-SNAPSHOT to fix missing beanType 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/caracteristics/CaracteristicMapEditorUI.css 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-10 10:46:53 UTC (rev 1127) +++ trunk/pom.xml 2013-07-10 12:23:26 UTC (rev 1128) @@ -126,7 +126,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.23</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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -108,7 +108,6 @@ #departureLocationComboBox { property: departureLocation; - beanType: {TuttiLocation.class}; selectedItem: {model.getDepartureLocation()}; _validatorLabel: {_("tutti.editCruise.field.departureLocation")}; } @@ -122,7 +121,6 @@ #returnLocationComboBox { property: returnLocation; - beanType: {TuttiLocation.class}; selectedItem: {model.getReturnLocation()}; _validatorLabel: {_("tutti.editCruise.field.returnLocation")}; } @@ -136,7 +134,6 @@ #programComboBox { property: program; - beanType: {Program.class}; selectedItem: {model.getProgram()}; _validatorLabel: {_("tutti.editCruise.field.program")}; } @@ -221,7 +218,6 @@ #vesselComboBox { property: vessel; - beanType: {Vessel.class}; selectedItem: {model.getVessel()}; toolTipText: "tutti.editCruise.field.vessel.tip"; _validatorLabel: {_("tutti.editCruise.field.vessel")}; @@ -230,7 +226,6 @@ #gearList { property: gear; - beanType: {Gear.class}; border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.gear"))}; _validatorLabel: {_("tutti.editCruise.field.gear")}; toolTipText: "tutti.editCruise.field.gear.tip"; @@ -239,7 +234,6 @@ #headOfMissionList { property: headOfMission; - beanType: {Person.class}; border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfMission"))}; _validatorLabel: {_("tutti.editCruise.field.headOfMission")}; toolTipText: "tutti.editCruise.field.headOfMission.tip"; @@ -248,7 +242,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -26,7 +26,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -52,7 +52,6 @@ #programCombobox { property: program; - beanType: {Program.class}; selectedItem: {model.getProgram()}; enabled: {!programCombobox.isEmpty()}; _validatorLabel: {_("tutti.selectCruise.field.program")}; @@ -99,7 +98,6 @@ #cruiseCombobox { property: cruise; - beanType: {Cruise.class}; selectedItem: {model.getCruise()}; enabled: {!cruiseCombobox.isEmpty()}; _validatorLabel: {_("tutti.selectCruise.field.cruise")}; @@ -163,7 +161,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -121,7 +121,6 @@ #strataComboBox { property: strata; - beanType: {TuttiLocation.class}; selectedItem: {model.getStrata()}; _validatorLabel: {_("tutti.editFishingOperation.field.strata")}; } @@ -135,7 +134,6 @@ #subStrataComboBox { property: subStrata; - beanType: {TuttiLocation.class}; selectedItem: {model.getSubStrata()}; _validatorLabel: {_("tutti.editFishingOperation.field.subStrata")}; } @@ -149,7 +147,6 @@ #locationComboBox { property: location; - beanType: {TuttiLocation.class}; selectedItem: {model.getLocation()}; _validatorLabel: {_("tutti.editFishingOperation.field.location")}; } @@ -225,7 +222,6 @@ #gearComboBox { property: gear; - beanType: {Gear.class}; selectedItem: {model.getGear()}; _validatorLabel: {_("tutti.editFishingOperation.field.gear")}; } @@ -541,7 +537,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -51,7 +51,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -44,7 +44,6 @@ #accidentalSpeciesComboBox { property: species; - beanType: {Species.class}; selectedItem: {model.getSpecies()}; } @@ -57,7 +56,6 @@ #accidentalGenderComboBox { property: gender; - beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getGender()}; } @@ -100,7 +98,6 @@ #accidentalLengthStepCaracteristicComboBox { property: lengthStepCaracteristic; - beanType: {Caracteristic.class}; selectedItem: {model.getLengthStepCaracteristic()}; } @@ -113,7 +110,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -47,7 +47,6 @@ #speciesComboBox { property: species; - beanType: {Species.class}; selectedItem: {model.getSpecies()}; data: {model.getAvailableSpecies()}; } @@ -61,7 +60,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -114,7 +114,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -44,7 +44,6 @@ #individualObservationSpeciesComboBox { property: species; - beanType: {Species.class}; selectedItem: {model.getSpecies()}; } @@ -87,7 +86,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -46,7 +46,6 @@ #marineLitterCategoryComboBox { property: marineLitterCategory; - beanType: {CaracteristicQualitativeValue.class}; selectedItem: {model.getMarineLitterCategory()}; } @@ -59,7 +58,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -47,7 +47,6 @@ #speciesComboBox { property: species; - beanType: {Species.class}; selectedItem: {model.getSpecies()}; data: {model.getAvailableSpecies()}; } @@ -61,7 +60,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -114,7 +114,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -29,7 +29,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -29,7 +29,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -72,7 +72,6 @@ #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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -79,7 +79,6 @@ } #speciesComboBox { - beanType: {Species.class}; enabled: {!speciesComboBox.isEmpty()}; toolTipText: "tutti.editProtocol.field.species.tip"; _help: {"tutti.editProtocol.field.species.help"}; @@ -98,7 +97,6 @@ } #benthosComboBox { - beanType: {Species.class}; enabled: {!benthosComboBox.isEmpty()}; toolTipText: "tutti.editProtocol.field.benthos.tip"; _help: {"tutti.editProtocol.field.benthos.help"}; @@ -123,19 +121,16 @@ #gearUseFeatureList { property: gearUseFeaturePmfm; - beanType: {Caracteristic.class}; _help: {"tutti.editProtocol.field.gearUseFeature.help"}; } #vesselUseFeatureList { property: vesselUseFeaturePmfm; - beanType: {Caracteristic.class}; _help: {"tutti.editProtocol.field.vesselUseFeature.help"}; } #lengthClassesList { property: lengthClassesPmfm; - beanType: {Caracteristic.class}; _help: {"tutti.editProtocol.field.lengthClasses.help"}; } 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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -26,7 +26,6 @@ #newRowKey { property: selectedCaracteristic; - beanType: {Caracteristic.class}; enabled: {!newRowKey.isEmpty()}; } 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-10 10:46:53 UTC (rev 1127) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2013-07-10 12:23:26 UTC (rev 1128) @@ -25,7 +25,6 @@ showReset: true; i18nPrefix: "tutti.property."; bean: {model}; - beanType: {Species.class}; property: selectedSpecies; selectedItem: {model.getSelectedSpecies()}; data: {model.getSpecies()};