Refactoring UI packages

forge · Feb 19, 2013 · fcffa52 · fcffa52
1 parent 9ace93c
commit fcffa52
Show file tree

Hide file tree

Showing 48 changed files with 161 additions and 123 deletions.
diff --git a/...-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonCommand.java b/...-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonCommand.java
@@ -6,10 +6,10 @@
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInput;
 
 @Vetoed
 public abstract class AddonCommand implements UICommand, AddonCommandConstants

diff --git a/...r/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonInstallCommand.java b/...r/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonInstallCommand.java
@@ -5,9 +5,9 @@
 
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.container.AddonId;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
-import org.jboss.forge.ui.UIContext;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 @Singleton
 public class AddonInstallCommand extends AddonCommand

diff --git a/...er/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonRemoveCommand.java b/...er/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonRemoveCommand.java
@@ -5,9 +5,9 @@
 
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.container.Forge;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
-import org.jboss.forge.ui.UIContext;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 @Vetoed
 public class AddonRemoveCommand extends AddonCommand

diff --git a/...impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonRemoveCommandNew.java b/...impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonRemoveCommandNew.java
@@ -7,15 +7,15 @@
 
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.container.Forge;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UISelectMany;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UISelectMany;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 @Singleton
 public class AddonRemoveCommandNew implements UICommand, AddonCommandConstants

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/ShellCommand.java b/aesh/src/main/java/org/jboss/forge/aesh/ShellCommand.java
@@ -21,6 +21,10 @@
 import org.jboss.aesh.util.FileLister;
 import org.jboss.forge.aesh.util.CommandLineUtil;
 import org.jboss.forge.ui.*;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.input.UIInputComponent;
+import org.jboss.forge.ui.input.UIInputMany;
+import org.jboss.forge.ui.result.Result;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/ShellContext.java b/aesh/src/main/java/org/jboss/forge/aesh/ShellContext.java
@@ -11,10 +11,10 @@
 import java.util.List;
 
 import org.jboss.forge.ui.UIBuilder;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInputComponent;
-import org.jboss.forge.ui.UISelection;
-import org.jboss.forge.ui.UIValidationContext;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInputComponent;
+import org.jboss.forge.ui.input.UISelection;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/commands/BaseExitCommand.java b/aesh/src/main/java/org/jboss/forge/aesh/commands/BaseExitCommand.java
@@ -10,14 +10,14 @@
 
 import org.jboss.forge.aesh.ForgeShell;
 import org.jboss.forge.aesh.ShellContext;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/commands/ClearCommand.java b/aesh/src/main/java/org/jboss/forge/aesh/commands/ClearCommand.java
@@ -10,15 +10,15 @@
 
 import org.jboss.aesh.console.Console;
 import org.jboss.forge.aesh.ShellContext;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/commands/ListServicesCommand.java b/aesh/src/main/java/org/jboss/forge/aesh/commands/ListServicesCommand.java
@@ -17,14 +17,14 @@
 
 import org.jboss.forge.container.Addon;
 import org.jboss.forge.container.AddonRegistry;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

diff --git a/aesh/src/main/java/org/jboss/forge/aesh/commands/LsCommand.java b/aesh/src/main/java/org/jboss/forge/aesh/commands/LsCommand.java
@@ -9,18 +9,18 @@
 
 import org.jboss.aesh.util.Parser;
 import org.jboss.forge.aesh.ShellContext;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
 import org.jboss.forge.ui.UICompleter;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UIInputComponent;
-import org.jboss.forge.ui.UIInputMany;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.input.UIInputComponent;
+import org.jboss.forge.ui.input.UIInputMany;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

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
@@ -16,9 +16,9 @@
 import org.jboss.forge.convert.Converter;
 import org.jboss.forge.convert.ConverterFactory;
 import org.jboss.forge.ui.UICommand;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UIInputComponent;
-import org.jboss.forge.ui.UIInputMany;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.input.UIInputComponent;
+import org.jboss.forge.ui.input.UIInputMany;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/aesh/src/test/java/org/jboss/forge/aesh/FooCommand.java b/aesh/src/test/java/org/jboss/forge/aesh/FooCommand.java
@@ -12,17 +12,17 @@
 import javax.inject.Inject;
 
 import org.jboss.forge.container.services.Exported;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
 import org.jboss.forge.ui.UICompleter;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UIInputComponent;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.input.UIInputComponent;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 
 /**
  * @author <a href="mailto:stale.pedersen@jboss.org">Ståle W. Pedersen</a>

diff --git a/aesh/src/test/java/org/jboss/forge/aesh/util/CommandLineUtilTest.java b/aesh/src/test/java/org/jboss/forge/aesh/util/CommandLineUtilTest.java
@@ -14,15 +14,15 @@
 import org.jboss.aesh.cl.OptionBuilder;
 import org.jboss.aesh.cl.internal.ParameterInt;
 import org.jboss.forge.aesh.ShellContext;
-import org.jboss.forge.ui.Result;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
 import org.jboss.forge.ui.impl.UIInputImpl;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.result.Result;
 import org.junit.Ignore;
 import org.junit.Test;
 

diff --git a/projects/impl/src/main/java/org/jboss/forge/projects/impl/NewProjectCommand.java b/projects/impl/src/main/java/org/jboss/forge/projects/impl/NewProjectCommand.java
@@ -10,16 +10,16 @@
 import org.jboss.forge.resource.FileResource;
 import org.jboss.forge.resource.Resource;
 import org.jboss.forge.resource.ResourceFactory;
-import org.jboss.forge.ui.Result;
-import org.jboss.forge.ui.Results;
 import org.jboss.forge.ui.UIBuilder;
 import org.jboss.forge.ui.UICommand;
 import org.jboss.forge.ui.UICommandMetadata;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInput;
-import org.jboss.forge.ui.UISelection;
-import org.jboss.forge.ui.UIValidationContext;
 import org.jboss.forge.ui.base.UICommandMetadataBase;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.input.UISelection;
+import org.jboss.forge.ui.result.Result;
+import org.jboss.forge.ui.result.Results;
 import org.jboss.forge.ui.util.Categories;
 
 public class NewProjectCommand implements UICommand

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
@@ -21,10 +21,10 @@
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.resource.DirectoryResource;
 import org.jboss.forge.ui.UIBuilder;
-import org.jboss.forge.ui.UIContext;
-import org.jboss.forge.ui.UIInputComponent;
-import org.jboss.forge.ui.UISelection;
-import org.jboss.forge.ui.UIValidationContext;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.input.UIInputComponent;
+import org.jboss.forge.ui.input.UISelection;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;

diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UIBuilder.java b/ui/api/src/main/java/org/jboss/forge/ui/UIBuilder.java
@@ -7,6 +7,9 @@
 
 package org.jboss.forge.ui;
 
+import org.jboss.forge.ui.context.UIContextProvider;
+import org.jboss.forge.ui.input.UIInputComponent;
+
 /**
  * Allows {@link UICommand} objects to specify the order of the displayed fields
  *

diff --git a/ui/api/src/main/java/org/jboss/forge/ui/UICommand.java b/ui/api/src/main/java/org/jboss/forge/ui/UICommand.java
@@ -8,6 +8,9 @@
 package org.jboss.forge.ui;
 
 import org.jboss.forge.container.services.Exported;
+import org.jboss.forge.ui.context.UIContext;
+import org.jboss.forge.ui.context.UIValidationContext;
+import org.jboss.forge.ui.result.Result;
 
 @Exported
 public interface UICommand

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
@@ -6,6 +6,9 @@
  */
 package org.jboss.forge.ui;
 
+import org.jboss.forge.ui.input.UIInput;
+import org.jboss.forge.ui.input.UIInputComponent;
+
 /**
  * @param VALUETYPE The value type to be provided by completion.
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/...in/java/org/jboss/forge/ui/UIContext.java → ...org/jboss/forge/ui/context/UIContext.java b/...in/java/org/jboss/forge/ui/UIContext.java → ...org/jboss/forge/ui/context/UIContext.java
@@ -5,7 +5,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.context;
+
+import org.jboss.forge.ui.input.UISelection;
 
 public interface UIContext
 {

diff --git a/...org/jboss/forge/ui/UIContextProvider.java → ...s/forge/ui/context/UIContextProvider.java b/...org/jboss/forge/ui/UIContextProvider.java → ...s/forge/ui/context/UIContextProvider.java
@@ -5,7 +5,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.context;
+
 
 /**
  * Provides a {@link UIContext} object

diff --git a/...g/jboss/forge/ui/UIValidationContext.java → ...forge/ui/context/UIValidationContext.java b/...g/jboss/forge/ui/UIValidationContext.java → ...forge/ui/context/UIValidationContext.java
@@ -5,7 +5,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.context;
+
+import org.jboss.forge.ui.input.UIInputComponent;
 
 public interface UIValidationContext extends UIContextProvider
 {

diff --git a/ui/api/src/main/java/org/jboss/forge/ui/facets/HintsFacet.java b/ui/api/src/main/java/org/jboss/forge/ui/facets/HintsFacet.java
@@ -8,8 +8,8 @@
 package org.jboss.forge.ui.facets;
 
 import org.jboss.forge.facets.Facet;
-import org.jboss.forge.ui.UIInputComponent;
 import org.jboss.forge.ui.hints.InputType;
+import org.jboss.forge.ui.input.UIInputComponent;
 
 /**
  * Hints facet

diff --git a/...main/java/org/jboss/forge/ui/UIInput.java → ...ava/org/jboss/forge/ui/input/UIInput.java b/...main/java/org/jboss/forge/ui/UIInput.java → ...ava/org/jboss/forge/ui/input/UIInput.java
@@ -5,10 +5,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.input;
 
 import java.util.concurrent.Callable;
 
+import org.jboss.forge.ui.UICompleter;
+
 public interface UIInput<VALUETYPE> extends UIInputComponent<UIInput<VALUETYPE>, VALUETYPE>
 {
    UICompleter<VALUETYPE> getCompleter();

diff --git a/.../org/jboss/forge/ui/UIInputComponent.java → ...boss/forge/ui/input/UIInputComponent.java b/.../org/jboss/forge/ui/UIInputComponent.java → ...boss/forge/ui/input/UIInputComponent.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.input;
 
 import java.util.concurrent.Callable;
 

diff --git a/.../java/org/jboss/forge/ui/UIInputMany.java → ...org/jboss/forge/ui/input/UIInputMany.java b/.../java/org/jboss/forge/ui/UIInputMany.java → ...org/jboss/forge/ui/input/UIInputMany.java
@@ -5,10 +5,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.input;
 
 import java.util.concurrent.Callable;
 
+import org.jboss.forge.ui.UICompleter;
+
 public interface UIInputMany<VALUETYPE> extends UIInputComponent<UIInputMany<VALUETYPE>, VALUETYPE>
 {
    UICompleter<VALUETYPE> getCompleter();

diff --git a/...java/org/jboss/forge/ui/UISelectMany.java → ...rg/jboss/forge/ui/input/UISelectMany.java b/...java/org/jboss/forge/ui/UISelectMany.java → ...rg/jboss/forge/ui/input/UISelectMany.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.input;
 
 import java.util.concurrent.Callable;
 

diff --git a/.../java/org/jboss/forge/ui/UISelectOne.java → ...org/jboss/forge/ui/input/UISelectOne.java b/.../java/org/jboss/forge/ui/UISelectOne.java → ...org/jboss/forge/ui/input/UISelectOne.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.ui;
+package org.jboss.forge.ui.input;
 
 import java.util.concurrent.Callable;