[jboss-cvs] JBossAS SVN: r92989 - in projects/annotations/trunk/core/src/main/java/org/jboss/annotations: javalangreflect and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 29 11:47:56 EDT 2009
Author: jesper.pedersen
Date: 2009-08-29 11:47:56 -0400 (Sat, 29 Aug 2009)
New Revision: 92989
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/AnnotationRepositoryImpl.java
projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java
projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
Log:
[JBANN-3] Support inheritance (Part 3)
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-29 12:15:32 UTC (rev 92988)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AbstractJavassistAnnotationScanner.java 2009-08-29 15:47:56 UTC (rev 92989)
@@ -234,19 +234,19 @@
{
for (CtClass interfaceClass : interfaces)
{
- if (!interfaceClass.getName().startsWith("java."))
+ String interfaceName = interfaceClass.getName();
+
+ if (!interfaceName.startsWith("java."))
{
- ci.addInterface(interfaceClass.getName());
-
- ClassInfo sci = classInfo.get(interfaceClass.getName());
- if (sci == null)
+ ClassInfo ici = classInfo.get(interfaceName);
+ if (ici == null)
{
- sci = new ClassInfo(interfaceClass.getName());
+ ici = new ClassInfo(interfaceName);
}
- sci.addChild(ctClass.getName());
+ ici.addChild(ctClass.getName());
- classInfo.put(interfaceClass.getName(), sci);
+ classInfo.put(interfaceName, ici);
}
}
}
Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AnnotationRepositoryImpl.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AnnotationRepositoryImpl.java 2009-08-29 12:15:32 UTC (rev 92988)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/AnnotationRepositoryImpl.java 2009-08-29 15:47:56 UTC (rev 92989)
@@ -199,31 +199,6 @@
l.addAll(as);
}
- if (ci.getInterfaces() != null)
- {
- for (String interfaceClass : ci.getInterfaces())
- {
- ClassInfo ii = classInfo.get(interfaceClass);
- if (ii != null)
- {
- Collection<Annotation> ias = ii.getAnnotations();
- if (ias != null)
- {
- for (Annotation ia : ias)
- {
- if (ia.getAnnotationClassName().equals(annotation))
- {
- Annotation na = new Annotation(ia.getAnnotationClassName(), ia.getAnnotation(),
- ia.getType(), ci.getClassName(),
- ia.getMemberName(), ia.getParameterTypes());
- l.add(na);
- }
- }
- }
- }
- }
- }
-
if (ci.getChildren() != null)
{
for (String childClass : ci.getChildren())
Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java 2009-08-29 12:15:32 UTC (rev 92988)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/impl/ClassInfo.java 2009-08-29 15:47:56 UTC (rev 92989)
@@ -45,9 +45,6 @@
/** The super class name */
private String superClassName;
- /** The interfaces */
- private Collection<String> interfaces;
-
/** Is interface */
private boolean isInterface;
@@ -68,7 +65,6 @@
{
this.className = className;
this.superClassName = null;
- this.interfaces = null;
this.isInterface = false;
this.isAbstract = false;
this.annotations = null;
@@ -103,27 +99,6 @@
}
/**
- * Get the interface class names
- * @return The interface names; <code>null</code> if no interfaces
- */
- public Collection<String> getInterfaces()
- {
- return interfaces;
- }
-
- /**
- * Add an interfaces
- * @param clz The fully qualified class name
- */
- public void addInterface(String clz)
- {
- if (interfaces == null)
- interfaces = new HashSet<String>(1);
-
- interfaces.add(clz);
- }
-
- /**
* Does the class represent an interface
* @return True if interface; false if class
*/
@@ -236,7 +211,6 @@
sb = sb.append("{");
sb = sb.append("ClassName=" + className + ",");
sb = sb.append("SuperClass=" + superClassName + ",");
- sb = sb.append("Interfaces=" + interfaces + ",");
sb = sb.append("Annotations=" + annotations + ",");
sb = sb.append("IsInterface=" + isInterface + ",");
sb = sb.append("IsAbstract=" + isAbstract + ",");
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-29 12:15:32 UTC (rev 92988)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java 2009-08-29 15:47:56 UTC (rev 92989)
@@ -263,19 +263,19 @@
{
for (Class interfaceClass : interfaces)
{
- if (!interfaceClass.getName().startsWith("java."))
+ String interfaceName = interfaceClass.getName();
+
+ if (!interfaceName.startsWith("java."))
{
- ci.addInterface(interfaceClass.getName());
-
- ClassInfo sci = classInfo.get(interfaceClass.getName());
- if (sci == null)
+ ClassInfo ici = classInfo.get(interfaceName);
+ if (ici == null)
{
- sci = new ClassInfo(interfaceClass.getName());
+ ici = new ClassInfo(interfaceName);
}
- sci.addChild(clz.getName());
+ ici.addChild(clz.getName());
- classInfo.put(interfaceClass.getName(), sci);
+ classInfo.put(interfaceName, ici);
}
}
}
More information about the jboss-cvs-commits
mailing list