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 40ac5e1d9f3e14d50811031e73b4a18c527cdb9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:58:00 2016 +0100 Ajout SpeciesFate.discard (ui) --- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 8 ++++++ ...{SpeciesFateUIModel.java => SpeciesFateUI.jcss} | 31 ++++++---------------- .../content/ref/impl/seine/SpeciesFateUIModel.java | 8 +++--- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + 6 files changed, 24 insertions(+), 26 deletions(-) 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 e6c79be..be5a518 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 @@ -82,6 +82,14 @@ onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> </cell> </row> + + <!-- discard --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <JCheckBox id='discard' + onItemStateChanged='getBean().setDiscard(discard.isSelected())'/> + </cell> + </row> </Table> <Table id='editI18nTable'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss similarity index 52% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss index c03c506..ce9ff62 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss @@ -1,42 +1,27 @@ -package fr.ird.observe.application.swing.ui.content.ref.impl.seine; - /* * #%L - * ObServe :: Application Swing + * ObServe :: Swing * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; -import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; - -/** - * Created on 9/28/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since XXX - */ -public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFateDto> { - - private static final long serialVersionUID = 1L; - - public SpeciesFateUIModel() { - super(SpeciesFateDto.class); - } - +#discard { + text:"observe.common.discard"; + selected:{bean.isDiscard()}; } + diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java index c03c506..cc710c1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java @@ -22,21 +22,23 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; /** * Created on 9/28/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 5.1 */ public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFateDto> { private static final long serialVersionUID = 1L; public SpeciesFateUIModel() { - super(SpeciesFateDto.class); + super(SpeciesFateDto.class, + new String[]{SpeciesFateDto.PROPERTY_DISCARD}, + new String[]{SpeciesFateUI.BINDING_DISCARD_SELECTED}); } } 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 7d46d8a..660ea39 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 @@ -380,6 +380,7 @@ observe.common.description=Description observe.common.detailledActivitiesObservation=detailled activities observe.common.detectionMode=Detection mode observe.common.directory=Directory +observe.common.discard=Discard ? observe.common.endDate=end date observe.common.endLogValue=End log value observe.common.equation=Equation 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 18672ab..323b731 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 @@ -380,6 +380,7 @@ observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas observe.common.detectionMode=Modo de detección observe.common.directory=Carpeta +observe.common.discard=Rejeté ? \#TODO observe.common.endDate=Fecha de fin observe.common.endLogValue=Corredera de tarde (millas) observe.common.equation=Relación talla-peso 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 00a2bc8..c0ea086 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 @@ -380,6 +380,7 @@ observe.common.description=Description observe.common.detailledActivitiesObservation=Activités détaillées observe.common.detectionMode=Mode détection observe.common.directory=Répertoire +observe.common.discard=Rejeté ? observe.common.endDate=Fin de validité observe.common.endLogValue=Loch du soir (milles) observe.common.equation=Relation Taille-Poids -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.