UICompleter.getCompletion should return Iterable<VALUE_TYPE> instead …

…of Iterable<String>
forge · Aug 22, 2013 · c298d8c · c298d8c
1 parent 0e5b2d4
commit c298d8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.../main/java/org/jboss/forge/addon/shell/aesh/completion/UICompleterCompletionStrategy.java b/.../main/java/org/jboss/forge/addon/shell/aesh/completion/UICompleterCompletionStrategy.java
@@ -30,9 +30,12 @@ public void complete(CompleteOperation completeOperation, InputComponent<?, Obje
       UICompleter<Object> completer = InputComponents.getCompleterFor(input);
       if (completer != null)
       {
-         for (String proposal : completer.getCompletionProposals(context, input, typedValue))
+         for (Object proposal : completer.getCompletionProposals(context, input, typedValue))
          {
-            completeOperation.addCompletionCandidate(proposal);
+            if (proposal != null)
+            {
+               completeOperation.addCompletionCandidate(proposal.toString());
+            }
          }
       }
       else

diff --git a/ui/api/src/main/java/org/jboss/forge/addon/ui/input/UICompleter.java b/ui/api/src/main/java/org/jboss/forge/addon/ui/input/UICompleter.java
@@ -25,5 +25,5 @@ public interface UICompleter<VALUETYPE>
     * @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(UIContext context, InputComponent<?, VALUETYPE> input, String value);
+   Iterable<VALUETYPE> getCompletionProposals(UIContext context, InputComponent<?, VALUETYPE> input, String value);
 }