LogManager.java (loggers): Genericized.

* java/util/logging/LogManager.java (loggers): Genericized.
	(addLogger): Merged.
	(findAncestor): Likewise.
	(getLogger): Likewise.
	(getLoggerNames): Genericized.
	(reset): Merged.
	(getLevelProperty): Likewise.
	* java/lang/reflect/Method.java (getDeclaringClass): Genericized.
	* java/lang/reflect/Constructor.java (getParameterTypes):
	Genericized.
	(getExceptionTypes): Likewise.
	(newInstance): Likewise.
	* java/lang/reflect/Array.java (newInstance): Genericized.
	* java/lang/Object.java (getClass): Genericized.
	* java/nio/charset/spi/CharsetProvider.java (charsets):
	Genericized.
	* java/text/Collator.java: Implement Comparable<Object>.

From-SVN: r121473
This commit is contained in:
Tom Tromey 2007-02-01 21:36:01 +00:00 committed by Tom Tromey
parent 0a32f469ac
commit 4d2446d99e
16 changed files with 57 additions and 39 deletions

View file

@ -1,5 +1,5 @@
/* java.lang.reflect.Array - manipulate arrays by reflection
Copyright (C) 1998, 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2001, 2003, 2005, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -104,7 +104,7 @@ public final class Array
* @throws NegativeArraySizeException when length is less than 0
* @throws OutOfMemoryError if memory allocation fails
*/
public static native Object newInstance(Class componentType, int length);
public static native Object newInstance(Class<?> componentType, int length);
/**
* Creates a new multi-dimensioned array. The new array has the same
@ -130,7 +130,7 @@ public final class Array
* than 0
* @throws OutOfMemoryError if memory allocation fails
*/
public static native Object newInstance(Class elementType, int[] dimensions);
public static native Object newInstance(Class<?> elementType, int[] dimensions);
/**
* Gets the array length.

View file

@ -1,5 +1,5 @@
/* java.lang.reflect.Constructor - reflection of Java constructors
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -155,11 +155,11 @@ public final class Constructor<T> extends AccessibleObject
*
* @return a list of the types of the constructor's parameters
*/
public Class[] getParameterTypes ()
public Class<?>[] getParameterTypes ()
{
if (parameter_types == null)
getType ();
return (Class[]) parameter_types.clone();
return (Class<?>[]) parameter_types.clone();
}
/**
@ -169,11 +169,11 @@ public final class Constructor<T> extends AccessibleObject
*
* @return a list of the types in the constructor's throws clause
*/
public Class[] getExceptionTypes ()
public Class<?>[] getExceptionTypes ()
{
if (exception_types == null)
getType();
return (Class[]) exception_types.clone();
return (Class<?>[]) exception_types.clone();
}
/**
@ -305,7 +305,7 @@ public final class Constructor<T> extends AccessibleObject
* @throws ExceptionInInitializerError if construction triggered class
* initialization, which then failed
*/
public native Object newInstance (Object[] args)
public native T newInstance (Object... args)
throws InstantiationException, IllegalAccessException,
IllegalArgumentException, InvocationTargetException;

View file

@ -1,6 +1,6 @@
// Method.java - Represent method of class or interface.
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007 Free Software Foundation
This file is part of libgcj.
@ -68,7 +68,7 @@ public final class Method
* is a non-inherited member.
* @return the class that declared this member
*/
public Class getDeclaringClass()
public Class<?> getDeclaringClass()
{
return declaringClass;
}