You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by pc...@apache.org on 2004/06/23 02:53:18 UTC
cvs commit: xml-xmlbeans/v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15 Reflect15DelegateImpl.java
pcal 2004/06/22 17:53:18
Modified: v2/jam/src/org/apache/xmlbeans/impl/jam/internal/reflect
Reflect15Delegate.java ReflectClassBuilder.java
v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15
Reflect15DelegateImpl.java
Log:
jam: move creeping 1.5 dependency into delegate
Revision Changes Path
1.2 +5 -0 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/reflect/Reflect15Delegate.java
Index: Reflect15Delegate.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/reflect/Reflect15Delegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Reflect15Delegate.java 2 Apr 2004 02:41:07 -0000 1.1
+++ Reflect15Delegate.java 23 Jun 2004 00:53:18 -0000 1.2
@@ -46,4 +46,9 @@
public boolean isEnum(Class clazz);
+ public Constructor getEnclosingConstructor(Class clazz);
+
+ public Method getEnclosingMethod(Class clazz);
+
+
}
1.14 +5 -5 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/reflect/ReflectClassBuilder.java
Index: ReflectClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/reflect/ReflectClassBuilder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ReflectClassBuilder.java 22 Jun 2004 21:45:57 -0000 1.13
+++ ReflectClassBuilder.java 23 Jun 2004 00:53:18 -0000 1.14
@@ -24,9 +24,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-import com.sun.javadoc.ClassDoc;
/**
*
@@ -154,8 +151,11 @@
Class[] inners = src.getDeclaredClasses();
if (inners != null) {
for(int i=0; i<inners.length; i++) {
- if (inners[i].getEnclosingConstructor() != null || // skip method anons
- inners[i].getEnclosingMethod() != null) continue;
+ if (mDelegate != null) {
+ // skip anonymous classes
+ if ((mDelegate.getEnclosingConstructor(inners[i]) != null) ||
+ (mDelegate.getEnclosingMethod(inners[i]) != null)) continue;
+ }
String simpleName = inners[i].getName();
int lastDollar = simpleName.lastIndexOf('$');
simpleName = simpleName.substring(lastDollar+1);
1.2 +8 -0 xml-xmlbeans/v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15/Reflect15DelegateImpl.java
Index: Reflect15DelegateImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15/Reflect15DelegateImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Reflect15DelegateImpl.java 10 Jun 2004 19:15:11 -0000 1.1
+++ Reflect15DelegateImpl.java 23 Jun 2004 00:53:18 -0000 1.2
@@ -129,6 +129,14 @@
public boolean isEnum(Class clazz) { return clazz.isEnum(); }
+ public Constructor getEnclosingConstructor(Class clazz) {
+ return clazz.getEnclosingConstructor();
+ }
+
+ public Method getEnclosingMethod(Class clazz) {
+ return clazz.getEnclosingMethod();
+ }
+
// ========================================================================
// Private methods
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org