Minor cleanups

forge · Mar 19, 2014 · b75215a · b75215a
1 parent 320034c
commit b75215a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 61 deletions.
diff --git a/...rc/main/java/org/jboss/forge/addon/manager/impl/commands/AddonBuildAndInstallCommand.java b/...rc/main/java/org/jboss/forge/addon/manager/impl/commands/AddonBuildAndInstallCommand.java
@@ -5,16 +5,15 @@
 import org.jboss.forge.addon.dependencies.Coordinate;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
+import org.jboss.forge.addon.projects.Projects;
 import org.jboss.forge.addon.projects.building.BuildException;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.projects.facets.PackagingFacet;
 import org.jboss.forge.addon.resource.DirectoryResource;
-import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
-import org.jboss.forge.addon.ui.context.UISelection;
 import org.jboss.forge.addon.ui.input.UIInput;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.Result;
@@ -48,21 +47,16 @@ public class AddonBuildAndInstallCommand extends AbstractUICommand implements Ad
    public Metadata getMetadata(UIContext context)
    {
       boolean gui = context.getProvider().isGUI();
-      return Metadata.from(super.getMetadata(context), getClass()).name(gui ? ADDON_BUILD_INSTALL_COMMAND_NAME : ADDON_BUILD_INSTALL_COMMAND_NAME_NO_GUI)
+      return Metadata.from(super.getMetadata(context), getClass())
+               .name(gui ? ADDON_BUILD_INSTALL_COMMAND_NAME : ADDON_BUILD_INSTALL_COMMAND_NAME_NO_GUI)
                .description(ADDON_BUILD_INSTALL_COMMAND_DESCRIPTION)
                .category(Categories.create(ADDON_MANAGER_CATEGORIES));
    }
 
-   @Override
-   public boolean isEnabled(UIContext context)
-   {
-      return true;
-   }
-
    @Override
    public void initializeUI(UIBuilder builder) throws Exception
    {
-      Project project = getSelectedProject(builder.getUIContext());
+      Project project = Projects.getSelectedProject(projectFactory, builder.getUIContext());
       if (project != null)
       {
          projectRoot.setDefaultValue(project.getRootDirectory());
@@ -74,7 +68,8 @@ public void initializeUI(UIBuilder builder) throws Exception
    public Result execute(UIExecutionContext context)
    {
       Project project = projectFactory.findProject(projectRoot.getValue());
-      if(project == null) {
+      if (project == null)
+      {
          return Results.fail("No project found in root " + projectRoot.getValue().getFullyQualifiedName());
       }
       Coordinate coordinate = project.getFacet(MetadataFacet.class).getOutputDependency().getCoordinate();
@@ -103,18 +98,4 @@ public Result execute(UIExecutionContext context)
          return Results.fail("Addon " + coordinate.toString() + " could not be installed.", t);
       }
    }
-
-   /**
-    * Returns the selected project. null if no project is found
-    */
-   protected Project getSelectedProject(UIContext context)
-   {
-      Project project = null;
-      UISelection<FileResource<?>> initialSelection = context.getInitialSelection();
-      if (!initialSelection.isEmpty())
-      {
-         project = projectFactory.findProject(initialSelection.get());
-      }
-      return project;
-   }
 }
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
@@ -7,13 +7,12 @@
 
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
+import org.jboss.forge.addon.projects.Projects;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
-import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
-import org.jboss.forge.addon.ui.context.UISelection;
 import org.jboss.forge.addon.ui.input.InputComponent;
 import org.jboss.forge.addon.ui.input.UICompleter;
 import org.jboss.forge.addon.ui.input.UIInput;
@@ -50,15 +49,16 @@ public class AddonInstallCommand extends AbstractUICommand implements AddonComma
    public Metadata getMetadata(UIContext context)
    {
       boolean gui = context.getProvider().isGUI();
-      return Metadata.from(super.getMetadata(context), getClass()).name(gui ? ADDON_INSTALL_COMMAND_NAME : ADDON_INSTALL_COMMAND_NAME_NO_GUI)
+      return Metadata.from(super.getMetadata(context), getClass())
+               .name(gui ? ADDON_INSTALL_COMMAND_NAME : ADDON_INSTALL_COMMAND_NAME_NO_GUI)
                .description(ADDON_INSTALL_COMMAND_DESCRIPTION)
                .category(Categories.create(ADDON_MANAGER_CATEGORIES));
    }
 
    @Override
    public void initializeUI(UIBuilder builder) throws Exception
    {
-      Project project = getSelectedProject(builder.getUIContext());
+      Project project = Projects.getSelectedProject(projectFactory, builder.getUIContext());
       final String topLevelPackage;
       if (project != null)
       {
@@ -106,18 +106,4 @@ protected String getCoordinates()
    {
       return groupId.getValue() + ':' + name.getValue() + ',' + version.getValue();
    }
-
-   /**
-    * Returns the selected project. null if no project is found
-    */
-   protected Project getSelectedProject(UIContext context)
-   {
-      Project project = null;
-      UISelection<FileResource<?>> initialSelection = context.getInitialSelection();
-      if (!initialSelection.isEmpty())
-      {
-         project = projectFactory.findProject(initialSelection.get());
-      }
-      return project;
-   }
 }
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
@@ -9,13 +9,12 @@
 
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
+import org.jboss.forge.addon.projects.Projects;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
-import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
-import org.jboss.forge.addon.ui.context.UISelection;
 import org.jboss.forge.addon.ui.input.UISelectMany;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.Result;
@@ -69,7 +68,7 @@ public void initializeUI(UIBuilder builder) throws Exception
          }
       }
       addons.setValueChoices(choices);
-      Project project = getSelectedProject(builder.getUIContext());
+      Project project = Projects.getSelectedProject(projectFactory, builder.getUIContext());
       if (project != null)
       {
          MetadataFacet facet = project.getFacet(MetadataFacet.class);
@@ -102,19 +101,4 @@ public Result execute(UIExecutionContext context) throws Exception
       }
       return Results.success("Removed addons: " + builder.toString());
    }
-
-   /**
-    * Returns the selected project. null if no project is found
-    */
-   protected Project getSelectedProject(UIContext context)
-   {
-      Project project = null;
-      UISelection<FileResource<?>> initialSelection = context.getInitialSelection();
-      if (!initialSelection.isEmpty())
-      {
-         project = projectFactory.findProject(initialSelection.get());
-      }
-      return project;
-   }
-
 }