[jaxx] branch develop updated (cc58234 -> 9df3c00)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from cc58234 add translation new 9df3c00 fixes #3516 : Traduction field in UnifiedValidatorMessageTableRenderer The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9df3c00ca33752af718edaf5f133224d3b3257a7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 18 12:09:12 2014 +0200 fixes #3516 : Traduction field in UnifiedValidatorMessageTableRenderer Summary of changes: .../jaxx/runtime/validator/swing/SwingValidatorUtil.java | 8 ++++++++ .../unified/UnifiedValidatorMessageTableRenderer.java | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 9df3c00ca33752af718edaf5f133224d3b3257a7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 18 12:09:12 2014 +0200 fixes #3516 : Traduction field in UnifiedValidatorMessageTableRenderer --- .../jaxx/runtime/validator/swing/SwingValidatorUtil.java | 8 ++++++++ .../unified/UnifiedValidatorMessageTableRenderer.java | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java index aa38353..bf17d9e 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java @@ -560,6 +560,10 @@ public class SwingValidatorUtil extends SimpleBeanValidators { } public static String getFieldName(UnifiedValidatorMessage model, String value) { + return getFieldName(model, value, null); + } + + public static String getFieldName(UnifiedValidatorMessage model, String value, String valueFallBack) { String text = null; JComponent editor = model.getEditor(); Object validatorLabel = null; @@ -585,6 +589,10 @@ public class SwingValidatorUtil extends SimpleBeanValidators { } } + if (text == null && valueFallBack != null) { + text = valueFallBack; + } + if (text == null) { text = value; } diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java index b845b06..1f05c3d 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java @@ -22,6 +22,7 @@ package jaxx.runtime.validator.swing.unified; * #L% */ +import com.google.common.collect.Maps; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.StringUtils; import org.nuiton.validator.NuitonValidatorScope; @@ -32,6 +33,7 @@ import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; +import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -45,6 +47,8 @@ public class UnifiedValidatorMessageTableRenderer extends DefaultTableCellRender private static final long serialVersionUID = 1L; + protected final Map<String, String> fieldNameMap = Maps.newHashMap(); + @Override public Component getTableCellRendererComponent(JTable table, Object value, @@ -149,7 +153,7 @@ public class UnifiedValidatorMessageTableRenderer extends DefaultTableCellRender } public String getFieldName(int row, UnifiedValidatorMessage model, String value) { - String fieldName = SwingValidatorUtil.getFieldName(model, value); + String fieldName = SwingValidatorUtil.getFieldName(model, value, fieldNameMap.get(value)); return fieldName; } @@ -180,4 +184,13 @@ public class UnifiedValidatorMessageTableRenderer extends DefaultTableCellRender protected String decorateBean(Object bean) { return bean == null ? "" : bean.toString(); } + + public void clearFieldNameMap() { + fieldNameMap.clear(); + } + + public void addFieldName(String field, String name) { + fieldNameMap.put(field, name); + } + } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm