Refactored UIInput* hierarchy to support getValueType()

forge · Feb 7, 2013 · 19f8ece · 19f8ece
1 parent 1b8ec30
commit 19f8ece
Show file tree

Hide file tree

Showing 12 changed files with 193 additions and 64 deletions.
diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UICompleter.java b/ui/api/src/main/java/org/jboss/forge/ui/UICompleter.java
@@ -10,7 +10,7 @@
  * @param VALUETYPE The value type to be provided by completion.
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public interface UICompleter<T>
+public interface UICompleter<VALUETYPE>
 {
    /**
     * Get completion proposals for the provided {@link UIInput} and un-converted partial {@link String} value.
@@ -19,5 +19,5 @@ public interface UICompleter<T>
     * @param value The user input value requiring completion, or null, if no value yet exists. These values will undergo
     *           conversion to fit the type required by the corresponding {@link UIInput}.
     */
-   Iterable<String> getCompletionProposals(UIInputComponent<?, T> input, String value);
+   Iterable<String> getCompletionProposals(UIInputComponent<?, VALUETYPE> input, String value);
 }
diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UIInput.java b/ui/api/src/main/java/org/jboss/forge/ui/UIInput.java
@@ -7,9 +7,19 @@
 
 package org.jboss.forge.ui;
 
+import java.util.concurrent.Callable;
+
 public interface UIInput<VALUETYPE> extends UIInputComponent<UIInput<VALUETYPE>, VALUETYPE>
 {
    UICompleter<VALUETYPE> getCompleter();
 
    UIInput<VALUETYPE> setCompleter(UICompleter<VALUETYPE> completer);
+
+   VALUETYPE getValue();
+
+   UIInput<VALUETYPE> setDefaultValue(VALUETYPE value);
+
+   UIInput<VALUETYPE> setDefaultValue(Callable<VALUETYPE> callback);
+
+   UIInput<VALUETYPE> setValue(VALUETYPE value);
 }
diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UIInputComponent.java b/ui/api/src/main/java/org/jboss/forge/ui/UIInputComponent.java
@@ -17,23 +17,16 @@
 @Exported
 public interface UIInputComponent<IMPLTYPE, VALUETYPE> extends Faceted
 {
-
    String getLabel();
 
    String getName();
 
    Class<VALUETYPE> getValueType();
 
-   VALUETYPE getValue();
-
    boolean isEnabled();
 
    boolean isRequired();
 
-   IMPLTYPE setDefaultValue(VALUETYPE value);
-
-   IMPLTYPE setDefaultValue(Callable<VALUETYPE> callback);
-
    IMPLTYPE setEnabled(boolean b);
 
    IMPLTYPE setEnabled(Callable<Boolean> callable);
@@ -43,6 +36,4 @@ public interface UIInputComponent<IMPLTYPE, VALUETYPE> extends Faceted
    IMPLTYPE setRequired(boolean required);
 
    IMPLTYPE setRequired(Callable<Boolean> required);
-
-   IMPLTYPE setValue(VALUETYPE value);
 }
diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UIInputMany.java b/ui/api/src/main/java/org/jboss/forge/ui/UIInputMany.java
@@ -7,9 +7,19 @@
 
 package org.jboss.forge.ui;
 
-public interface UIInputMany<VALUETYPE> extends UIInputComponent<UIInputMany<VALUETYPE>, Iterable<VALUETYPE>>
+import java.util.concurrent.Callable;
+
+public interface UIInputMany<VALUETYPE> extends UIInputComponent<UIInputMany<VALUETYPE>, VALUETYPE>
 {
    UICompleter<VALUETYPE> getCompleter();
 
    UIInputMany<VALUETYPE> setCompleter(UICompleter<VALUETYPE> completer);
+
+   Iterable<VALUETYPE> getValue();
+
+   UIInputMany<VALUETYPE> setDefaultValue(Iterable<VALUETYPE> value);
+
+   UIInputMany<VALUETYPE> setDefaultValue(Callable<Iterable<VALUETYPE>> callback);
+
+   UIInputMany<VALUETYPE> setValue(Iterable<VALUETYPE> value);
 }
diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UISelectMany.java b/ui/api/src/main/java/org/jboss/forge/ui/UISelectMany.java
@@ -6,10 +6,19 @@
  */
 package org.jboss.forge.ui;
 
+import java.util.concurrent.Callable;
 
-public interface UISelectMany<VALUETYPE> extends UIInputComponent<UISelectMany<VALUETYPE>, Iterable<VALUETYPE>>
+public interface UISelectMany<VALUETYPE> extends UIInputComponent<UISelectMany<VALUETYPE>, VALUETYPE>
 {
    Iterable<VALUETYPE> getValueChoices();
 
    UISelectMany<VALUETYPE> setValueChoices(Iterable<VALUETYPE> values);
+
+   Iterable<VALUETYPE> getValue();
+
+   UISelectMany<VALUETYPE> setDefaultValue(Iterable<VALUETYPE> value);
+
+   UISelectMany<VALUETYPE> setDefaultValue(Callable<Iterable<VALUETYPE>> callback);
+
+   UISelectMany<VALUETYPE> setValue(Iterable<VALUETYPE> value);
 }
diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UISelectOne.java b/ui/api/src/main/java/org/jboss/forge/ui/UISelectOne.java
@@ -6,9 +6,19 @@
  */
 package org.jboss.forge.ui;
 
+import java.util.concurrent.Callable;
+
 public interface UISelectOne<VALUETYPE> extends UIInputComponent<UISelectOne<VALUETYPE>, VALUETYPE>
 {
    Iterable<VALUETYPE> getValueChoices();
 
    UISelectOne<VALUETYPE> setValueChoices(Iterable<VALUETYPE> values);
+
+   VALUETYPE getValue();
+
+   UISelectOne<VALUETYPE> setDefaultValue(VALUETYPE value);
+
+   UISelectOne<VALUETYPE> setDefaultValue(Callable<VALUETYPE> callback);
+
+   UISelectOne<VALUETYPE> setValue(VALUETYPE value);
 }
diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/NoopCompleter.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/NoopCompleter.java
@@ -20,7 +20,7 @@
 public class NoopCompleter implements UICompleter
 {
    @Override
-   public Iterable getCompletionProposals(UIInputComponent input, String value)
+   public Iterable<String> getCompletionProposals(UIInputComponent input, String value)
    {
       return Collections.emptyList();
    }

diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputComponentBase.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputComponentBase.java
@@ -30,19 +30,17 @@ public abstract class UIInputComponentBase<IMPLTYPE extends UIInputComponent<IMP
          implements UIInputComponent<IMPLTYPE, VALUETYPE>
 {
    private final String name;
-   private final Class<VALUETYPE> type;
 
    private String label;
    private Callable<Boolean> enabled;
-   private VALUETYPE value;
    private Callable<Boolean> required;
-   private Callable<VALUETYPE> defaultValue;
 
-   @SuppressWarnings("unchecked")
-   public UIInputComponentBase(String name, Class<?> type)
+   private Class<VALUETYPE> type;
+
+   public UIInputComponentBase(String name, Class<VALUETYPE> type)
    {
       this.name = name;
-      this.type = (Class<VALUETYPE>) type;
+      this.type = type;
    }
 
    @Override
@@ -57,12 +55,6 @@ public String getName()
       return name;
    }
 
-   @Override
-   public VALUETYPE getValue()
-   {
-      return (value == null) ? Callables.call(defaultValue) : value;
-   }
-
    @Override
    public Class<VALUETYPE> getValueType()
    {
@@ -81,22 +73,6 @@ public boolean isRequired()
       return Callables.call(required);
    }
 
-   @SuppressWarnings("unchecked")
-   @Override
-   public IMPLTYPE setDefaultValue(Callable<VALUETYPE> callback)
-   {
-      this.defaultValue = callback;
-      return (IMPLTYPE) this;
-   }
-
-   @SuppressWarnings("unchecked")
-   @Override
-   public IMPLTYPE setDefaultValue(VALUETYPE value)
-   {
-      this.defaultValue = Callables.returning(value);
-      return (IMPLTYPE) this;
-   }
-
    @SuppressWarnings("unchecked")
    @Override
    public IMPLTYPE setEnabled(boolean enabled)
@@ -137,14 +113,6 @@ public IMPLTYPE setRequired(Callable<Boolean> required)
       return (IMPLTYPE) this;
    }
 
-   @SuppressWarnings("unchecked")
-   @Override
-   public IMPLTYPE setValue(VALUETYPE value)
-   {
-      this.value = value;
-      return (IMPLTYPE) this;
-   }
-
    @Override
    public boolean supports(Class<? extends Facet<?>> type)
    {

diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputImpl.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputImpl.java
@@ -7,10 +7,13 @@
 
 package org.jboss.forge.ui.impl;
 
+import java.util.concurrent.Callable;
+
 import javax.enterprise.inject.Vetoed;
 
 import org.jboss.forge.ui.UICompleter;
 import org.jboss.forge.ui.UIInput;
+import org.jboss.forge.ui.util.Callables;
 
 /**
  * Implementation of a {@link UIInput} object
@@ -23,7 +26,10 @@
 public class UIInputImpl<VALUETYPE> extends UIInputComponentBase<UIInput<VALUETYPE>, VALUETYPE> implements
          UIInput<VALUETYPE>
 {
-   public UIInputImpl(String name, Class<?> type)
+   private VALUETYPE value;
+   private Callable<VALUETYPE> defaultValue;
+
+   public UIInputImpl(String name, Class<VALUETYPE> type)
    {
       super(name, type);
    }
@@ -43,4 +49,31 @@ public UIInput<VALUETYPE> setCompleter(UICompleter<VALUETYPE> completer)
       this.completer = completer;
       return this;
    }
+
+   @Override
+   public UIInput<VALUETYPE> setValue(VALUETYPE value)
+   {
+      this.value = value;
+      return this;
+   }
+
+   @Override
+   public UIInput<VALUETYPE> setDefaultValue(Callable<VALUETYPE> callback)
+   {
+      this.defaultValue = callback;
+      return this;
+   }
+
+   @Override
+   public UIInput<VALUETYPE> setDefaultValue(VALUETYPE value)
+   {
+      this.defaultValue = Callables.returning(value);
+      return this;
+   }
+
+   @Override
+   public VALUETYPE getValue()
+   {
+      return (value == null) ? Callables.call(defaultValue) : value;
+   }
 }
diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputManyImpl.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputManyImpl.java
@@ -7,11 +7,14 @@
 
 package org.jboss.forge.ui.impl;
 
+import java.util.concurrent.Callable;
+
 import javax.enterprise.inject.Vetoed;
 
 import org.jboss.forge.ui.UICompleter;
 import org.jboss.forge.ui.UIInput;
 import org.jboss.forge.ui.UIInputMany;
+import org.jboss.forge.ui.util.Callables;
 
 /**
  * Implementation of a {@link UIInput} object
@@ -21,10 +24,13 @@
  * @param <VALUETYPE>
  */
 @Vetoed
-public class UIInputManyImpl<VALUETYPE> extends UIInputComponentBase<UIInputMany<VALUETYPE>, Iterable<VALUETYPE>>
+public class UIInputManyImpl<VALUETYPE> extends UIInputComponentBase<UIInputMany<VALUETYPE>, VALUETYPE>
          implements UIInputMany<VALUETYPE>
 {
-   public UIInputManyImpl(String name, Class<?> type)
+   private Iterable<VALUETYPE> value;
+   private Callable<Iterable<VALUETYPE>> defaultValue;
+
+   public UIInputManyImpl(String name, Class<VALUETYPE> type)
    {
       super(name, type);
    }
@@ -44,4 +50,32 @@ public UIInputMany<VALUETYPE> setCompleter(UICompleter<VALUETYPE> completer)
       this.completer = completer;
       return this;
    }
+
+   @Override
+   public UIInputMany<VALUETYPE> setValue(Iterable<VALUETYPE> value)
+   {
+      this.value = value;
+      return this;
+   }
+
+   @Override
+   public UIInputMany<VALUETYPE> setDefaultValue(Callable<Iterable<VALUETYPE>> callback)
+   {
+      this.defaultValue = callback;
+      return this;
+   }
+
+   @Override
+   public UIInputMany<VALUETYPE> setDefaultValue(Iterable<VALUETYPE> value)
+   {
+      this.defaultValue = Callables.returning(value);
+      return this;
+   }
+
+   @Override
+   public Iterable<VALUETYPE> getValue()
+   {
+      return (value == null) ? Callables.call(defaultValue) : value;
+   }
+
 }