This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 1254068b03d935110a9a93e4431b4b1ee06454f7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:11:46 2015 +0200 Ajout des informations techniques pour un réferentiel en consultation ou édition (See #7610) --- .../ui/content/ref/ContentReferenceUIHandler.java | 20 +++++++++++++++++--- .../i18n/observe-application-swing_en_GB.properties | 1 + .../i18n/observe-application-swing_es_ES.properties | 1 + .../i18n/observe-application-swing_fr_FR.properties | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 1158cba..3ac3035 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -53,6 +53,7 @@ import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -87,6 +88,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -126,9 +128,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content private ReferentialContentUIInitializer<E, ContentReferenceUI<E>> uiInitializer; + protected final FastDateFormat dateFormat; + public ContentReferenceUIHandler(ContentReferenceUI<E> ui) { super(ui, null, null); uiInitializer = new ReferentialContentUIInitializer<>(ui); + Locale locale = ui.getConfig().getLocale(); + if (Locale.ENGLISH.equals(locale)) { + dateFormat = FastDateFormat.getInstance("yyyy-MM-ddZZ"); + } else { + dateFormat = FastDateFormat.getInstance("dd/MM/yyyy"); + } } @@ -398,12 +408,16 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content content.add(new JLabel(t("observe.common.topiaId"))); content.add(new JLabel(bean.getId())); - //FIXME content.add(new JLabel(t("observe.common.topiaCreateDate"))); - content.add(new JLabel("test")); + + content.add(new JLabel(dateFormat.format(bean.getCreateDate()))); + + content.add(new JLabel(t("observe.common.lastUpdateDate"))); + + content.add(new JLabel(dateFormat.format(bean.getLastUpdate()))); content.add(new JLabel(t("observe.common.topiaVersion"))); - content.add(new JLabel("test")); + content.add(new JLabel(String.valueOf(bean.getVersion()))); SpringUtilities.makeCompactGrid(content, 3, 2, 5, 5, 5, 5); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 3c2bc2e..cb0dd3a 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -830,6 +830,7 @@ observe.common.label7= observe.common.label8= observe.common.landingHarbour=Landing harbour observe.common.lastName= +observe.common.lastUpdateDate=Last update date observe.common.latitude=Latitude observe.common.length= observe.common.length.computed.tip= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 3760ec4..29a9f9c 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -830,6 +830,7 @@ observe.common.label7=Texto 7 observe.common.label8=Texto 8 observe.common.landingHarbour= observe.common.lastName=Nombre +observe.common.lastUpdateDate=Last update date observe.common.latitude=Latitude observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 2ff259f..e91f943 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -830,6 +830,7 @@ observe.common.label7=Libellé 7 observe.common.label8=Libellé 8 observe.common.landingHarbour=Port d'arrivée observe.common.lastName=Nom +observe.common.lastUpdateDate=Date de dernière mise à jour observe.common.latitude=Latitude observe.common.length=Longueur hors tout observe.common.length.computed.tip=La longueur a été calculée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.