[jboss-cvs] JBossAS SVN: r95282 - in projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann: scanner and 1 other directory.

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

Author: alesj
Date: 2009-10-21 08:32:49 -0400 (Wed, 21 Oct 2009)
New Revision: 95282

Modified:
   projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/GenericAnnotationResourceVisitor.java
   projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java
Log:
Add check super as a scanner flag.

Modified: projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/GenericAnnotationResourceVisitor.java
===================================================================
--- projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/GenericAnnotationResourceVisitor.java	2009-10-21 12:10:07 UTC (rev 95281)
+++ projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/GenericAnnotationResourceVisitor.java	2009-10-21 12:32:49 UTC (rev 95282)
@@ -53,7 +53,7 @@
    private ResourceFilter resourceFilter = ClassFilter.INSTANCE;
    private boolean forceAnnotations;
    private boolean checkSuper;
-   private boolean checkInterfaces = true;
+   private boolean checkInterfaces;
    private DefaultAnnotationRepository repository;
    private TypeInfoProvider typeInfoProvider = new IntrospectionTypeInfoProvider();
 

Modified: projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java
===================================================================
--- projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java	2009-10-21 12:10:07 UTC (rev 95281)
+++ projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/scanner/DefaultAnnotationScanner.java	2009-10-21 12:32:49 UTC (rev 95282)
@@ -42,6 +42,7 @@
 {
    protected boolean forceAnnotations;
    protected boolean keepAnnotations;
+   protected boolean checkSuper;
    protected boolean checkInterfaces;
    protected VirtualFile[] excludedRoots;
    protected ClassFilter included;
@@ -81,6 +82,7 @@
       GenericAnnotationResourceVisitor visitor = new GenericAnnotationResourceVisitor(repository);
       visitor.setForceAnnotations(forceAnnotations);
       visitor.setKeepAnnotations(keepAnnotations);
+      visitor.setCheckSuper(checkSuper);
       visitor.setCheckInterfaces(checkInterfaces);
       if (typeInfoProvider != null)
          visitor.setTypeInfoProvider(typeInfoProvider);
@@ -108,6 +110,16 @@
    }
 
    /**
+    * Should we check super class for annotations as well.
+    *
+    * @param checkSuper the check super flag
+    */
+   public void setCheckSuper(boolean checkSuper)
+   {
+      this.checkSuper = checkSuper;
+   }
+
+   /**
     * Should we check interfaces for annotations as well.
     *
     * @param checkInterfaces the check interfaces flag