Fixed hasValue() impl for UISelectMany and UIInputMany components

forge · May 8, 2014 · b593ca0 · b593ca0
1 parent 5a4c889
commit b593ca0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputManyImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputManyImpl.java
@@ -110,12 +110,13 @@ public String toString()
    @Override
    public boolean hasDefaultValue()
    {
-      return Callables.call(defaultValue) != null;
+      Iterable<VALUETYPE> defaultValueValue = Callables.call(defaultValue);
+      return defaultValueValue != null && defaultValueValue.iterator().hasNext();
    }
 
    @Override
    public boolean hasValue()
    {
-      return value != null;
+      return value != null && value.iterator().hasNext();
    }
 }
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectManyImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectManyImpl.java
@@ -65,13 +65,14 @@ public Iterable<VALUETYPE> getValue()
    @Override
    public boolean hasDefaultValue()
    {
-      return Callables.call(defaultValue) != null;
+      Iterable<VALUETYPE> defaultValueValue = Callables.call(defaultValue);
+      return defaultValueValue != null && defaultValueValue.iterator().hasNext();
    }
 
    @Override
    public boolean hasValue()
    {
-      return value != null;
+      return value != null && value.iterator().hasNext();
    }
 
    @Override