WBRI-318

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3466 1c488680-804c-0410-94cd-c6b725194a0e
weld · Aug 12, 2009 · 63aff3f · 63aff3f
1 parent ecd4d19
commit 63aff3f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java b/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java
@@ -77,6 +77,8 @@ protected void merge(Set<Annotation> stereotypeAnnotations)
          {
             beanNameDefaulted = true;
          }
+         // Merge in inherited stereotypes
+         merge(stereotype.getInheritedSterotypes());
       }
    }
 

diff --git a/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java b/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java
@@ -56,6 +56,8 @@ public class StereotypeModel<T extends Annotation> extends AnnotationModel<T>
    private boolean beanNameDefaulted;
    // The interceptor bindings
    private Set<Annotation> interceptorBindings;
+
+   private Set<Annotation> inheritedSterotypes;
 
    /**
     * Constructor
@@ -69,6 +71,7 @@ public StereotypeModel(Class<T> sterotype, ClassTransformer transformer)
       initDefaultScopeType();
       initBeanNameDefaulted();
       initInterceptorBindings();
+      initInheritedStereotypes();
       checkBindings();
    }
 
@@ -91,6 +94,11 @@ private void initInterceptorBindings()
    {
       interceptorBindings = getAnnotatedAnnotation().getMetaAnnotations(InterceptorBindingType.class);
    }
+
+   private void initInheritedStereotypes()
+   {
+      this.inheritedSterotypes = getAnnotatedAnnotation().getMetaAnnotations(Stereotype.class);
+   }
 
    /**
     * Initializes the bean name defaulted
@@ -206,5 +214,10 @@ public boolean isPolicy()
    {
       return policy;
    }
+
+   public Set<Annotation> getInheritedSterotypes()
+   {
+      return inheritedSterotypes;
+   }
 
 }