This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2660b8782a38a8409730d7182415d7eeadbcef14 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 14:01:53 2016 +0200 Réusinage des feuilles de styles sur les écrans du référentiel --- .../main/java/fr/ird/observe/ui/ObserveCommon.jcss | 3 + .../ui/content/open/impl/seine/RouteUI.jcss | 1 - .../ird/observe/ui/content/ref/impl/FpaZoneUI.jcss | 2 - .../ui/content/ref/impl/GearCaracteristicUI.jcss | 2 - .../fr/ird/observe/ui/content/ref/impl/GearUI.jcss | 1 - .../ird/observe/ui/content/ref/impl/HarbourUI.jcss | 4 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 4 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 30 ++-------- .../observe/ui/content/ref/impl/OrganismUI.jcss | 4 +- .../ird/observe/ui/content/ref/impl/PersonUI.jcss | 2 - .../ird/observe/ui/content/ref/impl/ProgramUI.jcss | 6 +- .../ui/content/ref/impl/ReferenceEntity.jcss | 12 +++- .../observe/ui/content/ref/impl/SpeciesListUI.jcss | 3 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 22 +++----- .../ird/observe/ui/content/ref/impl/SpeciesUI.jcss | 37 +++--------- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 18 +++--- .../ird/observe/ui/content/ref/impl/VesselUI.jcss | 65 ++++------------------ .../content/ref/impl/seine/WeightCategoryUI.jcss | 4 +- .../observe-application-swing_en_GB.properties | 5 ++ .../observe-application-swing_es_ES.properties | 5 ++ .../observe-application-swing_fr_FR.properties | 5 ++ 21 files changed, 76 insertions(+), 159 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss index 8d50266..53043c7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss @@ -80,12 +80,15 @@ BlockingLayerUI { .integer { numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; + useFloat:false; } .float { numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; + useFloat:true; } .float2 { numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; + useFloat:true; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jcss index a7ef119..aef4939 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jcss @@ -39,7 +39,6 @@ NumberEditor { #date { date:{bean.getDate()}; - formats:{"dd/MM/yyyy"}; _propertyName:{RouteDto.PROPERTY_DATE}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jcss index 2bf4abf..d67009a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jcss @@ -27,10 +27,8 @@ #startDate { date:{bean.getStartDate()}; - formats:{"dd/MM/yyyy"}; } #endDate { date:{bean.getEndDate()}; - formats:{"dd/MM/yyyy"}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jcss index f31f265..8334373 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jcss @@ -27,9 +27,7 @@ #gearCaracteristicType { property:{GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE}; - bean:{bean}; selectedItem:{bean.getGearCaracteristicType()}; - showReset:{true}; } #unitLabel { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jcss index 5c59970..e729043 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jcss @@ -43,7 +43,6 @@ property:{GearDto.PROPERTY_GEAR_CARACTERISTIC}; selected:{(Collection)bean.getGearCaracteristic()}; _validatorLabel: {t("observe.gear.gearCaracteristic")}; - showListLabel: true; universeLabel:{t("observe.gear.availableGearCaracteristic")}; selectedLabel:{t("observe.gear.selectedGearCaracteristic")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jcss index e653e81..6910330 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jcss @@ -25,10 +25,8 @@ } #country { - property:"country"; - bean:{bean}; + property:{HarbourDto.PROPERTY_COUNTRY}; selectedItem:{bean.getCountry()}; - showReset:{true}; } #harbourNameLabel { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx index 87705ee..06cb31e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -255,7 +255,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='meanLengthLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='meanLength' constructorParams='this'/> + <NumberEditor id='meanLength' constructorParams='this' styleClass="float2"/> </cell> </row> @@ -265,7 +265,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='meanWeightLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='meanWeight' constructorParams='this'/> + <NumberEditor id='meanWeight' constructorParams='this' styleClass="float2"/> </cell> </row> <row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jcss index e326480..ba07a24 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jcss @@ -43,17 +43,13 @@ } #sex { - property:"sex"; - bean:{bean}; - showReset:true; + property:{LengthWeightParameterDto.PROPERTY_SEX}; selectedItem:{bean.getSex()}; enabled:{model.isCreatingMode()}; } #species { - property:"species"; - bean:{bean}; - showReset:true; + property:{LengthWeightParameterDto.PROPERTY_SPECIES}; selectedItem:{bean.getSpecies()}; enabled:{model.isCreatingMode()}; } @@ -65,9 +61,7 @@ } #ocean { - property:"ocean"; - bean:{bean}; - showReset:true; + property:{LengthWeightParameterDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; enabled:{model.isCreatingMode()}; } @@ -79,12 +73,10 @@ #startDate { date:{bean.getStartDate()}; - formats:{"dd/MM/yyyy"}; } #endDate { date:{bean.getEndDate()}; - formats:{"dd/MM/yyyy"}; } #relationTable { @@ -144,14 +136,8 @@ } #meanLength { - bean:{bean}; - property:"meanLength"; + property:{LengthWeightParameterDto.PROPERTY_MEAN_LENGTH}; model:{bean.getMeanLength()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } #meanWeightLabel { @@ -160,12 +146,6 @@ } #meanWeight { - bean:{bean}; - property:"meanWeight"; + property:{LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT}; model:{bean.getMeanWeight()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jcss index bd95700..3ef422d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jcss @@ -25,10 +25,8 @@ } #country { - property:"country"; - bean:{bean}; + property:{OrganismDto.PROPERTY_COUNTRY}; selectedItem:{bean.getCountry()}; - showReset:{true}; } #descriptionLabel { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jcss index e1e7fbf..790a2d2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jcss @@ -69,7 +69,5 @@ #country { property:{PersonDto.PROPERTY_COUNTRY}; - bean:{bean}; selectedItem:{bean.getCountry()}; - showReset:{true}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jcss index 5ff02c2..d3337cf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jcss @@ -40,9 +40,7 @@ } #organism { - property:"organism"; - bean:{bean}; - showReset:true; + property:{ProgramDto.PROPERTY_ORGANISM}; selectedItem:{bean.getOrganism()}; } @@ -52,12 +50,10 @@ #startDate { date:{bean.getStartDate()}; - formats:{"dd/MM/yyyy"}; } #endDate { date:{bean.getEndDate()}; - formats:{"dd/MM/yyyy"}; } #editExtraTable { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.jcss index 0101df4..46dde16 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.jcss @@ -54,10 +54,20 @@ } FilterableDoubleList { - bean: {bean}; + bean:{bean}; + showListLabel:true; _forceLoad:true; } BeanComboBox { + bean:{bean}; + showReset:true; _forceLoad:true; } + +NumberEditor { + bean:{bean}; + autoPopup:{config.isAutoPopupNumberEditor()}; + showPopupButton:{config.isShowNumberEditorButton()}; + showReset:true; +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jcss index eef39e1..c2bb915 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jcss @@ -40,10 +40,9 @@ } #species { - property: species; + property: {SpeciesListDto.PROPERTY_SPECIES}; selected:{(Collection)bean.getSpecies()}; _validatorLabel: {t("observe.common.species")}; - showListLabel: true; universeLabel:{t("observe.speciesList.availableSpecies")}; selectedLabel:{t("observe.speciesList.selectedSpecies")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx index 24cf71a..5790c25 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx @@ -55,8 +55,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.referential.SpeciesDto' - context='n1-create' - errorTableModel='{getErrorTableModel()}'/> + context='n1-create' errorTableModel='{getErrorTableModel()}'/> <!-- model --> <SpeciesUIModel id='model'/> @@ -91,11 +90,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' constraints='BorderLayout.WEST' - onKeyReleased='getBean().setCode(code.getText())'/> - <EnumEditor id='status' constraints='BorderLayout.CENTER' - constructorParams='ReferenceStatus.class' - genericType='ReferenceStatus' + <JTextField id='code' constraints='BorderLayout.WEST' onKeyReleased='getBean().setCode(code.getText())'/> + <EnumEditor id='status' constraints='BorderLayout.CENTER' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> </JPanel> </cell> @@ -235,8 +231,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <NumberEditor id='minLength' constructorParams='this'/> - <NumberEditor id='maxLength' constructorParams='this'/> + <NumberEditor id='minLength' constructorParams='this' styleClass="float2"/> + <NumberEditor id='maxLength' constructorParams='this' styleClass="float2"/> </JPanel> </cell> </row> @@ -248,8 +244,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <NumberEditor id='minWeight' constructorParams='this'/> - <NumberEditor id='maxWeight' constructorParams='this'/> + <NumberEditor id='minWeight' constructorParams='this' styleClass="float2"/> + <NumberEditor id='maxWeight' constructorParams='this' styleClass="float2"/> </JPanel> </cell> </row> @@ -261,9 +257,7 @@ <row> <cell weightx="1"> <JScrollPane id='oceanPane' layout='{new GridLayout(1,1)}' onFocusGained='ocean.requestFocus()'> - <FilterableDoubleList id='ocean' - genericType='ReferentialReference<OceanDto>' - _entityClass='OceanDto.class'/> + <FilterableDoubleList id='ocean' genericType='ReferentialReference<OceanDto>' _entityClass='OceanDto.class'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jcss index 0429e30..207f9c8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jcss @@ -34,7 +34,6 @@ border:{new TitledBorder(t("observe.common.libelles"))}; } - #homeIdFAOWormsIdLabel { font-style:"italic"; text:"observe.common.homeIdFAOWormsId"; @@ -42,14 +41,17 @@ #homeId { text:{getStringValue(bean.getHomeId())}; + _validatorLabel: {t("observe.common.homeId")}; } #faoCode { text:{getStringValue(bean.getFaoCode())}; + _validatorLabel: {t("observe.common.faoCode")}; } #wormsId { text:{getStringValue(bean.getWormsId())}; + _validatorLabel: {t("observe.common.wormsId")}; } #scientificLabelLabel { @@ -60,6 +62,7 @@ #scientificLabel { font-style:"italic"; text:{getStringValue(bean.getScientificLabel())}; + _validatorLabel: {t("observe.common.scientificLabel")}; } #oceanPane { @@ -72,7 +75,6 @@ property: {SpeciesDto.PROPERTY_OCEAN}; selected:{(Collection)bean.getOcean()}; _validatorLabel: {t("observe.common.ocean")}; - showListLabel: true; universeLabel:{t("observe.species.availableOcean")}; selectedLabel:{t("observe.species.selectedOcean")}; } @@ -84,9 +86,8 @@ #speciesGroup { property:{SpeciesDto.PROPERTY_SPECIES_GROUP}; - bean:{bean}; - showReset:true; selectedItem:{bean.getSpeciesGroup()}; + _validatorLabel: {t("observe.common.speciesGroup")}; } #editExtraTable { @@ -115,47 +116,27 @@ } #minLength { - bean:{bean}; property: {SpeciesDto.PROPERTY_MIN_LENGTH}; model:{bean.getMinLength()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; + _validatorLabel: {t("observe.common.minLength")}; } #maxLength { - bean:{bean}; property:{SpeciesDto.PROPERTY_MAX_LENGTH}; model:{bean.getMaxLength()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; + _validatorLabel: {t("observe.common.maxLength")}; } #minWeight { - bean:{bean}; property:{SpeciesDto.PROPERTY_MIN_WEIGHT}; model:{bean.getMinWeight()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; + _validatorLabel: {t("observe.common.minWeight")}; } #maxWeight { - bean:{bean}; property:{SpeciesDto.PROPERTY_MAX_WEIGHT}; model:{bean.getMaxWeight()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; + _validatorLabel: {t("observe.common.maxWeight")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx index cac410c..585a8fa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx @@ -80,8 +80,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <NumberEditor id='keelCode' constructorParams='this'/> - <NumberEditor id='fleetCountry' constructorParams='this'/> + <NumberEditor id='keelCode' constructorParams='this' styleClass="integer"/> + <NumberEditor id='fleetCountry' constructorParams='this' styleClass="integer"/> </JPanel> </cell> </row> @@ -105,9 +105,7 @@ <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> <JTextField id='code' constraints='BorderLayout.WEST' onKeyReleased='getBean().setCode(code.getText())'/> - <EnumEditor id='status' constraints='BorderLayout.CENTER' - constructorParams='ReferenceStatus.class' - genericType='ReferenceStatus' + <EnumEditor id='status' constraints='BorderLayout.CENTER' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> </JPanel> </cell> @@ -227,7 +225,7 @@ <JLabel id='lengthLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='length' constructorParams='this'/> + <NumberEditor id='length' constructorParams='this' styleClass="float2"/> </cell> </row> @@ -237,7 +235,7 @@ <JLabel id='capacityLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='capacity' constructorParams='this'/> + <NumberEditor id='capacity' constructorParams='this' styleClass="float2"/> </cell> </row> @@ -247,7 +245,7 @@ <JLabel id='powerLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='power' constructorParams='this'/> + <NumberEditor id='power' constructorParams='this' styleClass="integer"/> </cell> </row> @@ -257,7 +255,7 @@ <JLabel id='searchMaximumLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='searchMaximum' constructorParams='this'/> + <NumberEditor id='searchMaximum' constructorParams='this' styleClass="float2"/> </cell> </row> @@ -267,7 +265,7 @@ <JLabel id='yearServiceLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='yearService' constructorParams='this'/> + <NumberEditor id='yearService' constructorParams='this' styleClass="integer"/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jcss index d23ad8a..8201536 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jcss @@ -44,25 +44,13 @@ } #keelCode { - bean:{bean}; - property:"keelCode"; + property:{VesselDto.PROPERTY_KEEL_CODE}; model:{bean.getKeelCode()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:false; - numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } #fleetCountry { - bean:{bean}; - property:"fleetCountry"; + property:{VesselDto.PROPERTY_FLEET_COUNTRY}; model:{bean.getFleetCountry()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:false; - numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } #vesselTypeLabel { @@ -71,7 +59,7 @@ } #vesselType { - property:"vesselType"; + property:{VesselDto.PROPERTY_VESSEL_TYPE}; bean:{bean}; selectedItem:{bean.getVesselType()}; } @@ -82,8 +70,7 @@ } #vesselSizeCategory { - property:"vesselSizeCategory"; - bean:{bean}; + property:{VesselDto.PROPERTY_VESSEL_SIZE_CATEGORY}; selectedItem:{bean.getVesselSizeCategory()}; } @@ -93,8 +80,7 @@ } #flagCountry { - property:"flagCountry"; - bean:{bean}; + property:{VesselDto.PROPERTY_FLAG_COUNTRY}; selectedItem:{bean.getFlagCountry()}; } @@ -104,14 +90,8 @@ } #length { - bean:{bean}; - property:"length"; + property:{VesselDto.PROPERTY_LENGTH}; model:{bean.getLength()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } #capacityLabel { @@ -120,14 +100,8 @@ } #capacity { - bean:{bean}; - property:"capacity"; + property:{VesselDto.PROPERTY_CAPACITY}; model:{bean.getCapacity()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } #powerLabel { @@ -136,14 +110,8 @@ } #power { - bean:{bean}; - property:"power"; + property:{VesselDto.PROPERTY_POWER}; model:{bean.getPower()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:false; - numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } #searchMaximumLabel { @@ -152,14 +120,8 @@ } #searchMaximum { - bean:{bean}; - property:"searchMaximum"; + property:{VesselDto.PROPERTY_SEARCH_MAXIMUM}; model:{bean.getSearchMaximum()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:true; - numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } #yearServiceLabel { @@ -168,14 +130,8 @@ } #yearService { - bean:{bean}; - property:"yearService"; + property:{VesselDto.PROPERTY_YEAR_SERVICE}; model:{bean.getYearService()}; - autoPopup:{config.isAutoPopupNumberEditor()}; - showPopupButton:{config.isShowNumberEditorButton()}; - showReset:{true}; - useFloat:false; - numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } #changeDateLabel { @@ -185,5 +141,4 @@ #changeDate { date:{bean.getChangeDate()}; - formats:{"dd/MM/yyyy"}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jcss index 349ffb4..2f71828 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jcss @@ -26,9 +26,7 @@ } #species { - property:"species"; - showReset:true; - bean:{bean}; + property:{WeightCategoryDto.PROPERTY_SPECIES}; selectedItem:{bean.getSpecies()}; } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 769a44a..4629a72 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -881,6 +881,8 @@ observe.common.longitude=Longitude observe.common.lowerValueUpperValue= observe.common.mammalsObservation= observe.common.maturityStatus= +observe.common.maxLength= +observe.common.maxWeight= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -889,7 +891,9 @@ observe.common.meanWeight= observe.common.meanWeightComputed.computed.tip= observe.common.meanWeightComputed.observed.tip= observe.common.measureType=Measure type +observe.common.minLength= observe.common.minLengthMax= +observe.common.minWeight= observe.common.minWeightMax= observe.common.mitigationType= observe.common.name= @@ -1061,6 +1065,7 @@ observe.common.weightMeasure= observe.common.weightMeasureType= observe.common.well= observe.common.wind= +observe.common.wormsId= observe.common.yearService= observe.comon.exist.on.remote= observe.config.category.changeStorage=Data sources diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 8035953..d212ab7 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -881,6 +881,8 @@ observe.common.longitude=Longitude observe.common.lowerValueUpperValue= observe.common.mammalsObservation=Mamiferos observe.common.maturityStatus= +observe.common.maxLength= +observe.common.maxWeight= observe.common.meanLength=Talla media (en cm) observe.common.meanLengthComputed.computed.tip=La talla media se ha calculado observe.common.meanLengthComputed.observed.tip=La talla media se ha observado @@ -889,7 +891,9 @@ observe.common.meanWeight=Peso medio (en Kg) observe.common.meanWeightComputed.computed.tip=El peso medio se calculó observe.common.meanWeightComputed.observed.tip=El peso medio se observó observe.common.measureType=Tipo de medida +observe.common.minLength= observe.common.minLengthMax=Talla min-max (en cm) +observe.common.minWeight= observe.common.minWeightMax=Peso min-max (en Kg) observe.common.mitigationType= observe.common.name= @@ -1061,6 +1065,7 @@ observe.common.weightMeasure= observe.common.weightMeasureType= observe.common.well=Cuba observe.common.wind=Fuerza del viento +observe.common.wormsId= observe.common.yearService=año de entrada en servicio observe.comon.exist.on.remote=%1$s (ya existente) observe.config.category.changeStorage=Origen de datos diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index ddd1d75..8d621ef 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -875,6 +875,8 @@ observe.common.longitude=Longitude observe.common.lowerValueUpperValue=Borne min-max observe.common.mammalsObservation=Mammifères observe.common.maturityStatus=Maturité +observe.common.maxLength=Taille maximum (en cm) +observe.common.maxWeight=Poids maximum (en Kg) observe.common.meanLength=Taille moyenne (en cm) observe.common.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s) observe.common.meanLengthComputed.observed.tip=La taille moyenne a été observée @@ -883,7 +885,9 @@ observe.common.meanWeight=Poids moyen (en Kg) observe.common.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) observe.common.meanWeightComputed.observed.tip=Le poids moyen a été observé observe.common.measureType=Type de mensuration +observe.common.minLength=Taile minimum (en cm) observe.common.minLengthMax=Taille min-max (en cm) +observe.common.minWeight=Poids minimum (en Kg) observe.common.minWeightMax=Poids min-max (en Kg) observe.common.mitigationType=Type de mesure d'atténuation observe.common.name=Nom @@ -1055,6 +1059,7 @@ observe.common.weightMeasure=Mesure de poids observe.common.weightMeasureType=Type de mesure de poids observe.common.well=Cuve observe.common.wind=Vent Beaufort +observe.common.wormsId=Worms observe.common.yearService=Année de mise en service observe.comon.exist.on.remote=%1$s (déjà existante) observe.config.category.changeStorage=Source de données -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.