Move Callables to Container API

forge · Mar 22, 2013 · 3ff72c9 · 3ff72c9
1 parent 2d808c6
commit 3ff72c9
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/...va/org/jboss/forge/ui/util/Callables.java → ...jboss/forge/container/util/Callables.java b/...va/org/jboss/forge/ui/util/Callables.java → ...jboss/forge/container/util/Callables.java
@@ -5,16 +5,16 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.ui.util;
+package org.jboss.forge.container.util;
 
 import java.util.concurrent.Callable;
 
 /**
  * Utility to create and handle {@link Callable} objects
  * 
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-
 public final class Callables
 {
    private Callables()

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
@@ -11,12 +11,12 @@
 
 import javax.enterprise.inject.Vetoed;
 
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.convert.Converter;
 import org.jboss.forge.facets.BaseFaceted;
 import org.jboss.forge.ui.facets.HintsFacet;
 import org.jboss.forge.ui.input.InputComponent;
 import org.jboss.forge.ui.input.UIInput;
-import org.jboss.forge.ui.util.Callables;
 
 /**
  * Implementation of a {@link UIInput} object

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
@@ -11,10 +11,10 @@
 
 import javax.enterprise.inject.Vetoed;
 
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.convert.Converter;
 import org.jboss.forge.ui.input.UICompleter;
 import org.jboss.forge.ui.input.UIInput;
-import org.jboss.forge.ui.util.Callables;
 
 /**
  * Implementation of a {@link UIInput} object

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
@@ -11,11 +11,11 @@
 
 import javax.enterprise.inject.Vetoed;
 
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.convert.Converter;
 import org.jboss.forge.ui.input.UICompleter;
 import org.jboss.forge.ui.input.UIInput;
 import org.jboss.forge.ui.input.UIInputMany;
-import org.jboss.forge.ui.util.Callables;
 
 /**
  * Implementation of a {@link UIInput} object

diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/UISelectManyImpl.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/UISelectManyImpl.java
@@ -8,8 +8,8 @@
 
 import java.util.concurrent.Callable;
 
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.ui.input.UISelectMany;
-import org.jboss.forge.ui.util.Callables;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/UISelectOneImpl.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/UISelectOneImpl.java
@@ -8,8 +8,8 @@
 
 import java.util.concurrent.Callable;
 
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.ui.input.UISelectOne;
-import org.jboss.forge.ui.util.Callables;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionDispirateTypesTest.java b/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionDispirateTypesTest.java
@@ -16,8 +16,8 @@
 import org.jboss.forge.arquillian.archive.ForgeArchive;
 import org.jboss.forge.container.addons.AddonId;
 import org.jboss.forge.container.repositories.AddonDependencyEntry;
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.ui.input.UIInput;
-import org.jboss.forge.ui.util.Callables;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java b/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java
@@ -19,6 +19,7 @@
 import org.jboss.forge.arquillian.archive.ForgeArchive;
 import org.jboss.forge.container.addons.AddonId;
 import org.jboss.forge.container.repositories.AddonDependencyEntry;
+import org.jboss.forge.container.util.Callables;
 import org.jboss.forge.convert.Converter;
 import org.jboss.forge.ui.facets.HintsFacet;
 import org.jboss.forge.ui.hints.InputType;
@@ -29,7 +30,6 @@
 import org.jboss.forge.ui.input.UIInputMany;
 import org.jboss.forge.ui.input.UISelectMany;
 import org.jboss.forge.ui.input.UISelectOne;
-import org.jboss.forge.ui.util.Callables;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
 import org.junit.Test;