Added safe checks

forge · Oct 19, 2015 · 8e30557 · 8e30557
1 parent e3c0ab1
commit 8e30557
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/git/impl/src/main/java/org/jboss/forge/addon/git/facet/GitAPIFacetImpl.java b/git/impl/src/main/java/org/jboss/forge/addon/git/facet/GitAPIFacetImpl.java
@@ -10,16 +10,19 @@
 import org.jboss.forge.addon.dependencies.Dependency;
 import org.jboss.forge.addon.dependencies.builder.DependencyBuilder;
 import org.jboss.forge.addon.facets.AbstractFacet;
+import org.jboss.forge.addon.facets.constraints.FacetConstraint;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.dependencies.DependencyInstaller;
+import org.jboss.forge.addon.projects.facets.DependencyFacet;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 
 /**
  * @author <a href="mailto:jevgeni.zelenkov@gmail.com">Jevgeni Zelenkov</a>
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public class GitAPIFacetImpl extends AbstractFacet<Project>implements GitAPIFacet
+@FacetConstraint(DependencyFacet.class)
+public class GitAPIFacetImpl extends AbstractFacet<Project> implements GitAPIFacet
 {
    private static final Dependency GIT_DEPENDENCY = DependencyBuilder.create()
             .setGroupId("org.eclipse.jgit")

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/AbstractJavaEEFacet.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/AbstractJavaEEFacet.java
@@ -27,7 +27,7 @@
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
  *
  */
-public abstract class AbstractJavaEEFacet extends AbstractFacet<Project>implements JavaEEFacet
+public abstract class AbstractJavaEEFacet extends AbstractFacet<Project> implements JavaEEFacet
 {
    // Version is statically set
    protected static final Dependency JAVAEE6 = DependencyBuilder.create("org.jboss.spec:jboss-javaee-6.0")
@@ -97,6 +97,10 @@ public boolean isInstalled()
 
    protected boolean dependencyRequirementsMet()
    {
+      if (!origin.hasFacet(DependencyFacet.class))
+      {
+         return false;
+      }
       DependencyFacet deps = origin.getFacet(DependencyFacet.class);
       for (Entry<Dependency, List<Dependency>> group : getRequiredDependencyOptions().entrySet())
       {

diff --git a/...ects/impl/src/main/java/org/jboss/forge/addon/projects/ui/ProjectBuildStatusListener.java b/...ects/impl/src/main/java/org/jboss/forge/addon/projects/ui/ProjectBuildStatusListener.java
@@ -41,7 +41,7 @@ public void postCommandExecuted(UICommand command, UIExecutionContext context, R
       {
          PackagingFacet facet = project.getFacet(PackagingFacet.class);
          BuildResult buildResult = facet.getBuildResult();
-         if (!buildResult.isSuccess())
+         if (buildResult != null && !buildResult.isSuccess())
          {
             UIOutput output = uiContext.getProvider().getOutput();
             PrintStream err = output.err();