[jboss-cvs] JBossAS SVN: r76490 - projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations.

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

Author: alesj
Date: 2008-07-30 13:52:10 -0400 (Wed, 30 Jul 2008)
New Revision: 76490

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
Log:
Move checkInterface init to constructor.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java	2008-07-30 17:50:15 UTC (rev 76489)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java	2008-07-30 17:52:10 UTC (rev 76490)
@@ -40,13 +40,14 @@
 {
    private boolean forceAnnotations;
    private boolean keepAnnotations;
-   private boolean checkInterfaces = true;
+   private boolean checkInterfaces;
 
    public GenericAnnotationDeployer()
    {
       super(Module.class);
       setStage(DeploymentStages.POST_CLASSLOADER);
       setOutput(AnnotationEnvironment.class);
+      checkInterfaces = true;
    }
 
    /**

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java	2008-07-30 17:50:15 UTC (rev 76489)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java	2008-07-30 17:52:10 UTC (rev 76490)
@@ -58,7 +58,7 @@
    private ResourceFilter resourceFilter = ClassFilter.INSTANCE;
    private ClassPool pool;
    private boolean forceAnnotations;
-   private boolean checkInterfaces = true;
+   private boolean checkInterfaces;
    private DefaultAnnotationEnvironment env;
    private CtClass objectCtClass;
 
@@ -77,6 +77,7 @@
       this.pool = pool;
       this.env = new DefaultAnnotationEnvironment(classLoader);
       this.objectCtClass = pool.makeClass(Object.class.getName());
+      this.checkInterfaces = true;
    }
 
    public ResourceFilter getFilter()
@@ -159,12 +160,16 @@
          return;
 
       if (checkInterfaces == false && ctClass.isInterface())
+      {
+         if (log.isTraceEnabled())
+            log.trace("Skipping interface: " + ctClass.getName());
          return;
+      }
 
+      String className = ctClass.getName();
       if (log.isTraceEnabled())
-         log.trace("Scanning class " + ctClass + " for annotations");
+         log.trace("Scanning class " + className + " for annotations");
 
-      String className = ctClass.getName();
       Object[] annotations = forceAnnotations ? ctClass.getAnnotations() : ctClass.getAvailableAnnotations();
       handleAnnotations(ElementType.TYPE, (Signature)null, annotations, className, commit);