This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 1664d3772fa039966e31ab1355174aa22242349a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:12:36 2015 +0200 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique --- .../fr/ird/observe/ConsolidateDataService.java | 4 +-- .../src/main/java/fr/ird/observe/DataService.java | 2 +- .../main/java/fr/ird/observe/DecoratorService.java | 31 ++++++++++++---------- .../java/fr/ird/observe/db/ReplicationService.java | 2 +- .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 10 +++---- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 8 +++--- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 6 ++--- .../ird/observe/ui/content/ContentUIHandler.java | 4 +-- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +++--- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/NavigationTreeCellRenderer.java | 2 ++ .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +-- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- 20 files changed, 48 insertions(+), 48 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java b/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java index 5111a74..ef0999e 100644 --- a/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java +++ b/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java @@ -132,14 +132,14 @@ public class ConsolidateDataService { public String getNonTargetCatcheLabel() { if (nonTargetCatcheLabel == null) { - nonTargetCatcheLabel = t(getDecoratorService().getEntityLabel(NonTargetCatch.class)); + nonTargetCatcheLabel = t(DecoratorService.getEntityLabel(NonTargetCatch.class)); } return nonTargetCatcheLabel; } public String getSpeciesLabel() { if (speciesLabel == null) { - speciesLabel = t(getDecoratorService().getEntityLabel(Species.class)); + speciesLabel = t(DecoratorService.getEntityLabel(Species.class)); } return speciesLabel; diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index 8400c5a..806f8b0 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -1891,7 +1891,7 @@ public class DataService { public <E extends TopiaEntity> void walk( Class<E> contractClass) throws Exception { - String s = t(getDecoratorService().getEntityLabel(contractClass)); + String s = t(DecoratorService.getEntityLabel(contractClass)); String message = t("observe.service.build.synchro.referentiel", s); if (messanger != null) { diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index a3f2538..92c16e7 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -142,13 +142,12 @@ public class DecoratorService extends DecoratorProvider { private static final Log log = LogFactory.getLog(DecoratorService.class); /** Le pattern pour utiliser les clef i18n generees dans les entites */ - protected static final Pattern LABEL_PATTERN = - Pattern.compile("observe\\.common\\.(.+)"); - - public static final String WITH_POSITION = "withPosition"; + protected static final Pattern LABEL_PATTERN = Pattern.compile("observe\\.common\\.(.+)"); public static final String HAULING_IDENTIFIER = "haulingIdentifier"; + public static final String OBSERVE_COMMON_PREFIX = "observe.common."; + /** la locale du referentiel. */ protected ReferenceLocale referentielLocale; @@ -170,22 +169,27 @@ public class DecoratorService extends DecoratorProvider { } @SuppressWarnings({"unchecked"}) - public String getEntityLabel(Class entityClass) { + public static String getEntityLabel(Class entityClass) { + return getEntityLabel(OBSERVE_COMMON_PREFIX, entityClass); + } + + public static String getEntityLabel(String prefix, Class entityClass) { if (!TopiaEntity.class.isAssignableFrom(entityClass)) { throw new IllegalArgumentException( entityClass + " is not a TopiaEntity"); } entityClass = ObserveDAOHelper.getContractClass(entityClass); - return getPropertyLabel(entityClass.getSimpleName()); + return getPropertyLabel(prefix, entityClass.getSimpleName()); } - public String getEntityLabel(TopiaEntity entity) { - return getEntityLabel(entity.getClass()); + + public static String getPropertyLabel(String propertyName) { + String type = getPropertyLabel(OBSERVE_COMMON_PREFIX, propertyName); + return type; } - public String getPropertyLabel(String propertyName) { - String type = - "observe.common." + Introspector.decapitalize(propertyName); + public static String getPropertyLabel(String prefix, String propertyName) { + String type = prefix + Introspector.decapitalize(propertyName); return type; } @@ -302,6 +306,7 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.tdrRecord"); n("observe.common.tripLongline"); n("observe.common.weightMeasure"); + n("observe.common.gearUseFeaturesSeine"); n("observe.common.vesselSizeCategory"); n("observe.common.harbour"); @@ -582,9 +587,7 @@ public class DecoratorService extends DecoratorProvider { String invokerProperty = t(getPropertyLabel( ref.getInvokerProperty())); - String type = - t(getEntityLabel( - invoker.getClass())); + String type = t(getEntityLabel(invoker.getClass())); Decorator<?> decorator = getDecoratorByType(invoker.getClass()); if (invokerProperty == null) { diff --git a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java index 4ce4695..3817c8a 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java +++ b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java @@ -232,7 +232,7 @@ public class ReplicationService { TopiaContext srcCtxt = srcService.beginTransaction("replicateData"); try { TopiaEntity e = srcCtxt.findByTopiaId(id); - String label = t(getDecoratorService().getEntityLabel(e.getClass())); + String label = t(DecoratorService.getEntityLabel(e.getClass())); srcService.fireNewMessage(t("observe.storage.message.replicate.data.entity", label, dstLabel)); } catch (TopiaException e) { diff --git a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties index e0ae654..bd7ea60 100644 --- a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties +++ b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties @@ -28,6 +28,7 @@ observe.common.fpaZone= observe.common.gear=Gear observe.common.gearCaracteristic=Gear caracteristic observe.common.gearCaracteristicType=Gear caracteristic type +observe.common.gearUseFeaturesSeine= observe.common.gps.activity= observe.common.gps.gpsPoint= observe.common.gps.gpsPointInterval= diff --git a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties index c5a6a02..21d18f0 100644 --- a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties +++ b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties @@ -28,6 +28,7 @@ observe.common.fpaZone= observe.common.gear= observe.common.gearCaracteristic= observe.common.gearCaracteristicType= +observe.common.gearUseFeaturesSeine= observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS observe.common.gps.gpsPointInterval=Intervalo de puntos diff --git a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties index 698dfd9..d19efc1 100644 --- a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties +++ b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties @@ -28,6 +28,7 @@ observe.common.fpaZone=Zone FPA observe.common.gear=Équipement observe.common.gearCaracteristic=Caractéristique d'un équipement observe.common.gearCaracteristicType=Type de caractéristique d'équipement +observe.common.gearUseFeaturesSeine=Équipement observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS observe.common.gps.gpsPointInterval=Intervalle de points diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 0a4ecf0..2360afa 100755 --- a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -137,7 +137,7 @@ public class ObserveMainUIHandler { if (node.isStringNode()) { params = t(node.getId()); } else { - params = t(ui.getContextValue(DataService.class).getDecoratorService().getEntityLabel(node.getInternalClass())); + params = t(DecoratorService.getEntityLabel(node.getInternalClass())); } ui.getStatus().setStatus(t("observe.action.open.screen", params)); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java index a9f9c11..ab08ea9 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveServiceHelper; import jaxx.runtime.FileChooserUtil; import jaxx.runtime.JAXXObject; import jaxx.runtime.SwingUtil; @@ -308,7 +307,7 @@ public class UIHelper extends SwingUtil { Decorator<E> decorator = decoratorService.getDecoratorByType(beanClass); String beanStr; String messageDelete; - String type = decoratorService.getEntityLabel(beanClass); + String type = DecoratorService.getEntityLabel(beanClass); type = t(type); if (bean == null || bean.getTopiaId() == null || decorator == null) { @@ -408,13 +407,10 @@ public class UIHelper extends SwingUtil { public static final Comparator<Class> REFERENTIEL_COMPARATOR = new Comparator<Class>() { - DecoratorService decoratorService = - ObserveServiceHelper.getDecoratorService(); - @Override public int compare(Class o1, Class o2) { - String s1 = t(decoratorService.getEntityLabel(o1)); - String s2 = t(decoratorService.getEntityLabel(o2)); + String s1 = t(DecoratorService.getEntityLabel(o1)); + String s2 = t(DecoratorService.getEntityLabel(o2)); return s1.compareTo(s2); } }; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java index 71bf7e8..45520cb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java @@ -60,7 +60,7 @@ public class ObsoleteEntityListCellRenderer extends DefaultListCellRenderer { List<?> val = (List<?>) entry.getValue(); DecoratorService service = getDecoratorService(); - String type = t(service.getEntityLabel(id.getClass())); + String type = t(DecoratorService.getEntityLabel(id.getClass())); Decorator<?> decorator = service.getDecoratorByType(id.getClass()); String decorated = decorator.toString(id); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index 591fd49..c5671e0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -182,7 +182,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { SynchronizeModel model = ui.getStepModel(); TopiaEntity entity = (TopiaEntity) evt.getNewValue(); DecoratorService decoratorService = getDecoratorService(); - String type = t(decoratorService.getEntityLabel(entity.getClass())); + String type = t(DecoratorService.getEntityLabel(entity.getClass())); Decorator<?> decorator = decoratorService.getDecoratorByType(entity.getClass()); String label = t("observe.synchro.obsolete.entity.label", @@ -238,7 +238,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { List<TopiaEntityRef> refs = entry.getValue(); DecoratorService decoratorService = getDecoratorService(); - String type = decoratorService.getEntityLabel(entity.getClass()); + String type = DecoratorService.getEntityLabel(entity.getClass()); Decorator<?> decorator = decoratorService.getDecoratorByType(entity.getClass()); String label = t("observe.synchro.obsolete.entity.label", @@ -533,7 +533,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { for (itr = obsoleteRefs.entrySet().iterator(); itr.hasNext(); ) { Map.Entry<TopiaEntity, List<TopiaEntityRef>> entry = itr.next(); for (Iterator<TopiaEntityRef> itrRef = - entry.getValue().iterator(); itrRef.hasNext(); ) { + entry.getValue().iterator(); itrRef.hasNext(); ) { TopiaEntityRef ref = itrRef.next(); TopiaEntity refInvoker = ref.getInvoker(); if (refInvoker == null) { @@ -585,7 +585,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { constant.getContract(); List<TopiaEntity> toReplicate = new ArrayList<TopiaEntity>(); for (Iterator<TopiaEntity> itr = - obsoleteEntities.iterator(); itr.hasNext(); ) { + obsoleteEntities.iterator(); itr.hasNext(); ) { TopiaEntity e = itr.next(); if (contractClass.isAssignableFrom(e.getClass())) { if (log.isDebugEnabled()) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java index f962adf..1b71b99 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -83,7 +83,7 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl return; } for (Class<?> klass : model.getMessageTypes()) { - String type = t(decoratorService.getEntityLabel(klass)); + String type = t(DecoratorService.getEntityLabel(klass)); renderCache.put(klass, type); } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index 8860e97..82005cb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -375,7 +375,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { // des validateurs ont été trouvés for (SimpleBeanValidator<?> v : validators.values()) { - String label = t(decoratorService.getEntityLabel(v.getType())); + String label = t(DecoratorService.getEntityLabel(v.getType())); sendMessage(t("observe.message.validation.detected", label)); } } else { @@ -447,8 +447,6 @@ public class ValidateUIHandler extends AdminTabUIHandler { TopiaContext ctxt, DataSelectionModel dataModel) throws DataSourceException, TopiaException { - DecoratorService decoratorService = getDecoratorService(); - DataService dataService = getDataService(); Set<Class<?>> classes = dataModel.getSelectedReferentiel(); @@ -456,7 +454,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { // on recupere la liste des ids a valider Class<? extends TopiaEntity> refClass = (Class<? extends TopiaEntity>) klass; List<String> ids = dataService.getEntityIds(source, refClass); - String entityLabel = t(decoratorService.getEntityLabel(klass)); + String entityLabel = t(DecoratorService.getEntityLabel(klass)); sendMessage(t("observe.message.validation.start.referentiel", entityLabel, ids.size())); for (String id : ids) { TopiaEntity e = ctxt.findByTopiaId(id); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index fa20409..6f5f3e3 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -686,7 +686,7 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } protected String getEntityLabel(Class<?> klass) { - String result = getDecoratorService().getEntityLabel(klass); + String result = DecoratorService.getEntityLabel(klass); return result; } @@ -822,7 +822,7 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { public String updateTitle(String title) { if (ContentReferenceUIHandler.class.isAssignableFrom(getClass())) { - return getDecoratorService().getEntityLabel(getBeanType()); + return DecoratorService.getEntityLabel(getBeanType()); } return title; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 7ceafc0..d0a9398 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -133,7 +133,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); - String type = service.getEntityLabel(entity.getClass()); + String type = DecoratorService.getEntityLabel(entity.getClass()); type = t(type); String message = t("observe.message.show.usage.for.delete", type, @@ -160,7 +160,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); - String type = service.getEntityLabel(entity.getClass()); + String type = DecoratorService.getEntityLabel(entity.getClass()); type = t(type); String message = t("observe.message.show.usage.for.desactivated", type, decorator.toString(entity)); String message2 = t("observe.message.show.usage.for.desactivated2"); @@ -308,7 +308,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); String title = t("observe.title.unique.key", - t(dService.getEntityLabel(beanType))); + t(DecoratorService.getEntityLabel(beanType))); pane.setBorder(new TitledBorder(title)); @@ -345,7 +345,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten } DecoratorService dService = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = dService.getDecoratorByType(bean.getClass()); - String type = dService.getEntityLabel(bean.getClass()); + String type = DecoratorService.getEntityLabel(bean.getClass()); type = t(type); String message = t("observe.message.show.usages", type, decorator.toString(bean)); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index a882acb..0b151ef 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -258,7 +258,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel if (node.isReferentielNode()) { - text = t(getDecoratorService().getEntityLabel(beanType)); + text = t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, beanType)); return text; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java index cd67a44..69a630e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java @@ -35,6 +35,8 @@ import java.awt.Component; */ public class NavigationTreeCellRenderer extends AbstractObserveTreeCellRenderer { + private static final long serialVersionUID = 1L; + public NavigationTreeCellRenderer() { } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java index 2f8217c..7b01271 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java @@ -80,13 +80,11 @@ public class UsagesUIHandler { t("observe.message.no.usage.for.entity"))); } else { - DecoratorService dService = - ObserveContext.get().getDecoratorService(); for (Map.Entry<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> entry : usages.entrySet()) { Class<? extends TopiaEntity> type = entry.getKey(); List<? extends TopiaEntity> entitites = entry.getValue(); - String typeTitle = dService.getEntityLabel(type); + String typeTitle = DecoratorService.getEntityLabel(type); typeTitle = t(typeTitle); addUsages(ui, type, entitites, typeTitle); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java index 934a5b5..002ee33 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java @@ -58,7 +58,7 @@ public class ObserveSimpleValidatorMessageTableRenderer extends SimpleBeanValida String fieldName = super.getFieldName(table, value, row); DecoratorService dService = getDecoratorService(); if (!dService.getPropertyMatch(fieldName).matches()) { - fieldName = dService.getPropertyLabel(fieldName); + fieldName = DecoratorService.getPropertyLabel(fieldName); } return t(fieldName); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java index ff2770f..c1d18af 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java @@ -80,7 +80,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT DecoratorService dService = getDecoratorService(); if (!dService.getPropertyMatch(fieldName).matches()) { - fieldName = dService.getPropertyLabel(fieldName); + fieldName = DecoratorService.getPropertyLabel(fieldName); } fieldName = t(fieldName); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.