This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 43477ddc3ef6408db74dc919b2a1b57b698ae5f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 8 21:30:53 2016 +0100 Initilisation de EnumEditor avec les libellés + suppression ConstantsI18n --- .../fr/ird/observe/db/constants/ConstantsI18n.java | 44 ---------------------- .../observe/ui/content/ContentUIInitializer.java | 22 +++++++++++ .../impl/seine/FloatingObjectUIHandler.java | 1 + .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../observe-application-swing_fr_FR.properties | 5 --- pom.xml | 2 +- 6 files changed, 26 insertions(+), 52 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java deleted file mode 100644 index 7d97735..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java +++ /dev/null @@ -1,44 +0,0 @@ -package fr.ird.observe.db.constants; - -import fr.ird.observe.services.dto.constants.seine.Ownership; -import fr.ird.observe.services.dto.constants.seine.SchoolType; -import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; - -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ConstantsI18n { - - static { - n("observe.schoolType.undefined"); - n("observe.schoolType.objet"); - n("observe.schoolType.libre"); - - n("observe.typeTransmittingBuoyOperation.pasDeBalise"); - n("observe.typeTransmittingBuoyOperation.visite"); - n("observe.typeTransmittingBuoyOperation.recuperation"); - n("observe.typeTransmittingBuoyOperation.pose"); - n("observe.typeTransmittingBuoyOperation.recuperationEtRemplacement"); - - n("observe.ownership.unknown"); - n("observe.ownership.ceVessel"); - n("observe.ownership.autreVessel"); - - } - - public static String getLabel(SchoolType schoolType) { - return t("observe.schoolType." + schoolType.name()); - } - - public static String getLabel(TypeTransmittingBuoyOperation typeTransmittingBuoyOperation) { - return t("observe.typeTransmittingBuoyOperation." + typeTransmittingBuoyOperation.name()); - } - - public static String getLabel(Ownership ownership) { - return t("observe.ownership." + ownership.name()); - } - -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 97fa6b2..8915c46 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content; * #L% */ +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.AbstractReference; @@ -31,6 +32,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.util.I18nEnumUtil; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; @@ -42,12 +44,14 @@ import jaxx.runtime.JAXXValidator; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.OneClicListSelectionModel; +import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.swing.editor.bean.BeanUIUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import jaxx.runtime.swing.renderer.EnumEditorRenderer; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; @@ -94,6 +98,7 @@ import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.Collections; import java.util.Date; +import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -271,6 +276,11 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E continue; } + if (o instanceof EnumEditor) { + init((EnumEditor) o); + continue; + } + if (o instanceof ObserveSwingValidator<?>) { init(ui, (ObserveSwingValidator<?>) o); continue; @@ -559,6 +569,18 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } + protected <E extends Enum<E>> void init(EnumEditor<E> editor) { + if (log.isDebugEnabled()) { + log.debug("init enumEditor editor " + editor.getName()); + } + ImmutableMap.Builder<E, String> labelsBuilder = ImmutableMap.builder(); + for (E e : EnumSet.allOf(editor.getType())) { + String label = I18nEnumUtil.getLabel(e); + labelsBuilder.put(e, label); + } + editor.setRenderer(new EnumEditorRenderer<>(labelsBuilder.build())); + } + protected boolean isAutoSelectOnFocus(JComponent comp) { Boolean selectOnFocus = (Boolean) comp.getClientProperty("selectOnFocus"); return BooleanUtils.isTrue(selectOnFocus); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 79dbee5..425303c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -204,6 +204,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } } + @Override protected boolean doDelete(FloatingObjectDto bean) throws Exception { if (askToDelete(bean)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 4ac6569..d34e005 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constants.ConstantsI18n; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; @@ -36,6 +35,7 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineDtos; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.util.I18nEnumUtil; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; @@ -104,7 +104,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { if (schoolType == null) { return t("observe.setSeine.schoolType.not.fill"); } - return ConstantsI18n.getLabel(schoolType); + return I18nEnumUtil.getLabel(schoolType); } @Override 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 f0b5e51..061c95f 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 @@ -2398,11 +2398,6 @@ observe.tripSeine.message.updating=La maréee est en cours de modification. observe.tripSeine.tab.general=Caractéristiques observe.tripSeine.tab.map=Carte observe.tripSeine.title=Marée -observe.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP -observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise -observe.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau -observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise -observe.typeTransmittingBuoyOperation.visite=observe.typeTransmittingBuoyOperation.visite\= observe.validation.model.type.all=Données et référentiels observe.validation.model.type.all.description=Données et référentiels observe.validation.model.type.data=Données observées diff --git a/pom.xml b/pom.xml index 0d9b10e..4e85526 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <topiaVersion>3.1-SNAPSHOT</topiaVersion> - <jaxxVersion>2.28.2</jaxxVersion> + <jaxxVersion>2.29-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.