This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 80be6d64b0b4ab8352d0111cfdcdf7b55ddf5bdd Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 09:16:33 2016 +0100 Ajout lengthWeightParameter.source (ui) --- .../swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx | 10 ++++++++++ .../swing/ui/content/ref/impl/LengthWeightParameterUI.jcss | 9 +++++++++ .../ui/content/ref/impl/LengthWeightParameterUIModel.java | 1 + .../src/main/resources/i18n/application-swing_en_GB.properties | 1 + .../src/main/resources/i18n/application-swing_es_ES.properties | 1 + .../src/main/resources/i18n/application-swing_fr_FR.properties | 1 + 6 files changed, 23 insertions(+) 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 5ee5130..28261dc 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 @@ -165,6 +165,16 @@ public void decorateUniqueKeyTable(JTable table, </cell> </row> + <!-- source --> + <row> + <cell anchor='west'> + <JLabel id='sourceLabel'/> + </cell> + <cell weightx="1" fill="both"> + <JTextField id='sourceField' onKeyReleased='getBean().setSource(sourceField.getText())'/> + </cell> + </row> + <row> <cell columns="2" weighty="1"> <JLabel/> 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 f7b2307..2657acf 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 @@ -149,3 +149,12 @@ property:{LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT}; model:{bean.getMeanWeight()}; } + +#sourceLabel { + text:"observe.common.source"; + labelFor:{sourceField}; +} + +#sourceField { + text:{getStringValue(bean.getSource())}; +} 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 22326f0..b3ffe56 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 @@ -48,6 +48,7 @@ public class LengthWeightParameterUIModel extends ContentReferenceUIModel<Length LengthWeightParameterDto.PROPERTY_OCEAN, LengthWeightParameterDto.PROPERTY_SPECIES, LengthWeightParameterDto.PROPERTY_NEED_COMMENT, + LengthWeightParameterDto.PROPERTY_SOURCE, LengthWeightParameterDto.PROPERTY_START_DATE, LengthWeightParameterDto.PROPERTY_END_DATE).build(); diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 198bfaf..7d46d8a 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -482,6 +482,7 @@ observe.common.searchMaximum=Search maximum observe.common.sex=Sex observe.common.shipOwner=Ship owner observe.common.sizeMeasureType=Measure type +observe.common.source=Source observe.common.species=Species observe.common.speciesFate=Species fate observe.common.speciesFaune=Fauna species diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 97a8530..18672ab 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -482,6 +482,7 @@ observe.common.searchMaximum=Velocidad máxima de prospección observe.common.sex=Sexo observe.common.shipOwner=Armateur \#TODO observe.common.sizeMeasureType=Tipo de medida +observe.common.source=Source \#TODO observe.common.species=Especie observe.common.speciesFate=Devenir de fauna observe.common.speciesFaune=Especie de fauna diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 1a40c31..00a2bc8 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -482,6 +482,7 @@ observe.common.searchMaximum=Vitesse maximale observe.common.sex=Sexe observe.common.shipOwner=Armateur observe.common.sizeMeasureType=Type de mensuration +observe.common.source=Source observe.common.species=Espèce observe.common.speciesFate=Devenir espèce observe.common.speciesFaune=Espèce de faune -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.