[jboss-cvs] JBossAS SVN: r70915 - in projects/aop/trunk/aop/src/main/org/jboss/aop: annotation and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-03-17 13:20:12 -0400 (Mon, 17 Mar 2008)
New Revision: 70915

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java
Log:
Work around EJB 3 using us the wrong way

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2008-03-17 16:14:34 UTC (rev 70914)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2008-03-17 17:20:12 UTC (rev 70915)
@@ -356,6 +356,7 @@
          if (value != null) return value;
       }
 
+      //Need to use the untyped version since that is used by EJB3
       if (annotations.isDisabled(annotation))
          return null;
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java	2008-03-17 16:14:34 UTC (rev 70914)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java	2008-03-17 17:20:12 UTC (rev 70915)
@@ -74,15 +74,6 @@
       classAnnotations.put(annotation.getName(), value);
    }
 
-   public <T extends Annotation> void addClassAnnotation(Class<T> annotation, T value)
-   {
-      initClassAnnotationsMap();
-      classAnnotations.put(annotation.getName(), value);
-   }
-
-   /**
-    * Overridden by EJB3
-    */
    public Object resolveClassAnnotation(Class<? extends Annotation> annotation)
    {
       return resolveTypedClassAnnotation(annotation);
@@ -171,10 +162,16 @@
       disabledClassAnnotations.remove(annotation);
    }
    
-   public boolean isDisabled(Member m, Class<? extends Annotation> annotation)
+   @SuppressWarnings("unchecked")
+   public boolean isDisabled(Member m, Class annotation)
    {
       return isDisabled(m,annotation.getName());
    }
+      
+   public boolean isTypedDisabled(Member m, Class<? extends Annotation> annotation)
+   {
+      return isDisabled(m,annotation.getName());
+   }
    
    public boolean isDisabled(Member m, String annotation)
    {
@@ -192,8 +189,17 @@
       return false;
    }
    
-   public boolean isDisabled(Class<? extends Annotation> annotation)
+   /**
+    * Required by EJB3
+    */
+   @SuppressWarnings("unchecked")
+   public boolean isDisabled(Class annotation)
    {
+      return isTypedDisabled(annotation);
+   }
+   
+   public boolean isTypedDisabled(Class<? extends Annotation> annotation)
+   {
       return isDisabled(annotation.getName());
    }