Using Item label converter if available when setting UISelect values

forge · Aug 26, 2013 · 78840aa · 78840aa
1 parent f32a48f
commit 78840aa
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/ui/api/src/main/java/org/jboss/forge/addon/ui/util/InputComponents.java b/ui/api/src/main/java/org/jboss/forge/addon/ui/util/InputComponents.java
@@ -191,8 +191,17 @@ private static Object convertToUIInputValue(final ConverterFactory converterFact
       {
          if (input instanceof SelectComponent)
          {
-            Iterable<Object> valueChoices = ((SelectComponent<?, Object>) input).getValueChoices();
-            Converter<Object, Object> selectConverter = converterFactory.getConverter(targetType, sourceType);
+            SelectComponent<?, Object> selectComponent = (SelectComponent<?, Object>) input;
+            Iterable<Object> valueChoices = selectComponent.getValueChoices();
+            final Converter<Object, ?> selectConverter;
+            if (String.class.isAssignableFrom(sourceType))
+            {
+               selectConverter = (Converter<Object, ?>) getItemLabelConverter(converterFactory, selectComponent);
+            }
+            else
+            {
+               selectConverter = converterFactory.getConverter(targetType, sourceType);
+            }
             Object chosenObj = null;
             if (valueChoices != null)
             {