Fix project factory failures and exception on tab completion

lincolnthree · Apr 25, 2012 · 4fad58f · 4fad58f
1 parent 19c3105
commit 4fad58f
Show file tree

Hide file tree

Showing 4 changed files with 266 additions and 259 deletions.
diff --git a/project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java b/project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java
@@ -26,7 +26,6 @@
 import org.jboss.forge.project.locator.ProjectLocator;
 import org.jboss.forge.project.services.ProjectFactory;
 import org.jboss.forge.resources.DirectoryResource;
-import org.jboss.forge.shell.plugins.Alias;
 
 import com.google.inject.Inject;
 
@@ -35,23 +34,28 @@
  */
 public class DefaultProjectLocator implements ProjectLocator
 {
-   @Inject
-   private ProjectFactory factory;
+    private ProjectFactory factory;
 
-   @Override
-   public Project createProject(final DirectoryResource dir)
-   {
-      Project result = null;
-      if ((dir != null) && dir.exists())
-      {
-         result = new ProjectImpl(factory, dir);
-      }
-      return result;
-   }
+    @Inject
+    public DefaultProjectLocator(final ProjectFactory factory)
+    {
+        this.factory = factory;
+    }
 
-   @Override
-   public boolean containsProject(final DirectoryResource dir)
-   {
-      return false;
-   }
+    @Override
+    public Project createProject(final DirectoryResource dir)
+    {
+        Project result = null;
+        if ((dir != null) && dir.exists())
+        {
+            result = new ProjectImpl(factory, dir);
+        }
+        return result;
+    }
+
+    @Override
+    public boolean containsProject(final DirectoryResource dir)
+    {
+        return false;
+    }
 }
diff --git a/shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java b/shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java
@@ -28,7 +28,6 @@
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
 import org.jboss.forge.bus.util.Annotations;

diff --git a/shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java b/shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java
@@ -21,17 +21,15 @@
  */
 package org.jboss.forge.project.services;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import org.jboss.forge.project.Facet;
 import org.jboss.forge.project.Project;
@@ -46,7 +44,7 @@
  * 
  * @author <a href="mailto:[email protected]">Lincoln Baxter, III</a>
  */
-@Dependent
+@Singleton
 public class ProjectFactory
 {
     private final FacetFactory facetFactory;
@@ -65,14 +63,17 @@ public ProjectFactory(final FacetFactory facetFactory, final BeanManager manager
 
     public void init()
     {
-        Iterator<ProjectLocator> iterator = locatorInstance.iterator();
-        List<ProjectLocator> result = new ArrayList<ProjectLocator>();
-        while (iterator.hasNext())
+        if (locators == null || locators.isEmpty())
         {
-            ProjectLocator element = BeanManagerUtils.getContextualInstance(manager, iterator.next().getClass());
-            result.add(element);
+            Iterator<ProjectLocator> iterator = locatorInstance.iterator();
+            List<ProjectLocator> result = new ArrayList<ProjectLocator>();
+            while (iterator.hasNext())
+            {
+                ProjectLocator element = BeanManagerUtils.getContextualInstance(manager, iterator.next().getClass());
+                result.add(element);
+            }
+            this.locators = result;
         }
-        this.locators = result;
     }
 
     public DirectoryResource findProjectRootRecusively(final DirectoryResource currentDirectory)