[jboss-cvs] JBossAS SVN: r101120 - projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/reflection.

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

Author: kabir.khan at jboss.com
Date: 2010-02-18 11:16:53 -0500 (Thu, 18 Feb 2010)
New Revision: 101120

Modified:
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
Log:
[JBMDR-66] Cleanup, don't reference NullAnnotatedElementMetaDataLoader from tests

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2010-02-18 16:10:58 UTC (rev 101119)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2010-02-18 16:16:53 UTC (rev 101120)
@@ -31,23 +31,14 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.plugins.loader.BasicMetaDataLoader;
 import org.jboss.metadata.plugins.loader.SimpleMetaDataLoader;
-import org.jboss.metadata.spi.loader.MetaDataLoader;
 import org.jboss.metadata.spi.retrieval.AnnotationItem;
 import org.jboss.metadata.spi.retrieval.AnnotationsItem;
-import org.jboss.metadata.spi.retrieval.MetaDataItem;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
-import org.jboss.metadata.spi.retrieval.MetaDatasItem;
-import org.jboss.metadata.spi.retrieval.ValidTime;
-import org.jboss.metadata.spi.retrieval.basic.BasicAnnotationsItem;
-import org.jboss.metadata.spi.retrieval.basic.BasicMetaDatasItem;
 import org.jboss.metadata.spi.retrieval.simple.SimpleAnnotationItem;
 import org.jboss.metadata.spi.retrieval.simple.SimpleAnnotationsItem;
-import org.jboss.metadata.spi.retrieval.simple.SimpleMetaDataItem;
-import org.jboss.metadata.spi.retrieval.simple.SimpleMetaDatasItem;
 import org.jboss.metadata.spi.scope.CommonLevels;
 import org.jboss.metadata.spi.scope.Scope;
 import org.jboss.metadata.spi.scope.ScopeKey;
-import org.jboss.metadata.spi.scope.ScopeLevel;
 import org.jboss.metadata.spi.scope.UnmodifiableScopeKey;
 import org.jboss.metadata.spi.signature.ConstructorParametersSignature;
 import org.jboss.metadata.spi.signature.ConstructorSignature;
@@ -56,7 +47,6 @@
 import org.jboss.metadata.spi.signature.MethodParametersSignature;
 import org.jboss.metadata.spi.signature.MethodSignature;
 import org.jboss.metadata.spi.signature.Signature;
-import org.jboss.test.metadata.benchmark.support.NullAnnotatedElementMetaDataLoader;
 import org.jboss.util.JBossStringBuilder;
 import org.jboss.util.Strings;
 
@@ -150,7 +140,7 @@
             }
             if (constructor.getAnnotations().length == 0)
                return null;
-            return new NullAnnotatedElementMetaDataLoader(constructor);
+            return new AnnotatedElementMetaDataLoader(constructor);
          }
          else if (signature instanceof MethodSignature)
          {
@@ -166,7 +156,7 @@
             }
             if (method.getAnnotations().length == 0)
                return null;
-            return new NullAnnotatedElementMetaDataLoader(method);
+            return new AnnotatedElementMetaDataLoader(method);
          }
          else if (signature instanceof DeclaredMethodSignature)
          {
@@ -190,7 +180,7 @@
             }
             if (method.getAnnotations().length == 0)
                return null;
-            return new NullAnnotatedElementMetaDataLoader(method);
+            return new AnnotatedElementMetaDataLoader(method);
          }
          else if (signature instanceof MethodParametersSignature)
          {
@@ -240,7 +230,7 @@
             }
             if (field.getAnnotations().length == 0)
                return null;
-            return new NullAnnotatedElementMetaDataLoader(field);
+            return new AnnotatedElementMetaDataLoader(field);
          }
       }