You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/02 22:54:25 UTC
svn commit: r950758 - in /harmony/enhanced/java/branches/java6:
classlib/modules/luni-kernel/src/main/java/java/lang/
classlib/modules/luni/src/main/java/java/lang/reflect/
drlvm/vm/vmcore/src/kernel_classes/javasrc/java/lang/
Author: hindessm
Date: Wed Jun 2 20:54:24 2010
New Revision: 950758
URL: http://svn.apache.org/viewvc?rev=950758&view=rev
Log:
Trivial java6 uplift.
Since we have a java6 drlvm branch then we might as well make use
of it and perform java6 uplift on the drlvm kernel classes.
Modified:
harmony/enhanced/java/branches/java6/classlib/modules/luni-kernel/src/main/java/java/lang/Class.java
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/lang/reflect/Member.java
harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni-kernel/src/main/java/java/lang/Class.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni-kernel/src/main/java/java/lang/Class.java?rev=950758&r1=950757&r2=950758&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni-kernel/src/main/java/java/lang/Class.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni-kernel/src/main/java/java/lang/Class.java Wed Jun 2 20:54:24 2010
@@ -214,7 +214,7 @@ public final class Class<T> implements S
* access.
*/
@SuppressWarnings("unchecked") // According to spec
- public Class[] getClasses() {
+ public Class<?>[] getClasses() {
return null;
}
@@ -322,7 +322,7 @@ public final class Class<T> implements S
* access.
* @see #getDeclaredConstructor(Class[])
*/
- public Constructor<T> getConstructor(Class... parameterTypes)
+ public Constructor<T> getConstructor(Class<?>... parameterTypes)
throws NoSuchMethodException, SecurityException {
return null;
}
@@ -340,7 +340,7 @@ public final class Class<T> implements S
* access.
* @see #getDeclaredConstructors()
*/
- public Constructor[] getConstructors() throws SecurityException {
+ public Constructor<?>[] getConstructors() throws SecurityException {
return null;
}
@@ -371,7 +371,7 @@ public final class Class<T> implements S
* if a security manager exists and it does not allow member
* access.
*/
- public Class[] getDeclaredClasses() throws SecurityException {
+ public Class<?>[] getDeclaredClasses() throws SecurityException {
return new Class[0];
}
@@ -390,7 +390,7 @@ public final class Class<T> implements S
* access.
* @see #getConstructor(Class[])
*/
- public Constructor<T> getDeclaredConstructor(Class... parameterTypes)
+ public Constructor<T> getDeclaredConstructor(Class<?>... parameterTypes)
throws NoSuchMethodException, SecurityException {
return null;
}
@@ -409,7 +409,7 @@ public final class Class<T> implements S
* access.
* @see #getConstructors()
*/
- public Constructor[] getDeclaredConstructors() throws SecurityException {
+ public Constructor<?>[] getDeclaredConstructors() throws SecurityException {
return new Constructor[0];
}
@@ -468,7 +468,7 @@ public final class Class<T> implements S
* access.
* @see #getMethod(String, Class[])
*/
- public Method getDeclaredMethod(String name, Class... parameterTypes)
+ public Method getDeclaredMethod(String name, Class<?>... parameterTypes)
throws NoSuchMethodException, SecurityException {
return null;
}
@@ -618,7 +618,7 @@ public final class Class<T> implements S
* @return an array with the interfaces of the class represented by this
* class.
*/
- public Class[] getInterfaces() {
+ public Class<?>[] getInterfaces() {
return new Class[0];
}
@@ -641,7 +641,7 @@ public final class Class<T> implements S
* access.
* @see #getDeclaredMethod(String, Class[])
*/
- public Method getMethod(String name, Class... parameterTypes)
+ public Method getMethod(String name, Class<?>... parameterTypes)
throws NoSuchMethodException, SecurityException {
return null;
}
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/lang/reflect/Member.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/lang/reflect/Member.java?rev=950758&r1=950757&r2=950758&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/lang/reflect/Member.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/lang/reflect/Member.java Wed Jun 2 20:54:24 2010
@@ -48,7 +48,7 @@ public interface Member {
* @return the declaring class
*/
@SuppressWarnings("unchecked")
- Class getDeclaringClass();
+ Class<?> getDeclaringClass();
/**
* Returns the modifiers for this member. The {@link Modifier} class should
Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java?rev=950758&r1=950757&r2=950758&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java Wed Jun 2 20:54:24 2010
@@ -333,7 +333,7 @@ public final class Class<T> implements S
* Note: We don't check member access permission for each super class.
* Java 1.5 API specification doesn't require this check.
*/
- public Class[] getClasses() {
+ public Class<?>[] getClasses() {
checkMemberAccess(Member.PUBLIC);
Class<?> clss = this;
ArrayList<Class<?>> classes = null;
@@ -378,7 +378,7 @@ public final class Class<T> implements S
return VMClassRegistry.getComponentType(this);
}
- public Constructor<T> getConstructor(Class... argumentTypes)
+ public Constructor<T> getConstructor(Class<?>... argumentTypes)
throws NoSuchMethodException {
checkMemberAccess(Member.PUBLIC);
Constructor<T> ctors[] = getReflectionData().getPublicConstructors();
@@ -395,19 +395,19 @@ public final class Class<T> implements S
}
@SuppressWarnings("unchecked")
- public Constructor[] getConstructors() {
+ public Constructor<?>[] getConstructors() {
checkMemberAccess(Member.PUBLIC);
return Reflection.copyConstructors(getReflectionData().getPublicConstructors());
}
@SuppressWarnings("unchecked")
- public Class[] getDeclaredClasses() {
+ public Class<?>[] getDeclaredClasses() {
checkMemberAccess(Member.DECLARED);
return VMClassRegistry.getDeclaredClasses(this);
}
@SuppressWarnings("unchecked")
- public Constructor<T> getDeclaredConstructor(Class... argumentTypes)
+ public Constructor<T> getDeclaredConstructor(Class<?>... argumentTypes)
throws NoSuchMethodException {
checkMemberAccess(Member.DECLARED);
return Reflection
@@ -415,7 +415,7 @@ public final class Class<T> implements S
}
@SuppressWarnings("unchecked")
- public Constructor[] getDeclaredConstructors() {
+ public Constructor<?>[] getDeclaredConstructors() {
checkMemberAccess(Member.DECLARED);
return Reflection.copyConstructors(getReflectionData().getDeclaredConstructors());
}
@@ -438,7 +438,8 @@ public final class Class<T> implements S
}
@SuppressWarnings("unchecked")
- public Method getDeclaredMethod(String methodName, Class... argumentTypes)
+ public Method getDeclaredMethod(String methodName,
+ Class<?>... argumentTypes)
throws NoSuchMethodException {
checkMemberAccess(Member.DECLARED);
return Reflection
@@ -472,12 +473,12 @@ public final class Class<T> implements S
}
@SuppressWarnings("unchecked")
- public Class[] getInterfaces() {
+ public Class<?>[] getInterfaces() {
return VMClassRegistry.getInterfaces(this);
}
@SuppressWarnings("unchecked")
- public Method getMethod(String methodName, Class... argumentTypes)
+ public Method getMethod(String methodName, Class<?>... argumentTypes)
throws NoSuchMethodException {
checkMemberAccess(Member.PUBLIC);
return Reflection