The registry used by addons should be the registry they were created for

forge · Jul 11, 2013 · b320d3d · b320d3d
1 parent 4f29196
commit b320d3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/container-api/src/main/java/org/jboss/forge/furnace/util/WeightedComparator.java b/container-api/src/main/java/org/jboss/forge/furnace/util/WeightedComparator.java
@@ -14,13 +14,9 @@
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * 
  */
-public class WeightedComparator implements Comparator<Weighted>
+public enum WeightedComparator implements Comparator<Weighted>
 {
-   public static final Comparator<Weighted> INSTANCE = new WeightedComparator();
-
-   private WeightedComparator()
-   {
-   }
+   INSTANCE;
 
    @Override
    public int compare(final Weighted left, final Weighted right)
@@ -29,7 +25,9 @@ public int compare(final Weighted left, final Weighted right)
       {
          return 0;
       }
-      return ((Integer) left.priority()).compareTo(right.priority());
+      int thisVal = left.priority();
+      int anotherVal = right.priority();
+      return (thisVal < anotherVal ? -1 : (thisVal == anotherVal ? 0 : 1));
    }
 
 }
diff --git a/container/src/main/java/org/jboss/forge/furnace/addons/AddonRunnable.java b/container/src/main/java/org/jboss/forge/furnace/addons/AddonRunnable.java
@@ -6,6 +6,7 @@
  */
 package org.jboss.forge.furnace.addons;
 
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,6 +28,7 @@
 import org.jboss.forge.furnace.modules.ModularURLScanner;
 import org.jboss.forge.furnace.modules.ModularWeld;
 import org.jboss.forge.furnace.modules.ModuleScanResult;
+import org.jboss.forge.furnace.repositories.AddonRepository;
 import org.jboss.forge.furnace.services.ServiceRegistry;
 import org.jboss.forge.furnace.util.Addons;
 import org.jboss.forge.furnace.util.Assert;
@@ -185,7 +187,7 @@ public Object call() throws Exception
 
                AddonRegistryProducer addonRegistryProducer = BeanManagerUtils.getContextualInstance(manager,
                         AddonRegistryProducer.class);
-               addonRegistryProducer.setRegistry(furnace.getAddonRegistry());
+               addonRegistryProducer.setRegistry(furnace.getAddonRegistry(getRepositories()));
 
                ContainerServiceExtension extension = BeanManagerUtils.getContextualInstance(manager,
                         ContainerServiceExtension.class);
@@ -264,6 +266,12 @@ public int hashCode()
       return result;
    }
 
+   public AddonRepository[] getRepositories()
+   {
+      Set<AddonRepository> repositories = stateManager.getViewsOf(addon).iterator().next().getRepositories();
+      return repositories.toArray(new AddonRepository[] {});
+   }
+
    @Override
    public boolean equals(Object obj)
    {