[jboss-cvs] JBossAS SVN: r95066 - in projects/annotations/trunk/core/src/main/java/org/jboss/papaki: javalangreflect and 1 other directory.

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

Author: alesj
Date: 2009-10-18 05:54:49 -0400 (Sun, 18 Oct 2009)
New Revision: 95066

Modified:
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractJavassistAnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java
Log:
Fix configuration access - it's lazy now.

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java	2009-10-18 08:42:49 UTC (rev 95065)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java	2009-10-18 09:54:49 UTC (rev 95066)
@@ -64,7 +64,7 @@
    /**
     * Configuration
     */
-   protected Configuration configuration;
+   private Configuration configuration;
 
    /**
     * Constructor

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractJavassistAnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractJavassistAnnotationScanner.java	2009-10-18 08:42:49 UTC (rev 95065)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractJavassistAnnotationScanner.java	2009-10-18 09:54:49 UTC (rev 95066)
@@ -110,7 +110,7 @@
          classInfo.put(ctClass.getName(), ci);
       }
 
-      if (configuration.isClassLevel())
+      if (configure().isClassLevel())
       {
          // Class level annotations
          Object[] classAnnotations = ctClass.getAvailableAnnotations();
@@ -129,7 +129,7 @@
 
       if (!ctClass.isInterface())
       {
-         if (configuration.isConstructorLevel())
+         if (configure().isConstructorLevel())
          {
             // Constructor level annotations
             CtConstructor[] constructors = ctClass.getDeclaredConstructors();
@@ -168,7 +168,7 @@
                         }
                      }
 
-                     if (parameterTypes != null && configuration.isParameterLevel())
+                     if (parameterTypes != null && configure().isParameterLevel())
                      {
                         Object[][] parameterAnnotations = constructor.getAvailableParameterAnnotations();
 
@@ -191,7 +191,7 @@
          }
       }
 
-      if (configuration.isMethodLevel())
+      if (configure().isMethodLevel())
       {
          // Method level annotations
          CtMethod[] methods = ctClass.getDeclaredMethods();
@@ -231,7 +231,7 @@
                   }
 
 
-                  if (parameterTypes != null && configuration.isParameterLevel())
+                  if (parameterTypes != null && configure().isParameterLevel())
                   {
                      Object[][] parameterAnnotations = method.getAvailableParameterAnnotations();
 
@@ -255,7 +255,7 @@
                         
       if (!ctClass.isInterface())
       {
-         if (configuration.isFieldLevel())
+         if (configure().isFieldLevel())
          {
             // Field level annotations
             CtField[] fields = ctClass.getDeclaredFields();

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java	2009-10-18 08:42:49 UTC (rev 95065)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java	2009-10-18 09:54:49 UTC (rev 95066)
@@ -138,7 +138,7 @@
                               continue;
 
                            // Class information
-                           ClassInfo ci = null;
+                           ClassInfo ci;
                            if (ari == null)
                            {
                               ci = classInfo.get(clz.getName());
@@ -166,7 +166,7 @@
                               classInfo.put(clz.getName(), ci);
                            }
 
-                           if (configuration.isClassLevel())
+                           if (configure().isClassLevel())
                            {
                               java.lang.annotation.Annotation[] classAnnotations = clz.getAnnotations();
                               if (classAnnotations != null)
@@ -183,7 +183,7 @@
 
                            if (!clz.isInterface())
                            {
-                              if (configuration.isConstructorLevel())
+                              if (configure().isConstructorLevel())
                               {
                                  Constructor[] constructors = clz.getDeclaredConstructors();
                                  if (constructors != null)
@@ -222,7 +222,7 @@
                                              }
                                           }
 
-                                          if (parameterTypes != null && configuration.isParameterLevel())
+                                          if (parameterTypes != null && configure().isParameterLevel())
                                           {
                                              java.lang.annotation.Annotation[][] parameterAnnotations =
                                                 constructor.getParameterAnnotations();
@@ -248,7 +248,7 @@
                               }
                            }
 
-                           if (configuration.isMethodLevel())
+                           if (configure().isMethodLevel())
                            {
                               Method[] methods = clz.getDeclaredMethods();
                               if (methods != null)
@@ -287,7 +287,7 @@
                                           }
                                        }
 
-                                       if (parameterTypes != null && configuration.isParameterLevel())
+                                       if (parameterTypes != null && configure().isParameterLevel())
                                        {
                                           java.lang.annotation.Annotation[][] parameterAnnotations =
                                              method.getParameterAnnotations();
@@ -314,7 +314,7 @@
 
                            if (!clz.isInterface())
                            {
-                              if (configuration.isFieldLevel())
+                              if (configure().isFieldLevel())
                               {
                                  Field[] fields = clz.getDeclaredFields();
                                  if (fields != null)