branch feature/22 created (now 1b0ff61)
This is an automated email from the git hooks/post-receive script. New change to branch feature/22 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 1b0ff61 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) This branch includes the following new commits: new 1b0ff61 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1b0ff61dd9359fb2090674476b745f4b944ccdb3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 21 18:13:28 2016 +0100 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/22 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1b0ff61dd9359fb2090674476b745f4b944ccdb3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 21 18:13:28 2016 +0100 Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + revue des écrans du référentiel (Closes #22) --- .../ui/content/ref/ContentI18nReferenceUI.jaxx | 16 ++++++------- .../ui/content/ref/ContentI18nReferenceUI.jcss | 8 +++++++ .../swing/ui/content/ref/impl/CountryUI.jaxx | 9 ++++--- .../swing/ui/content/ref/impl/CountryUI.jcss | 2 ++ .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 10 ++++---- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 7 +++--- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 11 ++++----- .../ui/content/ref/impl/GearCaracteristicUI.jcss | 1 + .../swing/ui/content/ref/impl/GearUI.jaxx | 19 ++++++++------- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 8 +++---- .../swing/ui/content/ref/impl/HarbourUI.jcss | 2 ++ .../content/ref/impl/LengthLengthParameterUI.jaxx | 11 ++++----- .../content/ref/impl/LengthLengthParameterUI.jcss | 3 +++ .../content/ref/impl/LengthWeightParameterUI.jaxx | 15 +++++------- .../content/ref/impl/LengthWeightParameterUI.jcss | 5 ++++ .../ref/impl/LengthWeightParameterUIModel.java | 6 +++-- .../swing/ui/content/ref/impl/OceanUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 6 ++--- .../swing/ui/content/ref/impl/OrganismUI.jcss | 1 + .../swing/ui/content/ref/impl/PersonUI.jaxx | 14 ++++------- .../swing/ui/content/ref/impl/PersonUI.jcss | 6 ++--- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 20 +++++++++------- .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 2 ++ .../swing/ui/content/ref/impl/SexUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 6 ++--- .../swing/ui/content/ref/impl/ShipOwnerUI.jcss | 1 + .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 19 ++++++++------- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++++++++--------- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 4 ++-- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 8 +++---- .../ui/content/ref/impl/VesselSizeCategoryUI.jcss | 2 ++ .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 28 ++++++++-------------- .../swing/ui/content/ref/impl/VesselUI.jaxx | 19 ++++++++------- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 7 +++--- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 4 ++-- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 4 ++-- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 4 ++-- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 4 ++-- .../content/ref/impl/longline/HookPositionUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 4 ++-- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 4 ++-- .../ref/impl/longline/LightsticksColorUI.jaxx | 4 ++-- .../ref/impl/longline/LightsticksTypeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 4 ++-- .../ref/impl/longline/MaturityStatusUI.jaxx | 9 ++++--- .../ref/impl/longline/MaturityStatusUI.jcss | 2 ++ .../ref/impl/longline/MitigationTypeUI.jaxx | 4 ++-- .../content/ref/impl/longline/SensorBrandUI.jaxx | 7 +++--- .../content/ref/impl/longline/SensorBrandUI.jcss | 1 + .../ref/impl/longline/SensorDataFormatUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 4 ++-- .../content/ref/impl/longline/SettingShapeUI.jaxx | 4 ++-- .../ref/impl/longline/StomacFullnessUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 4 ++-- .../impl/longline/VesselActivityLonglineUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 4 ++-- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 4 ++-- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 4 ++-- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 4 ++-- .../ref/impl/seine/SurroundingActivityUI.jaxx | 4 ++-- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 4 ++-- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 8 +++---- .../swing/ui/content/ref/impl/seine/WindUI.jcss | 3 +++ .../application/swing/ui/util/JComment.jaxx | 2 +- 78 files changed, 243 insertions(+), 230 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jaxx index 70df810..0458e4b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jaxx @@ -42,13 +42,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -56,13 +56,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -70,13 +70,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -84,13 +84,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss index f0c88ef..8aa2095 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss @@ -9,6 +9,7 @@ #label1 { text:{getStringValue(getBean().getLabel1())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL1}; } #label2Label { @@ -18,6 +19,7 @@ #label2 { text:{getStringValue(getBean().getLabel2())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL2}; } #label3Label { @@ -27,6 +29,7 @@ #label3 { text:{getStringValue(getBean().getLabel3())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL3}; } #label4Label { @@ -36,6 +39,7 @@ #label4 { text:{getStringValue(getBean().getLabel4())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL4}; } #label5Label { @@ -45,6 +49,7 @@ #label5 { text:{getStringValue(getBean().getLabel5())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL5}; } #label6Label { @@ -54,6 +59,7 @@ #label6 { text:{getStringValue(getBean().getLabel6())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL6}; } #label7Label { @@ -63,6 +69,7 @@ #label7 { text:{getStringValue(getBean().getLabel7())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL7}; } #label8Label { @@ -72,4 +79,5 @@ #label8 { text:{getStringValue(getBean().getLabel8())}; + _propertyName:{I18nReferentialDto.PROPERTY_LABEL8}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx index b96eac0..903ef68 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx @@ -32,8 +32,7 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.CountryDto' + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.referential.CountryDto' context='ui-create' errorTableModel='{getErrorTableModel()}'/> <!-- model --> @@ -50,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -75,7 +74,7 @@ <JLabel id='iso2CodeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='iso2Code' onKeyReleased='getBean().setIso2Code(iso2Code.getText())'/> + <JTextField id='iso2Code'/> </cell> </row> @@ -85,7 +84,7 @@ <JLabel id='iso3CodeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='iso3Code' onKeyReleased='getBean().setIso3Code(iso3Code.getText())'/> + <JTextField id='iso3Code'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss index 2127177..5827b6d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss @@ -26,6 +26,7 @@ #iso2Code { text:{getStringValue(bean.getIso2Code())}; + _propertyName:{CountryDto.PROPERTY_ISO2_CODE}; } #iso3CodeLabel { @@ -35,4 +36,5 @@ #iso3Code { text:{getStringValue(bean.getIso3Code())}; + _propertyName:{CountryDto.PROPERTY_ISO3_CODE}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx index 7d05e3d..8b95242 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx @@ -34,10 +34,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.FpaZoneDto' - context='ui-create' - errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.referential.FpaZoneDto' + context='ui-create' errorTableModel='{getErrorTableModel()}'/> <!-- model --> <FpaZoneUIModel id='model'/> @@ -53,7 +51,7 @@ <JLabel id="uriLabel"/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -64,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx index 4d594c9..9acd2f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx @@ -33,9 +33,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto' - context='ui-create' errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto'/> <!-- model --> <GearCaracteristicTypeUIModel id='model'/> @@ -62,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx index 694d0d5..d305db1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx @@ -37,9 +37,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.GearCaracteristicDto' - context='ui-create' errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.GearCaracteristicDto'/> <!-- model --> <GearCaracteristicUIModel id='model'/> @@ -55,7 +54,7 @@ <JLabel id="uriLabel"/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -66,7 +65,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -99,7 +98,7 @@ <JLabel id='unitLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='unit' onKeyReleased='getBean().setUnit(unit.getText())'/> + <JTextField id='unit'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss index ba1e4a8..658be58 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss @@ -37,4 +37,5 @@ #unit { text:{getStringValue(bean.getUnit())}; + _propertyName:{GearCaracteristicDto.PROPERTY_UNIT}; } \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx index 8a0c9d0..6c0f6b4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx @@ -25,6 +25,7 @@ <import> fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.services.dto.referential.GearCaracteristicDto @@ -59,7 +60,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -93,13 +94,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -107,13 +108,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -121,13 +122,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -135,13 +136,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx index 6ceb806..62f97ac 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx @@ -62,7 +62,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -73,7 +73,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -87,7 +87,7 @@ <JLabel id='locodeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='locode' onKeyReleased='getBean().setLocode(locode.getText())'/> + <JTextField id='locode'/> </cell> </row> @@ -97,7 +97,7 @@ <JLabel id='harbourNameLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='harbourName' onKeyReleased='getBean().setName(harbourName.getText())'/> + <JTextField id='harbourName'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss index 4e807c1..65ddb22 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss @@ -36,6 +36,7 @@ #harbourName { text:{getStringValue(bean.getName())}; + _propertyName:{HarbourDto.PROPERTY_NAME}; } #locodeLabel { @@ -45,6 +46,7 @@ #locode { text:{getStringValue(bean.getLocode())}; + _propertyName:{HarbourDto.PROPERTY_LOCODE}; } #coordinatesLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx index de6246a..dcf4342 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx @@ -88,7 +88,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -144,8 +144,7 @@ <JLabel id='coefficientsLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='coefficients' - onKeyReleased='getBean().setCoefficients(coefficients.getText())'/> + <JTextField id='coefficients'/> </cell> </row> @@ -161,8 +160,7 @@ <JLabel id='inputOutputFormulaLabel'/> </cell> <cell weightx="1" fill="both"> - <JTextField id='inputOutputFormula' - onKeyReleased='getBean().setInputOutputFormula(inputOutputFormula.getText())'/> + <JTextField id='inputOutputFormula'/> </cell> </row> @@ -178,8 +176,7 @@ <JLabel id='outputInputFormulaLabel'/> </cell> <cell weightx="1" fill="both"> - <JTextField id='outputInputFormula' - onKeyReleased='getBean().setOutputInputFormula(outputInputFormula.getText())'/> + <JTextField id='outputInputFormula'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss index 17462e4..865fde4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss @@ -86,6 +86,7 @@ #inputOutputFormula { text:{getStringValue(getBean().getInputOutputFormula())}; + _propertyName:{LengthLengthParameterDto.PROPERTY_INPUT_OUTPUT_FORMULA}; } #outputInputFormulaInformation { @@ -100,6 +101,7 @@ #outputInputFormula { text:{getStringValue(getBean().getOutputInputFormula())}; + _propertyName:{LengthLengthParameterDto.PROPERTY_OUTPUT_INPUT_FORMULA}; } #coefficientsInformation { @@ -114,6 +116,7 @@ #coefficients { text:{getStringValue(bean.getCoefficients())}; + _propertyName:{LengthLengthParameterDto.PROPERTY_COEFFICIENTS}; } #sourceField { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx index ec22833..0a411bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -132,8 +132,8 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='west' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <JXDatePicker id='startDate' onActionPerformed='getBean().setStartDate(startDate.getDate())'/> - <JXDatePicker id='endDate' onActionPerformed='getBean().setEndDate(endDate.getDate())'/> + <JXDatePicker id='startDate'/> + <JXDatePicker id='endDate'/> </JPanel> </cell> </row> @@ -144,7 +144,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -200,8 +200,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='coefficientsLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='coefficients' - onKeyReleased='getBean().setCoefficients(coefficients.getText())'/> + <JTextField id='coefficients'/> </cell> </row> @@ -217,8 +216,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='lengthWeightFormulaLabel'/> </cell> <cell weightx="1" fill="both"> - <JTextField id='lengthWeightFormula' - onKeyReleased='getBean().setLengthWeightFormula(lengthWeightFormula.getText())'/> + <JTextField id='lengthWeightFormula'/> </cell> </row> @@ -234,8 +232,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='weightLengthFormulaLabel'/> </cell> <cell weightx="1" fill="both"> - <JTextField id='weightLengthFormula' - onKeyReleased='getBean().setWeightLengthFormula(weightLengthFormula.getText())'/> + <JTextField id='weightLengthFormula'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss index 052d2be..f1a6412 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss @@ -90,10 +90,12 @@ #startDate { date:{bean.getStartDate()}; + _propertyName:{LengthWeightParameterDto.PROPERTY_START_DATE}; } #endDate { date:{bean.getEndDate()}; + _propertyName:{LengthWeightParameterDto.PROPERTY_END_DATE}; } #relationTable { @@ -113,6 +115,7 @@ #lengthWeightFormula { text:{getStringValue(bean.getLengthWeightFormula())}; + _propertyName:{LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA}; } #weightLengthFormulaInformation { @@ -127,6 +130,7 @@ #weightLengthFormula { text:{getStringValue(bean.getWeightLengthFormula())}; + _propertyName:{LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA}; } #coefficientsInformation { @@ -141,6 +145,7 @@ #coefficients { text:{getStringValue(bean.getCoefficients())}; + _propertyName:{LengthWeightParameterDto.PROPERTY_COEFFICIENTS}; } #meanValuesTable { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java index 5f0395a..767f184 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java @@ -78,8 +78,10 @@ public class LengthWeightParameterUIModel extends ContentReferenceUIModel<Length LengthWeightParameterDto.PROPERTY_SIZE_MEASURE_TYPE, LengthWeightParameterDto.PROPERTY_START_DATE, }, - null - ); + new String[]{ + LengthWeightParameterUI.BINDING_START_DATE_DATE, + LengthWeightParameterUI.BINDING_END_DATE_DATE + }); } public boolean isOtherTabValid() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx index 6078bbc..b3003b2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx index bc3034d..8567d3c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx @@ -56,7 +56,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -67,7 +67,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -92,7 +92,7 @@ <JLabel id='descriptionLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='description' onKeyReleased='getBean().setDescription(description.getText())'/> + <JTextField id='description'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss index 3ef422d..62e56ef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jcss @@ -36,4 +36,5 @@ #description { text:{getStringValue(bean.getDescription())}; + _propertyName:{OrganismDto.PROPERTY_DESCRIPTION}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx index fb36489..2049d8a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx @@ -42,10 +42,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.PersonDto' - context='ui-create' - errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.referential.PersonDto' + context='ui-create' errorTableModel='{getErrorTableModel()}'/> <!-- model --> <PersonUIModel id='model'/> @@ -81,7 +79,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -95,8 +93,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='lastNameLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='lastName' - onKeyReleased='getBean().setLastName(lastName.getText())'/> + <JTextField id='lastName'/> </cell> </row> @@ -106,8 +103,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='firstNameLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='firstName' - onKeyReleased='getBean().setFirstName(firstName.getText())'/> + <JTextField id='firstName'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss index 71fefa7..9e71aa4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jcss @@ -25,10 +25,6 @@ labelFor:{code}; } -#code { - text:{getStringValue(bean.getCode())}; -} - #lastNameLabel { text:"observe.common.lastName"; labelFor:{lastName}; @@ -36,6 +32,7 @@ #lastName { text:{getStringValue(bean.getLastName())}; + _propertyName:{PersonDto.PROPERTY_LAST_NAME}; } #firstNameLabel { @@ -45,6 +42,7 @@ #firstName { text:{getStringValue(bean.getFirstName())}; + _propertyName:{PersonDto.PROPERTY_FIRST_NAME}; } #captain { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx index 6aaa51c..21cb1d2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx @@ -30,6 +30,8 @@ fr.ird.observe.services.dto.constants.GearType fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.ProgramDto + fr.ird.observe.services.dto.referential.ReferentialDto + fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.OrganismDto fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum fr.ird.observe.application.swing.ui.util.JComment @@ -68,7 +70,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -140,13 +142,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -154,13 +156,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -168,13 +170,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -182,13 +184,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss index 797fcf8..e798dbe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ReferenceEntity.jcss @@ -25,6 +25,7 @@ #code { text:{bean.getCode()}; + _propertyName:{fr.ird.observe.services.dto.referential.ReferentialDto.PROPERTY_CODE}; } #uriLabel { @@ -35,6 +36,7 @@ #uri { text:{getStringValue(bean.getUri())}; + _propertyName:{fr.ird.observe.services.dto.referential.ReferentialDto.PROPERTY_URI}; } #statusLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx index 9c11fc1..3472ad9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx @@ -49,7 +49,7 @@ <JLabel id="uriLabel"/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx index 329b92c..c91483c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -86,7 +86,7 @@ <JLabel id='labelLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label' onKeyReleased='getBean().setLabel(label.getText())'/> + <JTextField id='label'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jcss index b56d75b..99869b2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jcss @@ -36,4 +36,5 @@ #label { text:{getStringValue(bean.getLabel())}; + _propertyName:{ShipOwnerDto.PROPERTY_LABEL}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx index aa0738f..f562efc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx index 5fdaf13..7c01ba2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx @@ -52,7 +52,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -63,7 +63,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx index da5f700..c50f00a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx @@ -27,6 +27,7 @@ <import> fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.SpeciesListDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel @@ -66,7 +67,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -100,13 +101,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -114,13 +115,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -128,13 +129,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -142,13 +143,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx index 789d484..2fd3d98 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx @@ -27,6 +27,7 @@ <import> fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SpeciesGroupDto fr.ird.observe.services.dto.referential.OceanDto @@ -65,7 +66,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -91,8 +92,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <JTextField id='homeId' onKeyReleased='getBean().setHomeId(homeId.getText())'/> - <JTextField id='faoCode' onKeyReleased='getBean().setFaoCode(faoCode.getText())'/> + <JTextField id='homeId'/> + <JTextField id='faoCode'/> <JTextField id='wormsId' onKeyReleased='getBean().setWormsId(Long.valueOf(wormsId.getText()))'/> </JPanel> </cell> @@ -134,13 +135,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -148,13 +149,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -162,13 +163,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -176,13 +177,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss index fd0d503..026061c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss @@ -38,11 +38,13 @@ #homeId { text:{getStringValue(bean.getHomeId())}; _validatorLabel: {t("observe.common.homeId")}; + _propertyName:{SpeciesDto.PROPERTY_HOME_ID}; } #faoCode { text:{getStringValue(bean.getFaoCode())}; _validatorLabel: {t("observe.common.faoCode")}; + _propertyName:{SpeciesDto.PROPERTY_FAO_CODE}; } #wormsId { @@ -138,5 +140,3 @@ model:{bean.getMaxWeight()}; _validatorLabel: {t("observe.common.maxWeight")}; } - - diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx index 2967891..0330029 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -86,7 +86,7 @@ <JLabel id='gaugeLabelLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='gaugeLabel' onKeyReleased='getBean().setGaugeLabel(gaugeLabel.getText())'/> + <JTextField id='gaugeLabel'/> </cell> </row> @@ -96,7 +96,7 @@ <JLabel id='capacityLabelLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='capacityLabel' onKeyReleased='getBean().setCapacityLabel(capacityLabel.getText())'/> + <JTextField id='capacityLabel'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss index 481ff4a..3594d8c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jcss @@ -30,6 +30,7 @@ #gaugeLabel { text:{getStringValue(bean.getGaugeLabel())}; + _propertyName:{VesselSizeCategoryDto.PROPERTY_GAUGE_LABEL}; } #capacityLabelLabel { @@ -39,4 +40,5 @@ #capacityLabel { text:{getStringValue(bean.getCapacityLabel())}; + _propertyName:{VesselSizeCategoryDto.PROPERTY_CAPACITY_LABEL}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx index 389649f..0c3165e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx @@ -49,7 +49,7 @@ <JLabel id="uriLabel"/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -83,15 +83,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' - onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' - onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -99,15 +97,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' - onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' - onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -115,15 +111,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' - onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' - onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -131,15 +125,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' - onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' - onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx index bcca0b5..2120e74 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx @@ -27,6 +27,7 @@ <import> fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.VesselDto fr.ird.observe.services.dto.referential.VesselSizeCategoryDto fr.ird.observe.services.dto.referential.CountryDto @@ -78,7 +79,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -146,13 +147,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2'/> </cell> </row> <row> @@ -160,13 +161,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4'/> </cell> </row> <row> @@ -174,13 +175,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6'/> </cell> </row> <row> @@ -188,13 +189,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx index 070cc93..352e2a3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx @@ -32,9 +32,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.WeightMeasureTypeDto' - context='ui-create' errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.WeightMeasureTypeDto'/> <!-- model --> <WeightMeasureTypeUIModel id='model'/> @@ -50,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx index 0b9b779..5b93b37 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx @@ -48,7 +48,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -59,7 +59,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx index 48df2fa..c35e623 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx index 1e5d5fd..4e83e19 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx index 199438b..c4d1b2b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx index 46ca0b6..fdf4041 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx index 332eba0..ac4f47c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx index 15aed6d..c0e51c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx index dccabc5..fb2648e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx index 4e91df0..c519935 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx index 4929a1a..5b3efdd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx index 3abd920..c34a985 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx index 933ec4c..1cc48c8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx index d01bda7..a4971ff 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx index d35c383..e0e8e43 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx index 5801c90..be1097c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -76,9 +76,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='lowerValueUpperValuePanel' layout='{new GridLayout()}'> - <JTextField id='lowerValue' constraints='BorderLayout.WEST' - onKeyReleased='getBean().setLowerValue(lowerValue.getText())'/> - <JTextField id='upperValue' onKeyReleased='getBean().setUpperValue(upperValue.getText())'/> + <JTextField id='lowerValue'/> + <JTextField id='upperValue'/> </JPanel> </cell> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss index 6bd9a73..41731a1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jcss @@ -26,8 +26,10 @@ #lowerValue { text:{getStringValue(bean.getLowerValue())}; + _propertyName:{MaturityStatusDto.PROPERTY_LOWER_VALUE}; } #upperValue { text:{getStringValue(bean.getUpperValue())}; + _propertyName:{MaturityStatusDto.PROPERTY_UPPER_VALUE}; } \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx index 7cdb3ac..9b0b9f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx index 3f59ad0..7c20e75 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -74,8 +74,7 @@ <JLabel id='brandNameLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='brandName' - onKeyReleased='getBean().setBrandName(brandName.getText())'/> + <JTextField id='brandName'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss index 3f2d3a3..9dbf4e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jcss @@ -26,4 +26,5 @@ #brandName { text:{getStringValue(bean.getBrandName())}; + _propertyName:{SensorBrandDto.PROPERTY_BRAND_NAME}; } \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx index 474c1a0..98828b6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx index 9ae58a3..8e37ace 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx index a626e70..4099a4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx index 4f30fd2..3dc3de7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx index f67287e..348592e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx @@ -49,7 +49,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -60,7 +60,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx index a9c170d..da330b3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx index 8850249..618a994 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx index 80206ad..b476184 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx index e5c5689..2a04baf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx @@ -63,7 +63,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx index 269f1d7..f9e23bb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx index 2538fb2..3ddebf7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx @@ -52,7 +52,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -63,7 +63,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx index c9be5d6..bc33d13 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx @@ -63,7 +63,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx index 1712d93..79dd524 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx index 9aad190..cfe527c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx index 55b594b..4c86f0b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx index 6c2c906..294a880 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx index b481dce..3f23e90 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx index fd9eb37..c9d6e42 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx @@ -63,7 +63,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx index 258229f..2789783 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx @@ -51,7 +51,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -62,7 +62,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx index 934b014..b45567c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx @@ -85,7 +85,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -96,7 +96,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx index 75b3b24..e57d337 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx @@ -50,7 +50,7 @@ <JLabel id='uriLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri'/> </cell> </row> @@ -61,7 +61,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' onKeyReleased='getBean().setCode(code.getText())'/> + <JTextField id='code' constraints='BorderLayout.WEST'/> <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())' constraints='BorderLayout.CENTER'/> @@ -75,7 +75,7 @@ <JLabel id='speedRangeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='speedRange' onKeyReleased='getBean().setSpeedRange(speedRange.getText())'/> + <JTextField id='speedRange'/> </cell> </row> @@ -85,7 +85,7 @@ <JLabel id='waveHeightLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='waveHeight' onKeyReleased='getBean().setWaveHeight(waveHeight.getText())'/> + <JTextField id='waveHeight'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss index 7ab0fb3..d86772a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jcss @@ -27,6 +27,8 @@ #speedRange { text:{getStringValue(bean.getSpeedRange())}; + _propertyName:{WindDto.PROPERTY_SPEED_RANGE}; + } #waveHeightLabel { @@ -36,4 +38,5 @@ #waveHeight { text:{getStringValue(bean.getWaveHeight())}; + _propertyName:{WindDto.PROPERTY_WAVE_HEIGHT}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx index 0181801..89d02bf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx @@ -11,7 +11,7 @@ <JScrollPane constraints='BorderLayout.CENTER' id='comment' columnHeaderView="{columnHeader}" onFocusGained='comment2.requestFocus()'> <JTextArea id='comment2' - onKeyReleased='model.setComment(comment2.getText().isEmpty() ? null : comment2.getText())'/> + onKeyReleased='if (!comment2.getText().isEmpty() || model.getComment() != null) { model.setComment(comment2.getText().isEmpty() ? null : comment2.getText()); }'/> <JPanel id="columnHeader" layout="{new BorderLayout()}"> <JLabel constraints='BorderLayout.WEST' text="{getTitle()}"/> <JToolBar constraints='BorderLayout.EAST'> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm