Fixed compilation errors in refactoring

forge · Feb 5, 2013 · 59272ff · 59272ff
1 parent 9738c04
commit 59272ff
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/aesh/src/main/java/org/jboss/forge/aesh/ShellContext.java b/aesh/src/main/java/org/jboss/forge/aesh/ShellContext.java
@@ -9,6 +9,7 @@
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UIContext;
 import org.jboss.forge.ui.UIInput;
+import org.jboss.forge.ui.UIInputComponent;
 import org.jboss.forge.ui.UISelection;
 import org.jboss.forge.ui.UIValidationContext;
 
@@ -22,7 +23,7 @@ public class ShellContext implements UIValidationContext, UIContext, UIBuilder
 {
 
    private boolean standalone = false;
-   private List<UIInput<?>> inputs = new ArrayList<UIInput<?>>();
+   private List<UIInputComponent<?, ?>> inputs = new ArrayList<UIInputComponent<?, ?>>();
 
    public ShellContext()
    {
@@ -39,20 +40,20 @@ public void setStandalone(boolean standalone)
    }
 
    @Override
-   public UIBuilder add(UIInput<?> input)
+   public UIBuilder add(UIInputComponent<?, ?> input)
    {
       inputs.add(input);
       return this;
    }
 
-   public List<UIInput<?>> getInputs()
+   public List<UIInputComponent<?, ?>> getInputs()
    {
       return inputs;
    }
 
-   public UIInput<?> findInput(String name)
+   public UIInputComponent<?, ?> findInput(String name)
    {
-      for (UIInput<?> input : inputs)
+      for (UIInputComponent<?, ?> input : inputs)
       {
          if (input.getName().equals(name))
             return input;
@@ -61,7 +62,7 @@ public UIInput<?> findInput(String name)
    }
 
    @Override
-   public void addValidationError(UIInput<?> input, String errorMessage)
+   public void addValidationError(UIInputComponent<?, ?> input, String errorMessage)
    {
       // TODO: ignoring errorMessage for now
       inputs.add(input);

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/util/CommandLineUtil.java b/aesh/src/main/java/org/jboss/forge/aesh/util/CommandLineUtil.java
@@ -14,6 +14,7 @@
 import org.jboss.forge.aesh.ShellContext;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UIInput;
+import org.jboss.forge.ui.UIInputComponent;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>
@@ -26,7 +27,7 @@ public static CommandLineParser generateParser(UICommand command, ShellContext c
 
                ParameterInt parameter =
                 new ParameterInt(command.getMetadata().getName(), command.getMetadata().getDescription());
-        for(UIInput<?> input : context.getInputs()) {
+        for(UIInputComponent<?, ?> input : context.getInputs()) {
             if(input.getValueType() == Boolean.class) {
                 parameter.addOption(
                         new OptionBuilder().name(input.getName().charAt(0)).
@@ -43,7 +44,7 @@ public static CommandLineParser generateParser(UICommand command, ShellContext c
     }
 
     public static void populateUIInputs(CommandLine commandLine, ShellContext context) {
-        for(UIInput<?> input : context.getInputs()) {
+        for(UIInputComponent<?, ?> input : context.getInputs()) {
             //String value;
             //if((value = commandLine.getOptionValue(input.getName())) != null)
             if(commandLine.hasOption(input.getName())) {
@@ -63,7 +64,7 @@ public static void populateUIInputs(CommandLine commandLine, ShellContext contex
     }
 
     @SuppressWarnings({ "unchecked" })
-    private static void setInputValue(UIInput<?> input, String value) {
+    private static void setInputValue(UIInputComponent<?, ?> input, String value) {
 
         if(input.getValueType() == String.class) {
             ((UIInput<String>) input).setValue(value);

diff --git a/projects/tests/src/test/java/org/jboss/forge/projects/impl/NewProjectCommandTest.java b/projects/tests/src/test/java/org/jboss/forge/projects/impl/NewProjectCommandTest.java
@@ -22,7 +22,7 @@
 import org.jboss.forge.resource.DirectoryResource;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
+import org.jboss.forge.ui.UIInputComponent;
 import org.jboss.forge.ui.UISelection;
 import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -65,12 +65,12 @@ public void testInjectionNotNull()
    @Test
    public void testInvokeCommand() throws Exception
    {
-      final List<UIInput<?>> inputs = new ArrayList<UIInput<?>>();
+      final List<UIInputComponent<?, ?>> inputs = new ArrayList<UIInputComponent<?, ?>>();
 
       final UIBuilder builder = new UIBuilder()
       {
          @Override
-         public UIBuilder add(UIInput<?> input)
+         public UIBuilder add(UIInputComponent<?, ?> input)
          {
             inputs.add(input);
             return this;
@@ -104,7 +104,7 @@ public UIBuilder getUIBuilder()
          }
 
          @Override
-         public void addValidationError(UIInput<?> input, String errorMessage)
+         public void addValidationError(UIInputComponent<?, ?> input, String errorMessage)
          {
          }
 

diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UIValidationContext.java b/ui/api/src/main/java/org/jboss/forge/ui/UIValidationContext.java
@@ -9,5 +9,5 @@
 
 public interface UIValidationContext extends UIContext
 {
-   public void addValidationError(UIInput<?> input, String errorMessage);
+   public void addValidationError(UIInputComponent<?, ?> input, String errorMessage);
 }