Index: java/awt/image/BufferedImage.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/BufferedImage.java,v retrieving revision 1.8.2.4 diff -u -3 -p -u -r1.8.2.4 BufferedImage.java --- java/awt/image/BufferedImage.java 12 Oct 2005 21:28:11 -0000 1.8.2.4 +++ java/awt/image/BufferedImage.java 16 Oct 2005 16:45:46 -0000 @@ -499,7 +499,7 @@ public class BufferedImage extends Image }; } - public Vector getSources() + public Vector getSources() { return null; } Index: java/awt/image/ImageFilter.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/ImageFilter.java,v retrieving revision 1.8.2.2 diff -u -3 -p -u -r1.8.2.2 ImageFilter.java --- java/awt/image/ImageFilter.java 10 Sep 2005 15:31:45 -0000 1.8.2.2 +++ java/awt/image/ImageFilter.java 16 Oct 2005 16:45:46 -0000 @@ -135,11 +135,12 @@ public class ImageFilter implements Imag * * @param props the list of properties associated with this image */ - public void setProperties(Hashtable props) + public void setProperties(Hashtable props) { - props.put("filters", "ImageFilter"); - if (consumer != null) - consumer.setProperties(props); + Hashtable props2 = (Hashtable) props; + props2.put("filters", "ImageFilter"); + if (consumer != null) + consumer.setProperties(props); } /** Index: java/awt/image/MemoryImageSource.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/MemoryImageSource.java,v retrieving revision 1.9.2.4 diff -u -3 -p -u -r1.9.2.4 MemoryImageSource.java --- java/awt/image/MemoryImageSource.java 12 Oct 2005 21:28:12 -0000 1.9.2.4 +++ java/awt/image/MemoryImageSource.java 16 Oct 2005 16:45:46 -0000 @@ -125,7 +125,7 @@ public class MemoryImageSource implement * Constructs an ImageProducer from memory using the default RGB ColorModel */ public MemoryImageSource(int w, int h, int[] pix, int off, int scan, - Hashtable props) + Hashtable props) { this(w, h, ColorModel.getRGBdefault(), pix, off, scan, props); } Index: java/awt/image/PixelGrabber.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/PixelGrabber.java,v retrieving revision 1.10.2.4 diff -u -3 -p -u -r1.10.2.4 PixelGrabber.java --- java/awt/image/PixelGrabber.java 10 Sep 2005 15:31:45 -0000 1.10.2.4 +++ java/awt/image/PixelGrabber.java 16 Oct 2005 16:45:46 -0000 @@ -55,7 +55,7 @@ public class PixelGrabber implements Ima ColorModel model = ColorModel.getRGBdefault(); int hints; - Hashtable props; + Hashtable props; int int_pixel_buffer[]; boolean ints_delivered = false; @@ -445,7 +445,7 @@ public class PixelGrabber implements Ima * @param props a list of properties associated with the image being * produced */ - public synchronized void setProperties(Hashtable props) + public synchronized void setProperties(Hashtable props) { this.props = props; } Index: java/awt/image/renderable/RenderableImageOp.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/renderable/RenderableImageOp.java,v retrieving revision 1.1.2.1 diff -u -3 -p -u -r1.1.2.1 RenderableImageOp.java --- java/awt/image/renderable/RenderableImageOp.java 2 Aug 2005 20:12:16 -0000 1.1.2.1 +++ java/awt/image/renderable/RenderableImageOp.java 16 Oct 2005 16:45:46 -0000 @@ -55,7 +55,7 @@ public class RenderableImageOp implement this.block = (ParameterBlock) block.clone(); } - public Vector getSources() + public Vector getSources() { if (block.sources == null) return null; Index: java/beans/Beans.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/Beans.java,v retrieving revision 1.9.2.5 diff -u -3 -p -u -r1.9.2.5 Beans.java --- java/beans/Beans.java 2 Aug 2005 20:12:16 -0000 1.9.2.5 +++ java/beans/Beans.java 16 Oct 2005 16:45:46 -0000 @@ -295,7 +295,7 @@ public class Beans * @return the Bean as a new view, or if the operation * could not be performed, the Bean itself. */ - public static Object getInstanceOf(Object bean, Class newClass) + public static Object getInstanceOf(Object bean, Class newClass) { return bean; } @@ -314,7 +314,7 @@ public class Beans * @return whether the Bean can be cast to the class type * in question. */ - public static boolean isInstanceOf(Object bean, Class newBeanClass) + public static boolean isInstanceOf(Object bean, Class newBeanClass) { return newBeanClass.isInstance(bean); } Index: java/beans/EventSetDescriptor.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/EventSetDescriptor.java,v retrieving revision 1.6.2.2 diff -u -3 -p -u -r1.6.2.2 EventSetDescriptor.java --- java/beans/EventSetDescriptor.java 2 Aug 2005 20:12:16 -0000 1.6.2.2 +++ java/beans/EventSetDescriptor.java 16 Oct 2005 16:45:46 -0000 @@ -91,7 +91,7 @@ import java.util.Vector; public class EventSetDescriptor extends FeatureDescriptor { private Method addListenerMethod; private Method removeListenerMethod; - private Class listenerType; + private Class listenerType; private MethodDescriptor[] listenerMethodDescriptors; private Method[] listenerMethods; @@ -132,9 +132,9 @@ public class EventSetDescriptor extends ** @exception IntrospectionException if listenerType is not an EventListener, ** or if methods are not found or are invalid. **/ - public EventSetDescriptor(Class eventSourceClass, + public EventSetDescriptor(Class eventSourceClass, String eventSetName, - Class listenerType, + Class listenerType, String listenerMethodName) throws IntrospectionException { setName(eventSetName); if(!java.util.EventListener.class.isAssignableFrom(listenerType)) { @@ -172,9 +172,9 @@ public class EventSetDescriptor extends ** @exception IntrospectionException if listenerType is not an EventListener ** or if methods are not found or are invalid. **/ - public EventSetDescriptor(Class eventSourceClass, + public EventSetDescriptor(Class eventSourceClass, String eventSetName, - Class listenerType, + Class listenerType, String[] listenerMethodNames, String addListenerMethodName, String removeListenerMethodName) throws IntrospectionException { @@ -205,7 +205,7 @@ public class EventSetDescriptor extends ** or any of the methods are invalid. **/ public EventSetDescriptor(String eventSetName, - Class listenerType, + Class listenerType, Method[] listenerMethods, Method addListenerMethod, Method removeListenerMethod) throws IntrospectionException { @@ -239,7 +239,7 @@ public class EventSetDescriptor extends ** or any of the methods are invalid. **/ public EventSetDescriptor(String eventSetName, - Class listenerType, + Class listenerType, MethodDescriptor[] listenerMethodDescriptors, Method addListenerMethod, Method removeListenerMethod) throws IntrospectionException { @@ -265,7 +265,7 @@ public class EventSetDescriptor extends } /** Get the class that contains the event firing methods. **/ - public Class getListenerType() { + public Class getListenerType() { return listenerType; } Index: java/beans/FeatureDescriptor.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/FeatureDescriptor.java,v retrieving revision 1.7.2.2 diff -u -3 -p -u -r1.7.2.2 FeatureDescriptor.java --- java/beans/FeatureDescriptor.java 2 Aug 2005 20:12:16 -0000 1.7.2.2 +++ java/beans/FeatureDescriptor.java 16 Oct 2005 16:45:46 -0000 @@ -68,14 +68,14 @@ public class FeatureDescriptor boolean hidden; boolean preferred; - Hashtable valueHash; + Hashtable valueHash; /** * Instantiate this FeatureDescriptor with appropriate default values. */ public FeatureDescriptor() { - valueHash = new Hashtable(); + valueHash = new Hashtable(); } /** @@ -225,7 +225,7 @@ public class FeatureDescriptor * @return an Enumerator over all the programmatic key names associated * with this feature. */ - public Enumeration attributeNames() + public Enumeration attributeNames() { return valueHash.keys(); } Index: java/beans/IndexedPropertyDescriptor.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/IndexedPropertyDescriptor.java,v retrieving revision 1.9.2.1 diff -u -3 -p -u -r1.9.2.1 IndexedPropertyDescriptor.java --- java/beans/IndexedPropertyDescriptor.java 2 Aug 2005 20:12:16 -0000 1.9.2.1 +++ java/beans/IndexedPropertyDescriptor.java 16 Oct 2005 16:45:46 -0000 @@ -77,7 +77,7 @@ import java.lang.reflect.Method; **/ public class IndexedPropertyDescriptor extends PropertyDescriptor { - private Class indexedPropertyType; + private Class indexedPropertyType; private Method setIndex; private Method getIndex; @@ -110,7 +110,7 @@ public class IndexedPropertyDescriptor e ** @param beanClass the class the get and set methods live in. ** @exception IntrospectionException if the methods are not found or invalid. **/ - public IndexedPropertyDescriptor(String name, Class beanClass) throws IntrospectionException { + public IndexedPropertyDescriptor(String name, Class beanClass) throws IntrospectionException { super(name); String capitalized; try { @@ -150,7 +150,7 @@ public class IndexedPropertyDescriptor e ** @param setIndexName the name of the set index method. ** @exception IntrospectionException if the methods are not found or invalid. **/ - public IndexedPropertyDescriptor(String name, Class beanClass, String getMethodName, String setMethodName, String getIndexName, String setIndexName) throws IntrospectionException { + public IndexedPropertyDescriptor(String name, Class beanClass, String getMethodName, String setMethodName, String getIndexName, String setIndexName) throws IntrospectionException { super(name); findMethods(beanClass, getMethodName, setMethodName, getIndexName, setIndexName); } @@ -221,7 +221,7 @@ public class IndexedPropertyDescriptor e this.propertyType = getMethod != null ? getMethod.getReturnType() : (setMethod != null ? setMethod.getParameterTypes()[0] : Array.newInstance(this.indexedPropertyType,0).getClass()); } - public Class getIndexedPropertyType() { + public Class getIndexedPropertyType() { return indexedPropertyType; } Index: java/beans/Introspector.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/Introspector.java,v retrieving revision 1.17.2.3 diff -u -3 -p -u -r1.17.2.3 Introspector.java --- java/beans/Introspector.java 2 Aug 2005 20:12:16 -0000 1.17.2.3 +++ java/beans/Introspector.java 16 Oct 2005 16:45:46 -0000 @@ -182,7 +182,8 @@ public class Introspector { public static final int IGNORE_ALL_BEANINFO = 3; static String[] beanInfoSearchPath = {"gnu.java.beans.info"}; - static Hashtable beanInfoCache = new Hashtable(); + static Hashtable,BeanInfo> beanInfoCache = + new Hashtable,BeanInfo>(); private Introspector() {} @@ -195,13 +196,13 @@ public class Introspector { * @param beanClass the class to get BeanInfo about. * @return the BeanInfo object representing the class. */ - public static BeanInfo getBeanInfo(Class beanClass) + public static BeanInfo getBeanInfo(Class beanClass) throws IntrospectionException { BeanInfo cachedInfo; synchronized(beanClass) { - cachedInfo = (BeanInfo)beanInfoCache.get(beanClass); + cachedInfo = beanInfoCache.get(beanClass); if(cachedInfo != null) { return cachedInfo; @@ -236,7 +237,7 @@ public class Introspector { * @throws NullPointerException if clz is null. * @since 1.2 */ - public static void flushFromCaches(Class clz) + public static void flushFromCaches(Class clz) { synchronized (clz) { @@ -255,7 +256,7 @@ public class Introspector { * @param stopClass the class to stop at. * @return the BeanInfo object representing the class. */ - public static BeanInfo getBeanInfo(Class beanClass, Class stopClass) + public static BeanInfo getBeanInfo(Class beanClass, Class stopClass) throws IntrospectionException { ExplicitInfo explicit = new ExplicitInfo(beanClass, stopClass); Index: java/beans/PropertyDescriptor.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/PropertyDescriptor.java,v retrieving revision 1.10.2.4 diff -u -3 -p -u -r1.10.2.4 PropertyDescriptor.java --- java/beans/PropertyDescriptor.java 2 Aug 2005 20:12:16 -0000 1.10.2.4 +++ java/beans/PropertyDescriptor.java 16 Oct 2005 16:45:46 -0000 @@ -64,11 +64,11 @@ import java.lang.reflect.Method; public class PropertyDescriptor extends FeatureDescriptor { - Class propertyType; + Class propertyType; Method getMethod; Method setMethod; - Class propertyEditorClass; + Class propertyEditorClass; boolean bound; boolean constrained; @@ -102,7 +102,7 @@ public class PropertyDescriptor extends ** @exception IntrospectionException if the methods are not found ** or invalid. **/ - public PropertyDescriptor(String name, Class beanClass) + public PropertyDescriptor(String name, Class beanClass) throws IntrospectionException { setName(name); @@ -158,7 +158,7 @@ public class PropertyDescriptor extends **/ public PropertyDescriptor( String name, - Class beanClass, + Class beanClass, String getMethodName, String setMethodName) throws IntrospectionException @@ -212,7 +212,7 @@ public class PropertyDescriptor extends ** This is the type the get method returns and the set method ** takes in. **/ - public Class getPropertyType() + public Class getPropertyType() { return propertyType; } @@ -329,7 +329,7 @@ public class PropertyDescriptor extends } /** Get the PropertyEditor class. Defaults to null. **/ - public Class getPropertyEditorClass() + public Class getPropertyEditorClass() { return propertyEditorClass; } @@ -340,7 +340,7 @@ public class PropertyDescriptor extends ** @param propertyEditorClass the PropertyEditor class for this ** class to use. **/ - public void setPropertyEditorClass(Class propertyEditorClass) + public void setPropertyEditorClass(Class propertyEditorClass) { this.propertyEditorClass = propertyEditorClass; } @@ -450,10 +450,10 @@ public class PropertyDescriptor extends * @return The common property type of the two method. * @throws IntrospectionException If any of the above requirements are not met. */ - private Class checkMethods(Method readMethod, Method writeMethod) + private Class checkMethods(Method readMethod, Method writeMethod) throws IntrospectionException { - Class newPropertyType = propertyType; + Class newPropertyType = propertyType; // a valid read method has zero arguments and a non-void return type. if (readMethod != null) Index: java/beans/PropertyEditorManager.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/beans/PropertyEditorManager.java,v retrieving revision 1.9.2.2 diff -u -3 -p -u -r1.9.2.2 PropertyEditorManager.java --- java/beans/PropertyEditorManager.java 2 Aug 2005 20:12:16 -0000 1.9.2.2 +++ java/beans/PropertyEditorManager.java 16 Oct 2005 16:45:46 -0000 @@ -83,7 +83,8 @@ import java.awt.Font; public class PropertyEditorManager { - static java.util.Hashtable editors = new java.util.Hashtable(); + static java.util.Hashtable,Class> editors = + new java.util.Hashtable,Class>(); static String[] editorSearchPath = { "gnu.java.beans.editors", "sun.beans.editors" }; @@ -118,7 +119,7 @@ public class PropertyEditorManager * will edit. * @param editorClass the PropertyEditor class. */ - public static void registerEditor(Class editedClass, Class editorClass) + public static void registerEditor(Class editedClass, Class editorClass) { editors.put(editedClass, editorClass); } @@ -132,7 +133,7 @@ public class PropertyEditorManager * @return a PropertyEditor instance that can edit the * specified class. */ - public static PropertyEditor findEditor(Class editedClass) + public static PropertyEditor findEditor(Class editedClass) { try { Index: java/io/ObjectInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v retrieving revision 1.43.2.16 diff -u -3 -p -u -r1.43.2.16 ObjectInputStream.java --- java/io/ObjectInputStream.java 20 Sep 2005 18:46:27 -0000 1.43.2.16 +++ java/io/ObjectInputStream.java 16 Oct 2005 16:45:46 -0000 @@ -760,7 +760,7 @@ public class ObjectInputStream extends I * * @see java.io.ObjectOutputStream#annotateClass (java.lang.Class) */ - protected Class resolveClass(ObjectStreamClass osc) + protected Class resolveClass(ObjectStreamClass osc) throws ClassNotFoundException, IOException { String name = osc.getName(); Index: java/io/ObjectOutputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/ObjectOutputStream.java,v retrieving revision 1.46.2.8 diff -u -3 -p -u -r1.46.2.8 ObjectOutputStream.java --- java/io/ObjectOutputStream.java 20 Sep 2005 18:46:27 -0000 1.46.2.8 +++ java/io/ObjectOutputStream.java 16 Oct 2005 16:45:46 -0000 @@ -604,11 +604,11 @@ public class ObjectOutputStream extends * * @see ObjectInputStream#resolveClass(java.io.ObjectStreamClass) */ - protected void annotateClass(Class cl) throws IOException + protected void annotateClass(Class cl) throws IOException { } - protected void annotateProxyClass(Class cl) throws IOException + protected void annotateProxyClass(Class cl) throws IOException { } Index: java/io/ObjectStreamClass.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamClass.java,v retrieving revision 1.34.2.6 diff -u -3 -p -u -r1.34.2.6 ObjectStreamClass.java --- java/io/ObjectStreamClass.java 20 Sep 2005 18:46:27 -0000 1.34.2.6 +++ java/io/ObjectStreamClass.java 16 Oct 2005 16:45:46 -0000 @@ -80,7 +80,7 @@ public class ObjectStreamClass implement * * @see java.io.Serializable */ - public static ObjectStreamClass lookup(Class cl) + public static ObjectStreamClass lookup(Class cl) { if (cl == null) return null; @@ -132,7 +132,7 @@ public class ObjectStreamClass implement * * @see java.io.ObjectInputStream */ - public Class forClass() + public Class forClass() { return clazz; } @@ -232,7 +232,7 @@ public class ObjectStreamClass implement // classes of CLAZZ and CLAZZ itself in order from most super to // CLAZZ. ObjectStreamClass[0] is the highest superclass of CLAZZ // that is serializable. - static ObjectStreamClass[] getObjectStreamClasses(Class clazz) + static ObjectStreamClass[] getObjectStreamClasses(Class clazz) { ObjectStreamClass osc = ObjectStreamClass.lookup(clazz); @@ -924,7 +924,7 @@ outer: Class[] writeMethodArgTypes = { java.io.ObjectOutputStream.class }; private ObjectStreamClass superClass; - private Class clazz; + private Class clazz; private String name; private long uid; private byte flags; Index: java/io/ObjectStreamField.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamField.java,v retrieving revision 1.18.2.3 diff -u -3 -p -u -r1.18.2.3 ObjectStreamField.java --- java/io/ObjectStreamField.java 20 Sep 2005 18:46:27 -0000 1.18.2.3 +++ java/io/ObjectStreamField.java 16 Oct 2005 16:45:46 -0000 @@ -55,7 +55,8 @@ import java.security.PrivilegedAction; * @author Michael Koch (address@hidden) * @author Andrew John Hughes (address@hidden) */ -public class ObjectStreamField implements Comparable +public class ObjectStreamField + implements Comparable { private String name; private Class type; @@ -80,7 +81,7 @@ public class ObjectStreamField implement * @param name Name of the field to export. * @param type Type of the field in the concerned class. */ - public ObjectStreamField (String name, Class type) + public ObjectStreamField (String name, Class type) { this (name, type, false); } @@ -94,7 +95,7 @@ public class ObjectStreamField implement * @param type Type of the field in the concerned class. * @param unshared true if field will be unshared, false otherwise. */ - public ObjectStreamField (String name, Class type, boolean unshared) + public ObjectStreamField (String name, Class type, boolean unshared) { if (name == null) throw new NullPointerException(); Index: java/net/NetworkInterface.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/net/NetworkInterface.java,v retrieving revision 1.8.2.6 diff -u -3 -p -u -r1.8.2.6 NetworkInterface.java --- java/net/NetworkInterface.java 16 Aug 2005 16:22:37 -0000 1.8.2.6 +++ java/net/NetworkInterface.java 16 Oct 2005 16:45:46 -0000 @@ -59,7 +59,7 @@ import java.util.Vector; public final class NetworkInterface { private String name; - private Vector inetAddresses; + private Vector inetAddresses; NetworkInterface(String name, InetAddress address) { @@ -97,19 +97,19 @@ public final class NetworkInterface * * @return An enumeration of all addresses. */ - public Enumeration getInetAddresses() + public Enumeration getInetAddresses() { SecurityManager s = System.getSecurityManager(); if (s == null) return inetAddresses.elements(); - Vector tmpInetAddresses = new Vector(1, 1); + Vector tmpInetAddresses = new Vector(1, 1); - for (Enumeration addresses = inetAddresses.elements(); + for (Enumeration addresses = inetAddresses.elements(); addresses.hasMoreElements();) { - InetAddress addr = (InetAddress) addresses.nextElement(); + InetAddress addr = addresses.nextElement(); try { s.checkConnect(addr.getHostAddress(), 58000); @@ -231,9 +231,11 @@ public final class NetworkInterface * * @exception SocketException If an error occurs */ - public static Enumeration getNetworkInterfaces() throws SocketException + public static Enumeration getNetworkInterfaces() + throws SocketException { - Vector networkInterfaces = VMNetworkInterface.getInterfaces(); + Vector networkInterfaces = + VMNetworkInterface.getInterfaces(); if (networkInterfaces.isEmpty()) return null; Index: java/net/URLClassLoader.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/net/URLClassLoader.java,v retrieving revision 1.21.2.7 diff -u -3 -p -u -r1.21.2.7 URLClassLoader.java --- java/net/URLClassLoader.java 20 Sep 2005 18:46:29 -0000 1.21.2.7 +++ java/net/URLClassLoader.java 16 Oct 2005 16:45:46 -0000 @@ -853,7 +853,7 @@ public class URLClassLoader extends Secu * loaded * @return a Class object representing the found class */ - protected Class findClass(final String className) + protected Class findClass(final String className) throws ClassNotFoundException { // Just try to find the resource by the (almost) same name @@ -1073,10 +1073,10 @@ public class URLClassLoader extends Secu * @exception IOException when an error occurs accessing one of the * locations */ - public Enumeration findResources(String resourceName) + public Enumeration findResources(String resourceName) throws IOException { - Vector resources = new Vector(); + Vector resources = new Vector(); int max = urlinfos.size(); for (int i = 0; i < max; i++) { Index: java/net/URLConnection.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v retrieving revision 1.29.2.3 diff -u -3 -p -u -r1.29.2.3 URLConnection.java --- java/net/URLConnection.java 2 Aug 2005 20:12:23 -0000 1.29.2.3 +++ java/net/URLConnection.java 16 Oct 2005 16:45:46 -0000 @@ -47,6 +47,7 @@ import java.text.ParsePosition; import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -311,10 +312,10 @@ public abstract class URLConnection * * @since 1.4 */ - public Map getHeaderFields() + public Map> getHeaderFields() { // Subclasses for specific protocols override this. - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } /** @@ -802,14 +803,14 @@ public abstract class URLConnection * * @since 1.4 */ - public Map getRequestProperties() + public Map> getRequestProperties() { if (connected) throw new IllegalStateException("Already connected"); // Overridden by subclasses that support reading header fields from the // request. - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } /** Index: javax/swing/text/TextAction.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/TextAction.java,v retrieving revision 1.4.2.4 diff -u -3 -p -u -r1.4.2.4 TextAction.java --- javax/swing/text/TextAction.java 2 Aug 2005 20:12:38 -0000 1.4.2.4 +++ javax/swing/text/TextAction.java 16 Oct 2005 16:45:46 -0000 @@ -87,7 +87,7 @@ public abstract class TextAction extends */ public static final Action[] augmentList(Action[] list1, Action[] list2) { - HashSet actionSet = new HashSet(); + HashSet actionSet = new HashSet(); for (int i = 0; i < list1.length; ++i) actionSet.add(list1[i]); @@ -95,8 +95,8 @@ public abstract class TextAction extends for (int i = 0; i < list2.length; ++i) actionSet.add(list2[i]); - ArrayList list = new ArrayList(actionSet); - return (Action[]) list.toArray(new Action[actionSet.size()]); + ArrayList list = new ArrayList(actionSet); + return list.toArray(new Action[actionSet.size()]); } /** Index: javax/swing/text/html/HTML.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTML.java,v retrieving revision 1.1.2.3 diff -u -3 -p -u -r1.1.2.3 HTML.java --- javax/swing/text/html/HTML.java 2 Aug 2005 20:12:38 -0000 1.1.2.3 +++ javax/swing/text/html/HTML.java 16 Oct 2005 16:45:47 -0000 @@ -1186,8 +1186,8 @@ public class HTML static final int BLOCK = 2; static final int PREFORMATTED = 4; static final int SYNTETIC = 8; - private static Map tagMap; - private static Map attrMap; + private static Map tagMap; + private static Map attrMap; /** * The public constructor (does nothing). It it seldom required to have @@ -1225,7 +1225,7 @@ public class HTML if (attrMap == null) { // Create the map on demand. - attrMap = new TreeMap(); + attrMap = new TreeMap(); Attribute[] attrs = getAllAttributeKeys(); @@ -1235,7 +1235,7 @@ public class HTML } } - return (Attribute) attrMap.get(attName.toLowerCase()); + return attrMap.get(attName.toLowerCase()); } /** @@ -1294,7 +1294,7 @@ public class HTML if (tagMap == null) { // Create the mao on demand. - tagMap = new TreeMap(); + tagMap = new TreeMap(); Tag[] tags = getAllTags(); @@ -1304,6 +1304,6 @@ public class HTML } } - return (Tag) tagMap.get(tagName.toLowerCase()); + return tagMap.get(tagName.toLowerCase()); } } Index: javax/swing/text/html/parser/DTD.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/DTD.java,v retrieving revision 1.1.2.4 diff -u -3 -p -u -r1.1.2.4 DTD.java --- javax/swing/text/html/parser/DTD.java 20 Sep 2005 18:46:36 -0000 1.1.2.4 +++ javax/swing/text/html/parser/DTD.java 16 Oct 2005 16:45:47 -0000 @@ -88,7 +88,7 @@ public class DTD /** * The table of existing available DTDs. */ - static Hashtable dtdHash = new Hashtable(); + static Hashtable dtdHash = new Hashtable(); /** * The applet element for this DTD. @@ -148,12 +148,13 @@ public class DTD /** * The element for accessing all DTD elements by name. */ - public Hashtable elementHash = new Hashtable(); + public Hashtable elementHash = + new Hashtable(); /** * The entity table for accessing all DTD entities by name. */ - public Hashtable entityHash = new Hashtable(); + public Hashtable entityHash = new Hashtable(); /** * The name of this DTD. @@ -165,7 +166,7 @@ public class DTD * javax.swing.text.html.parser.Element#index field of all elements * in this vector is set to the element position in this vector. */ - public Vector elements = new Vector(); + public Vector elements = new Vector(); /** Create a new DTD with the specified name. */ protected DTD(String a_name) @@ -224,7 +225,7 @@ public class DTD String name = Entity.mapper.get(id); if (name != null) - return (Entity) entityHash.get(name); + return entityHash.get(name); else return null; } @@ -269,7 +270,7 @@ public class DTD */ public void defineAttributes(String forElement, AttributeList attributes) { - Element e = (Element) elementHash.get(forElement.toLowerCase()); + Element e = elementHash.get(forElement.toLowerCase()); if (e == null) e = newElement(forElement); @@ -420,7 +421,7 @@ public class DTD if (allowed_values != null) { StringTokenizer st = new StringTokenizer(allowed_values, " \t|"); - Vector v = new Vector(st.countTokens()); + Vector v = new Vector(st.countTokens()); while (st.hasMoreTokens()) v.add(st.nextToken()); @@ -571,7 +572,7 @@ public class DTD */ private Element newElement(String name) { - Element e = (Element) elementHash.get(name.toLowerCase()); + Element e = elementHash.get(name.toLowerCase()); if (e == null) {