* 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
+2007-02-01 Tom Tromey <tromey@redhat.com>
+
+ * 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>.
+
2007-02-01 Tom Tromey <tromey@redhat.com>
* java/util/Calendar.java: Implement Comparable<Calendar>. Update
/* java.lang.Object - The universal superclass in Java
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2007
Free Software Foundation, Inc.
This file is part of GNU Classpath.
*
* @return the class of this Object
*/
- public final native Class getClass();
+ public final native Class<? extends Object> getClass();
/**
* Get a value that represents this Object, as uniquely as
/* 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.
* @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
* 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.
/* 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.
*
* @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();
}
/**
*
* @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();
}
/**
* @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;
// 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.
* is a non-inherited member.
* @return the class that declared this member
*/
- public Class getDeclaringClass()
+ public Class<?> getDeclaringClass()
{
return declaringClass;
}
/* CharsetProvider.java -- charset service provider interface
- Copyright (C) 2002, 2006 Free Software Foundation
+ Copyright (C) 2002, 2006, 2007 Free Software Foundation
This file is part of GNU Classpath.
* @return the iterator
* @see Charset#availableCharsets()
*/
- public abstract Iterator charsets();
+ public abstract Iterator<Charset> charsets();
/**
* Returns the named charset, by canonical name or alias.
/* Collator.java -- Perform locale dependent String comparisons.
- Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* @author Aaron M. Renn (arenn@urbanophile.com)
* @date March 18, 1999
*/
-/* Written using "Java Class Libraries", 2nd edition, plus online
- * API docs for JDK 1.2 from http://www.javasoft.com.
- * Status: Mostly complete, but parts stubbed out. Look for FIXME.
- */
-public abstract class Collator implements Comparator, Cloneable
+public abstract class Collator implements Comparator<Object>, Cloneable
{
/**
* This constant is a strength value which indicates that only primary
* specified locale. If no <code>Collator</code> exists for the desired
* locale, a <code>Collator</code> for the default locale will be returned.
*
- * @param loc The desired localed to load a <code>Collator</code> for.
+ * @param loc The desired locale to load a <code>Collator</code> for.
*
* @return A <code>Collator</code> for the requested locale
*/
/* LogManager.java -- a class for maintaining Loggers and managing
configuration properties
- Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* The registered named loggers; maps the name of a Logger to
* a WeakReference to it.
*/
- private Map loggers;
+ private Map<String, WeakReference<Logger>> loggers;
/**
* The properties for the logging framework which have been
*/
name = logger.getName();
- ref = (WeakReference) loggers.get(name);
+ ref = loggers.get(name);
if (ref != null)
{
if (ref.get() != null)
checkAccess();
Logger parent = findAncestor(logger);
- loggers.put(name, new WeakReference(logger));
+ loggers.put(name, new WeakReference<Logger>(logger));
if (parent != logger.getParent())
logger.setParent(parent);
int bestNameLength = 0;
Logger cand;
- String candName;
int candNameLength;
if (child == Logger.root)
return null;
- for (Iterator iter = loggers.keySet().iterator(); iter.hasNext();)
+ for (String candName : loggers.keySet())
{
- candName = (String) iter.next();
candNameLength = candName.length();
if (candNameLength > bestNameLength
&& childName.startsWith(candName)
&& childName.charAt(candNameLength) == '.')
{
- cand = (Logger) ((WeakReference) loggers.get(candName)).get();
+ cand = loggers.get(candName).get();
if ((cand == null) || (cand == child))
continue;
*/
public synchronized Logger getLogger(String name)
{
- WeakReference ref;
+ WeakReference<Logger> ref;
/* Throw a NullPointerException if name is null. */
name.getClass();
- ref = (WeakReference) loggers.get(name);
+ ref = loggers.get(name);
if (ref != null)
- return (Logger) ref.get();
+ return ref.get();
else
return null;
}
* @return an Enumeration with the names of the currently
* registered Loggers.
*/
- public synchronized Enumeration getLoggerNames()
+ public synchronized Enumeration<String> getLoggerNames()
{
return Collections.enumeration(loggers.keySet());
}
properties = new Properties();
- Iterator iter = loggers.values().iterator();
+ Iterator<WeakReference<Logger>> iter = loggers.values().iterator();
while (iter.hasNext())
{
- WeakReference ref;
+ WeakReference<Logger> ref;
Logger logger;
- ref = (WeakReference) iter.next();
+ ref = iter.next();
if (ref != null)
{
- logger = (Logger) ref.get();
+ logger = ref.get();
if (logger == null)
iter.remove();
{
try
{
- return Level.parse(getLogManager().getProperty(propertyName));
+ String value = getLogManager().getProperty(propertyName);
+ if (value != null)
+ return Level.parse(getLogManager().getProperty(propertyName));
+ else
+ return defaultValue;
}
catch (Exception ex)
{
projects / gcc.git / commitdiff