Merge pull request #348 from shadogray/master

#FORGE-1135: ServletFacetImpl overrides isInstalled of BaseJavaEEFacet b...
forge · Aug 25, 2013 · 01e1cd2 · 01e1cd2
2 parents 8ca14be + 0f19404
commit 01e1cd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesAPIFacetImpl.java b/javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesAPIFacetImpl.java
@@ -41,7 +41,7 @@ public FacesAPIFacetImpl(final DependencyInstaller installer, final ShellPrintWr
    public boolean isInstalled()
    {
       DependencyFacet deps = project.getFacet(DependencyFacet.class);
-      return deps.hasEffectiveDependency(JAVAEE6_FACES) || deps.hasEffectiveDependency(JAVAEE6_FACES_21);
+      return super.isInstalled() && deps.hasEffectiveDependency(JAVAEE6_FACES) || deps.hasEffectiveDependency(JAVAEE6_FACES_21);
    }
 
    @Override

diff --git a/javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesFacetImpl.java b/javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesFacetImpl.java
@@ -69,7 +69,7 @@ public FacesFacetImpl(final DependencyInstaller installer, final ShellPrintWrite
    public boolean isInstalled()
    {
       String version = project.getFacet(ServletFacet.class).getConfig().getVersion();
-      return version == null || version.trim().startsWith("3");
+      return super.isInstalled() && (version == null || version.trim().startsWith("3"));
    }
 
    @Override