Compilation fixes from bad merge

forge · Nov 30, 2012 · ec5d312 · ec5d312
1 parent 096afc9
commit ec5d312
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/addon-manager/src/main/java/org/jboss/forge/addon/manager/InstallRequest.java b/addon-manager/src/main/java/org/jboss/forge/addon/manager/InstallRequest.java
@@ -29,25 +29,25 @@
 /**
  * When an addon is installed, another addons could be required. This object returns the necessary information for the
  * installation of an addon to succeed, like required addons and dependencies
- *
+ * 
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
- *
+ * 
  */
 public class InstallRequest
 {
    private AddonRepository repository;
    private DependencyResolver dependencyResolver;
 
-   private AddonEntry requestedAddonEntry;
+   private AddonId requestedAddonId;
    private DependencyNode requestedAddonNode;
    private Stack<DependencyNode> requiredAddons = new Stack<DependencyNode>();
    private Stack<DependencyNode> optionalAddons = new Stack<DependencyNode>();
 
-   public InstallRequest(AddonRepository repository, DependencyResolver resolver, AddonEntry requestedAddonEntry)
+   public InstallRequest(AddonRepository repository, DependencyResolver resolver, AddonId requestedAddonEntry)
    {
       this.repository = repository;
       this.dependencyResolver = resolver;
-      this.requestedAddonEntry = requestedAddonEntry;
+      this.requestedAddonId = requestedAddonEntry;
 
       String coordinates = requestedAddonEntry.getName() + ":jar:forge-addon:" + requestedAddonEntry.getVersion();
       this.requestedAddonNode = resolver.resolveDependencyHierarchy(DependencyQueryBuilder.create(coordinates));
@@ -109,9 +109,8 @@ public void perform()
          deploy(addonEntry, requiredAddon);
       }
 
-      AddonId requestedAddonEntry = toAddonEntry(requestedAddon);
-      entries.add(requestedAddonEntry);
-      deploy(requestedAddonEntry, requestedAddonNode);
+      entries.add(requestedAddonId);
+      deploy(requestedAddonId, requestedAddonNode);
 
       enable(entries);
    }

diff --git a/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java b/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java
@@ -13,16 +13,16 @@
 import org.jboss.forge.addon.dependency.spi.DependencyResolver;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.InstallRequest;
-import org.jboss.forge.container.AddonEntry;
+import org.jboss.forge.container.AddonId;
 import org.jboss.forge.container.Forge;
 
 /**
  * A class with a main method to bootstrap Forge.
- *
+ * 
  * You can deploy addons by calling {@link Bootstrap#deploy(String)}
- *
+ * 
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
- *
+ * 
  */
 public class Bootstrap
 {
@@ -49,7 +49,7 @@ public void start()
 
    public void deploy(String addonCoordinates)
    {
-      AddonEntry addon = AddonEntry.fromCoordinates(addonCoordinates);
+      AddonId addon = AddonId.fromCoordinates(addonCoordinates);
       DependencyResolver dependencyResolver = lookup(DependencyResolver.class);
       AddonManager addonManager = new AddonManager(forge.getRepository(), dependencyResolver);
       InstallRequest request = addonManager.install(addon);