[cp-patches] [generics] Patch: FYI: minor fixes

[Tom Tromey]

I'm checking this in on the generics branch.

This fixes a return type and adds some casts.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * java/lang/Void.java (TYPE): Added cast to initializer.
        * java/lang/Short.java (TYPE): Added cast to initializer.
        * java/lang/Long.java (TYPE): Added cast to initializer.
        * java/lang/Integer.java (TYPE): Added cast to initializer.
        * java/lang/Float.java (TYPE): Added cast to initializer.
        * java/lang/Double.java (TYPE): Added cast to initializer.
        * java/lang/Character.java (TYPE): Added cast to initializer.
        * java/lang/Byte.java (TYPE): Added cast to initializer.
        * java/lang/Boolean.java (TYPE): Added cast to initializer.
        * java/util/Hashtable.java (elements): Fixed return type.

Index: java/lang/Boolean.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Boolean.java,v
retrieving revision 1.20.2.3
diff -u -r1.20.2.3 Boolean.java
--- java/lang/Boolean.java 9 Oct 2004 23:12:26 -0000 1.20.2.3
+++ java/lang/Boolean.java 6 Nov 2004 22:10:11 -0000
@@ -78,7 +78,7 @@
    *
    * @since 1.1
    */
-  public static final Class<Boolean> TYPE = 
VMClassLoader.getPrimitiveClass('Z');
+  public static final Class<Boolean> TYPE = (Class<Boolean>) 
VMClassLoader.getPrimitiveClass('Z');
 
   /**
    * The immutable value of this Boolean.
Index: java/lang/Byte.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Byte.java,v
retrieving revision 1.22.2.3
diff -u -r1.22.2.3 Byte.java
--- java/lang/Byte.java 1 Nov 2004 15:57:08 -0000 1.22.2.3
+++ java/lang/Byte.java 6 Nov 2004 22:10:11 -0000
@@ -75,7 +75,7 @@
    * The primitive type <code>byte</code> is represented by this
    * <code>Class</code> object.
    */
-  public static final Class<Byte> TYPE = VMClassLoader.getPrimitiveClass('B');
+  public static final Class<Byte> TYPE = (Class<Byte>) 
VMClassLoader.getPrimitiveClass('B');
 
   /**
    * The number of bits needed to represent a <code>byte</code>.
Index: java/lang/Character.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Character.java,v
retrieving revision 1.33.2.3
diff -u -r1.33.2.3 Character.java
--- java/lang/Character.java 1 Nov 2004 15:57:08 -0000 1.33.2.3
+++ java/lang/Character.java 6 Nov 2004 22:10:11 -0000
@@ -1030,7 +1030,7 @@
    *
    * @since 1.1
    */
-  public static final Class<Character> TYPE = 
VMClassLoader.getPrimitiveClass('C');
+  public static final Class<Character> TYPE = (Class<Character>) 
VMClassLoader.getPrimitiveClass('C');
 
   /**
    * The number of bits needed to represent a <code>char</code>.
Index: java/lang/Double.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Double.java,v
retrieving revision 1.34.2.2
diff -u -r1.34.2.2 Double.java
--- java/lang/Double.java 9 Oct 2004 23:12:26 -0000 1.34.2.2
+++ java/lang/Double.java 6 Nov 2004 22:10:12 -0000
@@ -93,7 +93,7 @@
    * <code>Class</code> object.
    * @since 1.1
    */
-  public static final Class<Double> TYPE = 
VMClassLoader.getPrimitiveClass('D');
+  public static final Class<Double> TYPE = (Class<Double>) 
VMClassLoader.getPrimitiveClass('D');
 
   /**
    * The number of bits needed to represent a <code>double</code>.
Index: java/lang/Float.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Float.java,v
retrieving revision 1.28.2.2
diff -u -r1.28.2.2 Float.java
--- java/lang/Float.java 9 Oct 2004 23:12:26 -0000 1.28.2.2
+++ java/lang/Float.java 6 Nov 2004 22:10:12 -0000
@@ -91,7 +91,7 @@
    * <code>Class</code> object.
    * @since 1.1
    */
-  public static final Class<Float> TYPE = VMClassLoader.getPrimitiveClass('F');
+  public static final Class<Float> TYPE = (Class<Float>) 
VMClassLoader.getPrimitiveClass('F');
 
   /**
    * The number of bits needed to represent a <code>float</code>.
Index: java/lang/Integer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Integer.java,v
retrieving revision 1.29.2.3
diff -u -r1.29.2.3 Integer.java
--- java/lang/Integer.java 1 Nov 2004 15:57:08 -0000 1.29.2.3
+++ java/lang/Integer.java 6 Nov 2004 22:10:12 -0000
@@ -76,7 +76,7 @@
    * <code>Class</code> object.
    * @since 1.1
    */
-  public static final Class<Integer> TYPE = 
VMClassLoader.getPrimitiveClass('I');
+  public static final Class<Integer> TYPE = (Class<Integer>) 
VMClassLoader.getPrimitiveClass('I');
 
   /**
    * The number of bits needed to represent an <code>int</code>.
Index: java/lang/Long.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Long.java,v
retrieving revision 1.19.2.3
diff -u -r1.19.2.3 Long.java
--- java/lang/Long.java 1 Nov 2004 15:57:08 -0000 1.19.2.3
+++ java/lang/Long.java 6 Nov 2004 22:10:12 -0000
@@ -76,7 +76,7 @@
    * <code>Class</code> object.
    * @since 1.1
    */
-  public static final Class<Long> TYPE = VMClassLoader.getPrimitiveClass ('J');
+  public static final Class<Long> TYPE = (Class<Long>) 
VMClassLoader.getPrimitiveClass ('J');
 
   /**
    * The number of bits needed to represent a <code>long</code>.
Index: java/lang/Short.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Short.java,v
retrieving revision 1.15.2.2
diff -u -r1.15.2.2 Short.java
--- java/lang/Short.java 9 Oct 2004 23:12:26 -0000 1.15.2.2
+++ java/lang/Short.java 6 Nov 2004 22:10:12 -0000
@@ -74,7 +74,7 @@
    * The primitive type <code>short</code> is represented by this
    * <code>Class</code> object.
    */
-  public static final Class<Short> TYPE = VMClassLoader.getPrimitiveClass('S');
+  public static final Class<Short> TYPE = (Class<Short>) 
VMClassLoader.getPrimitiveClass('S');
 
   /**
    * The number of bits needed to represent a <code>short</code>.
Index: java/lang/Void.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Void.java,v
retrieving revision 1.14.2.2
diff -u -r1.14.2.2 Void.java
--- java/lang/Void.java 9 Oct 2004 23:12:26 -0000 1.14.2.2
+++ java/lang/Void.java 6 Nov 2004 22:10:12 -0000
@@ -57,7 +57,7 @@
    * The return type <code>void</code> is represented by this
    * <code>Class</code> object.
    */
-  public static final Class<Void> TYPE = VMClassLoader.getPrimitiveClass('V');
+  public static final Class<Void> TYPE = (Class<Void>) 
VMClassLoader.getPrimitiveClass('V');
 
   /**
    * Void is non-instantiable.
Index: java/util/Hashtable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Hashtable.java,v
retrieving revision 1.32.2.1
diff -u -r1.32.2.1 Hashtable.java
--- java/util/Hashtable.java 1 Nov 2004 15:57:08 -0000 1.32.2.1
+++ java/util/Hashtable.java 6 Nov 2004 22:10:13 -0000
@@ -315,7 +315,7 @@
    * @see #keys()
    * @see #values()
    */
-  public Enumeration elements()
+  public Enumeration<V> elements()
   {
     return new Enumerator<V>(VALUES);
   }