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

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

Author: jesper.pedersen
Date: 2009-08-12 17:13:09 -0400 (Wed, 12 Aug 2009)
New Revision: 92285

Modified:
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractAnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java
Log:
QA fixes

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractAnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractAnnotationScanner.java	2009-08-12 21:05:20 UTC (rev 92284)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractAnnotationScanner.java	2009-08-12 21:13:09 UTC (rev 92285)
@@ -24,9 +24,6 @@
 
 import org.jboss.annotations.AnnotationRepository;
 import org.jboss.annotations.AnnotationScanner;
-import org.jboss.annotations.impl.BinaryLoader;
-import org.jboss.annotations.impl.Scan;
-import org.jboss.annotations.impl.XMLLoader;
 import org.jboss.annotations.util.ClassScanner;
 import org.jboss.annotations.util.JarScanner;
 
@@ -47,8 +44,8 @@
  */
 public abstract class AbstractAnnotationScanner implements AnnotationScanner
 {
-   private static Logger log;
-   private static boolean trace; 
+   private Logger log;
+   private boolean trace; 
 
    /** Name of the binary metadata */
    public static final String JBOSS_ANNOTATION_BINARY = "jboss-annotation.ser";
@@ -158,7 +155,8 @@
       }
       catch (Throwable t)
       {
-         log.finest(t.getMessage());
+         if (trace)
+            log.finest(t.getMessage());
       }
       finally
       {

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java	2009-08-12 21:05:20 UTC (rev 92284)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java	2009-08-12 21:13:09 UTC (rev 92285)
@@ -24,7 +24,6 @@
 
 import org.jboss.annotations.Annotation;
 import org.jboss.annotations.AnnotationType;
-import org.jboss.annotations.impl.ScanClass;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -44,8 +43,8 @@
  */
 public abstract class AbstractJavassistAnnotationScanner extends AbstractAnnotationScanner
 {
-   private static Logger log;
-   private static boolean trace; 
+   private Logger log;
+   private boolean trace; 
 
    /**
     * Constructor

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java	2009-08-12 21:05:20 UTC (rev 92284)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java	2009-08-12 21:13:09 UTC (rev 92285)
@@ -31,8 +31,8 @@
 import org.jboss.annotations.impl.ScanClass;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
-import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -192,7 +192,9 @@
                                  
                                  if (scanClass == null || scanClass.hasMethod(method.getName(), parameterTypes))
                                  {
-                                    java.lang.annotation.Annotation[] methodAnnotations = method.getDeclaredAnnotations();
+                                    java.lang.annotation.Annotation[] methodAnnotations = 
+                                       method.getDeclaredAnnotations();
+
                                     if (methodAnnotations != null)
                                     {
                                        for (java.lang.annotation.Annotation annotation : methodAnnotations)
@@ -218,7 +220,9 @@
                            
                                     if (scanClass == null || scanClass.hasField(field.getName()))
                                     {
-                                       java.lang.annotation.Annotation[] fieldAnnotations = field.getDeclaredAnnotations();
+                                       java.lang.annotation.Annotation[] fieldAnnotations = 
+                                          field.getDeclaredAnnotations();
+
                                        if (fieldAnnotations != null)
                                        {
                                           for (java.lang.annotation.Annotation annotation : fieldAnnotations)
@@ -240,7 +244,9 @@
                               {
                                  if (!interfaceClass.getName().startsWith("java."))
                                  {
-                                    java.lang.annotation.Annotation[] interfaceAnnotations = interfaceClass.getAnnotations();
+                                    java.lang.annotation.Annotation[] interfaceAnnotations = 
+                                       interfaceClass.getAnnotations();
+
                                     if (interfaceAnnotations != null)
                                     {
                                        for (java.lang.annotation.Annotation annotation : interfaceAnnotations)
@@ -260,7 +266,9 @@
                                           if (trace)
                                              log.finest("Interface Method=" + method.getName());
 
-                                          java.lang.annotation.Annotation[] methodAnnotations = method.getDeclaredAnnotations();
+                                          java.lang.annotation.Annotation[] methodAnnotations = 
+                                             method.getDeclaredAnnotations();
+
                                           if (methodAnnotations != null)
                                           {
                                              String[] parameterTypes = null;

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java	2009-08-12 21:05:20 UTC (rev 92284)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java	2009-08-12 21:13:09 UTC (rev 92285)
@@ -30,8 +30,8 @@
 import org.jboss.annotations.impl.ScanClass;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
-import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;