Skip to content

Commit

Permalink
Minor fixed in AddonGitBuildAndInstallCommand
Browse files Browse the repository at this point in the history
  • Loading branch information
gastaldi committed Apr 7, 2014
1 parent c11b273 commit 70f3356
Showing 1 changed file with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.jboss.forge.addon.ui.context.UIExecutionContext;
import org.jboss.forge.addon.ui.input.UIInput;
import org.jboss.forge.addon.ui.metadata.WithAttributes;
import org.jboss.forge.addon.ui.output.UIOutput;
import org.jboss.forge.addon.ui.progress.UIProgressMonitor;
import org.jboss.forge.addon.ui.result.Result;
import org.jboss.forge.addon.ui.result.Results;
Expand Down Expand Up @@ -94,6 +95,7 @@ public Result execute(UIExecutionContext context) throws Exception
File tempDir = OperatingSystemUtils.createTempDir();
DirectoryResource projectRoot = resourceFactory.create(DirectoryResource.class, tempDir);
UIProgressMonitor progressMonitor = context.getProgressMonitor();
UIOutput output = context.getUIContext().getProvider().getOutput();
progressMonitor.beginTask("Installing git addon", 4);

progressMonitor.subTask("Cloning repository in " + tempDir);
Expand All @@ -113,16 +115,16 @@ public Result execute(UIExecutionContext context) throws Exception
try
{
project.getFacet(PackagingFacet.class).createBuilder().addArguments("clean", "install").runTests(false)
.build();
.build(output.out(), output.err() );
}
catch (BuildException e)
{
return Results.fail("Unable to execute project build", e);
}
progressMonitor.worked(1);
AddonId id = null;
try
{
AddonId id;
if (coordinate.hasValue())
{
id = AddonId.fromCoordinates(coordinate.getValue());
Expand All @@ -142,11 +144,11 @@ public Result execute(UIExecutionContext context) throws Exception
InstallRequest installRequest = addonManager.install(id);
installRequest.perform();
progressMonitor.done();
return Results.success("Addon " + buildCoordinate.toString() + " was installed successfully.");
return Results.success("Addon " + id + " was installed successfully.");
}
catch (Throwable t)
{
return Results.fail("Addon " + buildCoordinate.toString() + " could not be installed.", t);
return Results.fail("Addon " + id + " could not be installed.", t);
}
}

Expand Down

0 comments on commit 70f3356

Please sign in to comment.