FORGE-2493: UISelectOne<String> should not take candy from strangers

forge · Sep 30, 2015 · fcbf19f · fcbf19f
1 parent 44f3acd
commit fcbf19f
Showing 1 changed file with 33 additions and 3 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
@@ -173,8 +173,7 @@ private static void setManyInputValue(final ConverterFactory converterFactory,
    }
 
    /**
-    * Returns the converted value that matches the input. Throws {@link IllegalArgumentException} if input is a
-    * {@link SelectComponent} and the value cannot be converted
+    * Returns the converted value that matches the input.
     */
    public static Object convertToUIInputValue(final ConverterFactory converterFactory,
             final InputComponent<?, ?> input, final Object value)
@@ -245,7 +244,38 @@ public static Object convertToUIInputValue(final ConverterFactory converterFacto
          }
          else
          {
-            result = value;
+            if (input instanceof SelectComponent)
+            {
+               SelectComponent<?, Object> selectComponent = (SelectComponent<?, Object>) input;
+               Iterable<Object> valueChoices = selectComponent.getValueChoices();
+               final Converter<Object, ?> selectConverter;
+               if (String.class.isAssignableFrom(sourceType))
+               {
+                  selectConverter = getItemLabelConverter(converterFactory, selectComponent);
+               }
+               else
+               {
+                  selectConverter = converterFactory.getConverter(targetType, sourceType);
+               }
+               Object chosenObj = null;
+               if (valueChoices != null)
+               {
+                  for (Object valueChoice : valueChoices)
+                  {
+                     Object convertedObj = selectConverter.convert(valueChoice);
+                     if (convertedObj.equals(value))
+                     {
+                        chosenObj = valueChoice;
+                        break;
+                     }
+                  }
+               }
+               result = chosenObj;
+            }
+            else
+            {
+               result = value;
+            }
          }
       }
       return result;