FORGE-2041: Fixed UIInputMany prompt display

forge · Nov 11, 2014 · c1196d1 · c1196d1
1 parent e1bc461
commit c1196d1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/ui/ShellUIPromptImpl.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/ui/ShellUIPromptImpl.java
@@ -116,7 +116,7 @@ public Object promptValueFrom(InputComponent<?, ?> input) throws InterruptedExce
          else
          {
             // UIInput
-            value = promptInputComponent(input);
+            value = promptInputComponent(input, input.getValue());
          }
       }
       else if (input instanceof ManyValued)
@@ -139,7 +139,7 @@ else if (input instanceof ManyValued)
             else
             {
                // UIInputMany
-               promptValue = promptInputComponent(input);
+               promptValue = promptInputComponent(input, inputValues);
             }
             if (promptValue != null)
             {
@@ -204,18 +204,22 @@ private boolean promptBooleanInternal(String message, boolean defaultValue) thro
       }
    }
 
-   private Object promptInputComponent(InputComponent<?, ?> input) throws InterruptedException
+   private Object promptInputComponent(InputComponent<?, ?> input, Object componentValue) throws InterruptedException
    {
       Object value;
       String label = InputComponents.getLabelFor(input, false);
       String description = input.getDescription();
-      Object componentValue = InputComponents.getValueFor(input);
       if (!Strings.isNullOrEmpty(description))
       {
          description = " (" + description + ")";
       }
       String defaultValueDescription;
-      if (componentValue != null)
+      System.out.println();
+      if (componentValue instanceof Collection)
+      {
+         defaultValueDescription = " " + componentValue.toString();
+      }
+      else if (componentValue != null)
       {
          defaultValueDescription = " [" + componentValue + "]";
       }