InputComponents.hasValue now checks if the value is an empty collection

forge · Sep 24, 2013 · da14948 · da14948
1 parent 042da1a
commit da14948
Showing 1 changed file with 7 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
@@ -263,6 +263,10 @@ else if (value instanceof String && value.toString().isEmpty())
       {
          ret = false;
       }
+      else if (value instanceof Iterable && !((Iterable) value).iterator().hasNext())
+      {
+         ret = false;
+      }
       else
       {
          ret = true;
@@ -305,13 +309,13 @@ public static String validateRequired(final InputComponent<?, ?> input)
     * @return the item label converter of a {@link SelectComponent} or a {@link Converter} instance from the
     *         {@link ConverterFactory} parameter if not null
     */
-   public static Converter<?, String> getItemLabelConverter(final ConverterFactory converterFactory,
+   public static Converter<Object, String> getItemLabelConverter(final ConverterFactory converterFactory,
             final SelectComponent<?, ?> input)
    {
-      Converter<?, String> converter = input.getItemLabelConverter();
+      Converter<Object, String> converter = (Converter<Object, String>) input.getItemLabelConverter();
       if (converter == null && converterFactory != null)
       {
-         converter = converterFactory.getConverter(input.getValueType(), String.class);
+         converter = (Converter<Object, String>) converterFactory.getConverter(input.getValueType(), String.class);
       }
       return converter;
    }