From f9e63f2a56e8c5bdebdd45d7ff814c585755030c Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Wed, 15 Jun 2011 13:08:41 +0000 Subject: [PATCH] Final pieces of SVC 01: I18N List of values constraint following feedback from first sprint demo (ALF-8183) All visible LIST constraints now have English labels, used existing translations for one constraint and updated JSF property sheet component to lookup display label. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/generator/TextFieldGenerator.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java b/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java index d2e2fcc9b4..fb4b2aeafd 100644 --- a/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java +++ b/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java @@ -130,9 +130,9 @@ public class TextFieldGenerator extends BaseComponentGenerator // create the list of choices UISelectItems itemsComponent = (UISelectItems)context.getApplication(). createComponent("javax.faces.SelectItems"); - - List items = new ArrayList(3); + List values = constraint.getAllowedValues(); + List items = new ArrayList(values.size()); for (String value : values) { Object obj = null; @@ -159,7 +159,14 @@ public class TextFieldGenerator extends BaseComponentGenerator obj = value; } - items.add(new SelectItem(obj, value)); + // retrieve the display label + String label = constraint.getDisplayLabel(value); + if (label == null) + { + label = value; + } + + items.add(new SelectItem(obj, label)); } itemsComponent.setValue(items);