[cp-patches] [generics] Patch: FYI: java.util fixes

[Tom Tromey]

I'm checking this in on the generics branch.

This fixes some java.util buglets noticed by japi.

Tom

2005-04-19  Tom Tromey  <address@hidden>

        * java/util/PriorityQueue.java (PriorityQueue): Implements
        Serializable.
        (serialVersionUID): New field.
        * java/util/EnumMap.java (serialVersionUID): New field.
        * java/util/EnumSet.java (serialVersionUID): New field.

Index: java/util/EnumMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/EnumMap.java,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 EnumMap.java
--- java/util/EnumMap.java 12 Jan 2005 13:13:56 -0000 1.1.2.5
+++ java/util/EnumMap.java 20 Apr 2005 20:15:31 -0000
@@ -50,6 +50,8 @@
   extends AbstractMap<K, V>
   implements Cloneable, Serializable
 {
+  private static final long serialVersionUID = 458661240069192865L;
+
   V[] store;
   int cardinality;
   Class<K> enumClass;
Index: java/util/EnumSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/EnumSet.java,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 EnumSet.java
--- java/util/EnumSet.java 12 Jan 2005 13:13:56 -0000 1.1.2.4
+++ java/util/EnumSet.java 20 Apr 2005 20:15:31 -0000
@@ -51,6 +51,8 @@
   extends AbstractSet<T>
   implements Cloneable, Serializable
 {
+  private static final long serialVersionUID = 4782406773684236311L;
+
   BitSet store;
   int cardinality;
   Class<T> enumClass;
Index: java/util/PriorityQueue.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/PriorityQueue.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 PriorityQueue.java
--- java/util/PriorityQueue.java 16 Apr 2005 11:38:20 -0000 1.1.2.3
+++ java/util/PriorityQueue.java 20 Apr 2005 20:15:31 -0000
@@ -38,15 +38,19 @@
 
 package java.util;
 
+import java.io.Serializable;
+
 /**
  * @author Tom Tromey (address@hidden)
  * @author Andrew John Hughes (address@hidden)
  * @since 1.5
  */
-public class PriorityQueue<E> extends AbstractQueue<E>
+public class PriorityQueue<E> extends AbstractQueue<E> implements Serializable
 {
   private static final int DEFAULT_CAPACITY = 11;
 
+  private static final long serialVersionUID = -7720805057305804111L;
+
   /** Number of elements actually used in the storage array.  */
   int used;