diff options
author | Tom Tromey <tromey@redhat.com> | 2007-02-12 17:20:06 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2007-02-12 17:20:06 +0000 |
commit | fa911d0edf35398c986c80258016a2b26e62691c (patch) | |
tree | 051513725ac7184c29e5ee096946183978c75f4d /sun | |
parent | 9bbbb4d119fdf6305f20f62f45e4d4bd0478d3d6 (diff) | |
download | classpath-fa911d0edf35398c986c80258016a2b26e62691c.tar.gz |
* vm/reference/java/lang/reflect/Method.java (getDefaultValue):
New method.
* sun/reflect/annotation/AnnotationInvocationHandler.java (create):
New method.
(arrayClone): New method.
(invoke): Clone array return results.
Diffstat (limited to 'sun')
-rw-r--r-- | sun/reflect/annotation/AnnotationInvocationHandler.java | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/sun/reflect/annotation/AnnotationInvocationHandler.java b/sun/reflect/annotation/AnnotationInvocationHandler.java index ab9ad13d8..f132d81ba 100644 --- a/sun/reflect/annotation/AnnotationInvocationHandler.java +++ b/sun/reflect/annotation/AnnotationInvocationHandler.java @@ -39,11 +39,13 @@ exception statement from your version. */ package sun.reflect.annotation; import java.io.Serializable; +import java.lang.annotation.Annotation; import java.lang.annotation.AnnotationTypeMismatchException; import java.lang.annotation.IncompleteAnnotationException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.Iterator; import java.util.Map; @@ -74,6 +76,24 @@ public final class AnnotationInvocationHandler this.memberValues = memberValues; } + public static Annotation create(Class type, Map memberValues) + { + for (Method m : type.getDeclaredMethods()) + { + String name = m.getName(); + if (! memberValues.containsKey(name)) + { + // FIXME: what to do about exceptions here? + memberValues.put(name, m.getDefaultValue()); + } + } + AnnotationInvocationHandler handler + = new AnnotationInvocationHandler(type, memberValues); + return (Annotation) Proxy.newProxyInstance(type.getClassLoader(), + new Class[] { type }, + handler); + } + /** * Compare an instance of AnnotationInvocationHandler with another object. * Note that the other object does not have to be an @@ -295,6 +315,38 @@ public final class AnnotationInvocationHandler return returnType; } + private Object arrayClone(Object obj) + { + if (obj instanceof boolean[]) + return ((boolean[]) obj).clone(); + + if (obj instanceof byte[]) + return ((byte[]) obj).clone(); + + if (obj instanceof char[]) + return ((char[]) obj).clone(); + + if (obj instanceof short[]) + return ((short[]) obj).clone(); + + if (obj instanceof int[]) + return ((int[]) obj).clone(); + + if (obj instanceof float[]) + return ((float[]) obj).clone(); + + if (obj instanceof long[]) + return ((long[]) obj).clone(); + + if (obj instanceof double[]) + return ((double[]) obj).clone(); + + if (obj instanceof Object[]) + return ((Object[]) obj).clone(); + + return obj; + } + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { @@ -325,6 +377,10 @@ public final class AnnotationInvocationHandler throw new AnnotationTypeMismatchException(method, val.getClass().getName()); } + if (val.getClass().isArray()) + { + val = arrayClone(val); + } return val; } } |