Skip to content

R
riscv-gcc-1
Commit 7ac5faca by Andrew Haley Committed by Andrew Haley
Options

AnnotationInvocationHandler.java: Whitespace only changes. 

2007-03-02  Andrew Haley  <aph@redhat.com>

	* sun/reflect/annotation/AnnotationInvocationHandler.java:
	Whitespace only changes.

2007-03-02  Andrew Haley  <aph@redhat.com>

	* sun/reflect/annotation/AnnotationInvocationHandler.java: Moved
	from Classpath to libgcj local.

From-SVN: r122471
parent b2c6e797
Showing with 334 additions and 324 deletions
libjava/ChangeLog
2007-03-02 Andrew Haley <aph@redhat.com>
* sun/reflect/annotation/AnnotationInvocationHandler.java:
Whitespace only changes.
2007-03-02 Andrew Haley <aph@redhat.com>
* sun/reflect/annotation/AnnotationInvocationHandler.java: Moved
from Classpath to libgcj local.
2007-03-01 Brooks Moses <brooks.moses@codesourcery.com> 2007-03-01 Brooks Moses <brooks.moses@codesourcery.com>
* Makefile.am: Add dummy install-pdf target. * Makefile.am: Add dummy install-pdf target.
......
libjava/sun/reflect/annotation/AnnotationInvocationHandler.java
...@@ -61,336 +61,336 @@ import java.util.Map; ...@@ -61,336 +61,336 @@ import java.util.Map;
public final class AnnotationInvocationHandler public final class AnnotationInvocationHandler
implements InvocationHandler, Serializable implements InvocationHandler, Serializable
{ {
private static final long serialVersionUID = 6182022883658399397L; private static final long serialVersionUID = 6182022883658399397L;
private final Class type; private final Class type;
private final Map memberValues; private final Map memberValues;
/** /**
* Construct a new invocation handler for an annotation proxy. * Construct a new invocation handler for an annotation proxy.
* Note that the VM is responsible for filling the memberValues map * Note that the VM is responsible for filling the memberValues map
* with the default values of all the annotation members. * with the default values of all the annotation members.
*/ */
public AnnotationInvocationHandler(Class type, Map memberValues) public AnnotationInvocationHandler(Class type, Map memberValues)
{ {
this.type = type; this.type = type;
this.memberValues = memberValues; this.memberValues = memberValues;
} }
public static Annotation create(Class type, Map memberValues) public static Annotation create(Class type, Map memberValues)
{ {
for (Method m : type.getDeclaredMethods()) for (Method m : type.getDeclaredMethods())
{ {
String name = m.getName(); String name = m.getName();
if (! memberValues.containsKey(name)) if (! memberValues.containsKey(name))
{ {
// FIXME: what to do about exceptions here? // FIXME: what to do about exceptions here?
memberValues.put(name, m.getDefaultValue()); memberValues.put(name, m.getDefaultValue());
} }
} }
AnnotationInvocationHandler handler AnnotationInvocationHandler handler
= new AnnotationInvocationHandler(type, memberValues); = new AnnotationInvocationHandler(type, memberValues);
return (Annotation) Proxy.newProxyInstance(type.getClassLoader(), return (Annotation) Proxy.newProxyInstance(type.getClassLoader(),
new Class[] { type }, new Class[] { type },
handler); handler);
} }
/** /**
* Compare an instance of AnnotationInvocationHandler with another object. * Compare an instance of AnnotationInvocationHandler with another object.
* Note that the other object does not have to be an * Note that the other object does not have to be an
* AnnotationInvocationHandler, any implementation of the annotation * AnnotationInvocationHandler, any implementation of the annotation
* interface is allowed to be compared for equality. * interface is allowed to be compared for equality.
* Note that this makes the equals method asymmetric, but this behavior * Note that this makes the equals method asymmetric, but this behavior
* is specified by Annotation.equals and identical to the JDK. * is specified by Annotation.equals and identical to the JDK.
* *
* This method is public for use by other parts of the VM. Some VMs * This method is public for use by other parts of the VM. Some VMs
* (can) use different representations of annotations that reuse this * (can) use different representations of annotations that reuse this
* method. * method.
*/ */
public static boolean equals(Class type, Map memberValues, Object other) public static boolean equals(Class type, Map memberValues, Object other)
{ {
if (type.isInstance(other)) if (type.isInstance(other))
{ {
try try
{ {
Method[] methods = type.getDeclaredMethods(); Method[] methods = type.getDeclaredMethods();
if (methods.length == memberValues.size()) if (methods.length == memberValues.size())
{ {
for (int i = 0; i < methods.length; i++) for (int i = 0; i < methods.length; i++)
{ {
String key = methods[i].getName(); String key = methods[i].getName();
Object val = methods[i].invoke(other, new Object[0]); Object val = methods[i].invoke(other, new Object[0]);
if (! deepEquals(memberValues.get(key), val)) if (! deepEquals(memberValues.get(key), val))
{ {
return false; return false;
} }
} }
return true; return true;
} }
} }
catch (IllegalAccessException _) catch (IllegalAccessException _)
{ {
// Ignore exception, like the JDK // Ignore exception, like the JDK
} }
catch (InvocationTargetException _) catch (InvocationTargetException _)
{ {
// Ignore exception, like the JDK // Ignore exception, like the JDK
} }
} }
return false; return false;
} }
private static boolean deepEquals(Object o1, Object o2) private static boolean deepEquals(Object o1, Object o2)
{ {
if (o1 == o2) if (o1 == o2)
return true; return true;
if (o1 == null || o2 == null) if (o1 == null || o2 == null)
return false; return false;
if (o1 instanceof boolean[] && o2 instanceof boolean[]) if (o1 instanceof boolean[] && o2 instanceof boolean[])
return Arrays.equals((boolean[]) o1, (boolean[]) o2); return Arrays.equals((boolean[]) o1, (boolean[]) o2);
if (o1 instanceof byte[] && o2 instanceof byte[]) if (o1 instanceof byte[] && o2 instanceof byte[])
return Arrays.equals((byte[]) o1, (byte[]) o2); return Arrays.equals((byte[]) o1, (byte[]) o2);
if (o1 instanceof char[] && o2 instanceof char[]) if (o1 instanceof char[] && o2 instanceof char[])
return Arrays.equals((char[]) o1, (char[]) o2); return Arrays.equals((char[]) o1, (char[]) o2);
if (o1 instanceof short[] && o2 instanceof short[]) if (o1 instanceof short[] && o2 instanceof short[])
return Arrays.equals((short[]) o1, (short[]) o2); return Arrays.equals((short[]) o1, (short[]) o2);
if (o1 instanceof int[] && o2 instanceof int[]) if (o1 instanceof int[] && o2 instanceof int[])
return Arrays.equals((int[]) o1, (int[]) o2); return Arrays.equals((int[]) o1, (int[]) o2);
if (o1 instanceof float[] && o2 instanceof float[]) if (o1 instanceof float[] && o2 instanceof float[])
return Arrays.equals((float[]) o1, (float[]) o2); return Arrays.equals((float[]) o1, (float[]) o2);
if (o1 instanceof long[] && o2 instanceof long[]) if (o1 instanceof long[] && o2 instanceof long[])
return Arrays.equals((long[]) o1, (long[]) o2); return Arrays.equals((long[]) o1, (long[]) o2);
if (o1 instanceof double[] && o2 instanceof double[]) if (o1 instanceof double[] && o2 instanceof double[])
return Arrays.equals((double[]) o1, (double[]) o2); return Arrays.equals((double[]) o1, (double[]) o2);
if (o1 instanceof Object[] && o2 instanceof Object[]) if (o1 instanceof Object[] && o2 instanceof Object[])
return Arrays.equals((Object[]) o1, (Object[]) o2); return Arrays.equals((Object[]) o1, (Object[]) o2);
return o1.equals(o2); return o1.equals(o2);
} }
private static int deepHashCode(Object obj) private static int deepHashCode(Object obj)
{ {
if (obj instanceof boolean[]) if (obj instanceof boolean[])
return Arrays.hashCode((boolean[]) obj); return Arrays.hashCode((boolean[]) obj);
if (obj instanceof byte[]) if (obj instanceof byte[])
return Arrays.hashCode((byte[]) obj); return Arrays.hashCode((byte[]) obj);
if (obj instanceof char[]) if (obj instanceof char[])
return Arrays.hashCode((char[]) obj); return Arrays.hashCode((char[]) obj);
if (obj instanceof short[]) if (obj instanceof short[])
return Arrays.hashCode((short[]) obj); return Arrays.hashCode((short[]) obj);
if (obj instanceof int[]) if (obj instanceof int[])
return Arrays.hashCode((int[]) obj); return Arrays.hashCode((int[]) obj);
if (obj instanceof float[]) if (obj instanceof float[])
return Arrays.hashCode((float[]) obj); return Arrays.hashCode((float[]) obj);
if (obj instanceof long[]) if (obj instanceof long[])
return Arrays.hashCode((long[]) obj); return Arrays.hashCode((long[]) obj);
if (obj instanceof double[]) if (obj instanceof double[])
return Arrays.hashCode((double[]) obj); return Arrays.hashCode((double[]) obj);
if (obj instanceof Object[]) if (obj instanceof Object[])
return Arrays.hashCode((Object[]) obj); return Arrays.hashCode((Object[]) obj);
return obj.hashCode(); return obj.hashCode();
} }
/** /**
* Compute the hashCode for an annotation. Note that the algorithm is * Compute the hashCode for an annotation. Note that the algorithm is
* specified by Annotation.hashCode. * specified by Annotation.hashCode.
* *
* This method is public for use by other parts of the VM. Some VMs * This method is public for use by other parts of the VM. Some VMs
* (can) use different representations of annotations that reuse this * (can) use different representations of annotations that reuse this
* method. * method.
*/ */
public static int hashCode(Class type, Map memberValues) public static int hashCode(Class type, Map memberValues)
{ {
int h = 0; int h = 0;
Iterator iter = memberValues.keySet().iterator(); Iterator iter = memberValues.keySet().iterator();
while (iter.hasNext()) while (iter.hasNext())
{ {
Object key = iter.next(); Object key = iter.next();
Object val = memberValues.get(key); Object val = memberValues.get(key);
h += deepHashCode(val) ^ 127 * key.hashCode(); h += deepHashCode(val) ^ 127 * key.hashCode();
} }
return h; return h;
} }
private static String deepToString(Object obj) private static String deepToString(Object obj)
{ {
if (obj instanceof boolean[]) if (obj instanceof boolean[])
return Arrays.toString((boolean[]) obj); return Arrays.toString((boolean[]) obj);
if (obj instanceof byte[]) if (obj instanceof byte[])
return Arrays.toString((byte[]) obj); return Arrays.toString((byte[]) obj);
if (obj instanceof char[]) if (obj instanceof char[])
return Arrays.toString((char[]) obj); return Arrays.toString((char[]) obj);
if (obj instanceof short[]) if (obj instanceof short[])
return Arrays.toString((short[]) obj); return Arrays.toString((short[]) obj);
if (obj instanceof int[]) if (obj instanceof int[])
return Arrays.toString((int[]) obj); return Arrays.toString((int[]) obj);
if (obj instanceof float[]) if (obj instanceof float[])
return Arrays.toString((float[]) obj); return Arrays.toString((float[]) obj);
if (obj instanceof long[]) if (obj instanceof long[])
return Arrays.toString((long[]) obj); return Arrays.toString((long[]) obj);
if (obj instanceof double[]) if (obj instanceof double[])
return Arrays.toString((double[]) obj); return Arrays.toString((double[]) obj);
if (obj instanceof Object[]) if (obj instanceof Object[])
return Arrays.toString((Object[]) obj); return Arrays.toString((Object[]) obj);
return obj.toString(); return obj.toString();
} }
/** /**
* This method is public for use by other parts of the VM. Some VMs * This method is public for use by other parts of the VM. Some VMs
* (can) use different representations of annotations that reuse this * (can) use different representations of annotations that reuse this
* method. * method.
*/ */
public static String toString(Class type, Map memberValues) public static String toString(Class type, Map memberValues)
{ {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
sb.append('@').append(type.getName()).append('('); sb.append('@').append(type.getName()).append('(');
String sep = ""; String sep = "";
Iterator iter = memberValues.keySet().iterator(); Iterator iter = memberValues.keySet().iterator();
while (iter.hasNext()) while (iter.hasNext())
{ {
Object key = iter.next(); Object key = iter.next();
Object val = memberValues.get(key); Object val = memberValues.get(key);
sb.append(sep).append(key).append('=').append(deepToString(val)); sb.append(sep).append(key).append('=').append(deepToString(val));
sep = ", "; sep = ", ";
} }
sb.append(')'); sb.append(')');
return sb.toString(); return sb.toString();
} }
private static Class getBoxedReturnType(Method method) private static Class getBoxedReturnType(Method method)
{ {
Class returnType = method.getReturnType(); Class returnType = method.getReturnType();
if (returnType == boolean.class) if (returnType == boolean.class)
return Boolean.class; return Boolean.class;
if (returnType == byte.class) if (returnType == byte.class)
return Byte.class; return Byte.class;
if (returnType == char.class) if (returnType == char.class)
return Character.class; return Character.class;
if (returnType == short.class) if (returnType == short.class)
return Short.class; return Short.class;
if (returnType == int.class) if (returnType == int.class)
return Integer.class; return Integer.class;
if (returnType == float.class) if (returnType == float.class)
return Float.class; return Float.class;
if (returnType == long.class) if (returnType == long.class)
return Long.class; return Long.class;
if (returnType == double.class) if (returnType == double.class)
return Double.class; return Double.class;
return returnType; return returnType;
} }
private Object arrayClone(Object obj) private Object arrayClone(Object obj)
{ {
if (obj instanceof boolean[]) if (obj instanceof boolean[])
return ((boolean[]) obj).clone(); return ((boolean[]) obj).clone();
if (obj instanceof byte[]) if (obj instanceof byte[])
return ((byte[]) obj).clone(); return ((byte[]) obj).clone();
if (obj instanceof char[]) if (obj instanceof char[])
return ((char[]) obj).clone(); return ((char[]) obj).clone();
if (obj instanceof short[]) if (obj instanceof short[])
return ((short[]) obj).clone(); return ((short[]) obj).clone();
if (obj instanceof int[]) if (obj instanceof int[])
return ((int[]) obj).clone(); return ((int[]) obj).clone();
if (obj instanceof float[]) if (obj instanceof float[])
return ((float[]) obj).clone(); return ((float[]) obj).clone();
if (obj instanceof long[]) if (obj instanceof long[])
return ((long[]) obj).clone(); return ((long[]) obj).clone();
if (obj instanceof double[]) if (obj instanceof double[])
return ((double[]) obj).clone(); return ((double[]) obj).clone();
if (obj instanceof Object[]) if (obj instanceof Object[])
return ((Object[]) obj).clone(); return ((Object[]) obj).clone();
return obj; return obj;
} }
public Object invoke(Object proxy, Method method, Object[] args) public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable throws Throwable
{ {
String methodName = method.getName().intern(); String methodName = method.getName().intern();
if (args == null || args.length == 0) if (args == null || args.length == 0)
{ {
if (methodName == "toString") if (methodName == "toString")
{ {
return toString(type, memberValues); return toString(type, memberValues);
} }
else if (methodName == "hashCode") else if (methodName == "hashCode")
{ {
return Integer.valueOf(hashCode(type, memberValues)); return Integer.valueOf(hashCode(type, memberValues));
} }
else if (methodName == "annotationType") else if (methodName == "annotationType")
{ {
return type; return type;
} }
else else
{ {
Object val = memberValues.get(methodName); Object val = memberValues.get(methodName);
if (val == null) if (val == null)
{ {
throw new IncompleteAnnotationException(type, methodName); throw new IncompleteAnnotationException(type, methodName);
} }
if (! getBoxedReturnType(method).isInstance(val)) if (! getBoxedReturnType(method).isInstance(val))
{ {
throw new AnnotationTypeMismatchException(method, throw new AnnotationTypeMismatchException(method,
val.getClass().getName()); val.getClass().getName());
} }
if (val.getClass().isArray()) if (val.getClass().isArray())
{ {
val = arrayClone(val); val = arrayClone(val);
} }
return val; return val;
} }
} }
else if (args.length == 1) else if (args.length == 1)
{ {
if (methodName == "equals") if (methodName == "equals")
{ {
return Boolean.valueOf(equals(type, memberValues, args[0])); return Boolean.valueOf(equals(type, memberValues, args[0]));
} }
} }
throw new InternalError("Invalid annotation proxy"); throw new InternalError("Invalid annotation proxy");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment