This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 1765ec202e2a6c9a6ad7be1ec1e1824b689e091d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 12 09:41:33 2015 +0100 Ajout de méthodes pour faire un rendu i18n plus facile --- .../entities/constants/ReferenceLocale.java | 31 ++----------------- .../referentiel/I18nReferenceEntities.java | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java index 227588c..ebb4ebd 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.entities.constants; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.I18nReferenceEntity; import java.util.Locale; @@ -126,35 +127,7 @@ public enum ReferenceLocale { public <E extends I18nReferenceEntity> String getLabel(E i18nEntity) { - String result = null; - - switch (ordinal() + 1) { - case 1: - result = i18nEntity.getLabel1(); - break; - case 2: - result = i18nEntity.getLabel2(); - break; - case 3: - result = i18nEntity.getLabel3(); - break; - case 4: - result = i18nEntity.getLabel4(); - break; - case 5: - result = i18nEntity.getLabel5(); - break; - case 6: - result = i18nEntity.getLabel6(); - break; - case 7: - result = i18nEntity.getLabel7(); - break; - case 8: - result = i18nEntity.getLabel8(); - break; - } - + String result = I18nReferenceEntities.decorate(ordinal(), i18nEntity); return result; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java index e82d81f..8dcd892 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java @@ -42,4 +42,39 @@ public class I18nReferenceEntities { } + public static <E extends I18nReferenceEntity> String decorate(int referenceLocaleOrdinal, E i18nEntity) { + + String result = null; + + switch (referenceLocaleOrdinal + 1) { + case 1: + result = i18nEntity.getLabel1(); + break; + case 2: + result = i18nEntity.getLabel2(); + break; + case 3: + result = i18nEntity.getLabel3(); + break; + case 4: + result = i18nEntity.getLabel4(); + break; + case 5: + result = i18nEntity.getLabel5(); + break; + case 6: + result = i18nEntity.getLabel6(); + break; + case 7: + result = i18nEntity.getLabel7(); + break; + case 8: + result = i18nEntity.getLabel8(); + break; + } + + return result; + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.