2002-10-02 Michael Koch <konqueror@gmx.de>

	* java/awt/CardLayout.java: Added serialVersionUID.
	* java/awt/ContainerOrderFocusTraversalPolicy.java:
	Added serialVersionUID.
	* java/awt/Cursor.java: Added serialVersionUID.
	* java/awt/Event.java: Added serialVersionUID.
	* java/awt/GridBagConstraints.java: Added serialVersionUID.
	* java/awt/GridBagLayout.java: Added serialVersionUID.
	* java/awt/GridLayout.java: Added serialVersionUID.
	* java/awt/datatransfer/DataFlavor.java: Added serialVersionUID.
	* java/awt/dnd/DragSourceContext.java: Added serialVersionUID.
	* java/awt/dnd/DropTargetContext.java: Added serialVersionUID.
	* java/beans/beancontext/BeanContextChildSupport.java:
	Added serialVersionUID.
	* java/io/Externalizable.java: Added serialVersionUID.
	* java/io/File.java: Added serialVersionUID.
	* java/io/FilePermission.java: Added serialVersionUID.
	* java/io/Serializable.java: Added serialVersionUID.
	* java/io/SerializablePermission.java: Added serialVersionUID.
	* java/net/DatagramPacket.java: New intendation.
	* java/rmi/activation/ActivationDesc.java: Added serialVersionUID.
	* java/rmi/activation/ActivationGroupDesc.java: Added serialVersionUID.
	* java/rmi/activation/ActivationID.java: Added serialVersionUID.
	* java/rmi/activation/ActivationGroupID.java: Added serialVersionUID.
	* java/security/Identity.java: Added serialVersionUID.
	* java/security/KeyPair.java: Added serialVersionUID.
	* java/security/Provider.java: Added serialVersionUID.
	* java/security/SecureRandom.java: Added serialVersionUID.
	* java/security/SecureRandomSpi.java: Added serialVersionUID.
	* java/security/SignedObject.java: Added serialVersionUID.
	* java/security/cert/Certificate.java: Added serialVersionUID.
	* java/text/Format.java: Added serialVersionUID.
	* java/util/prefs/BackingStoreException.java: Added serialVersionUID.
	* java/util/prefs/InvalidPreferencesFormatException.java:
	Added serialVersionUID.
	* javax/naming/BinaryRefAddr.java: Added serialVersionUID.
	* javax/naming/Name.java: Added serialVersionUID.
	* javax/swing/AbstractAction.java: Added serialVersionUID.
	* javax/swing/AbstractCellEditor.java: Added serialVersionUID.
	* javax/swing/AbstractListModel.java: Added serialVersionUID.
	* javax/swing/ActionMap.java: Added serialVersionUID.
	* javax/swing/ButtonGroup.java: Added serialVersionUID.
	* javax/swing/DefaultBoundedRangeModel.java: Added serialVersionUID.
	* javax/swing/DefaultButtonModel.java: Added serialVersionUID.
	* javax/swing/DefaultCellEditor.java: Added serialVersionUID.
	* javax/swing/DefaultComboBoxModel.java: Added serialVersionUID.
	* javax/swing/DefaultDesktopManager.java: Added serialVersionUID.
	* javax/swing/DefaultListCellRenderer.java: Added serialVersionUID.
	* javax/swing/DefaultSingleSelectionModel.java: Added serialVersionUID.
	* javax/swing/InputMap.java: Added serialVersionUID.
	* javax/swing/JComponent.java: Added serialVersionUID.
	* javax/swing/JMenu.java: Added serialVersionUID.
	* javax/swing/JSlider.java: Added serialVersionUID.
	* javax/swing/KeyStroke.java: Added serialVersionUID.
	* javax/swing/OverlayLayout.java: Added serialVersionUID.
	* javax/swing/ScrollPaneLayout.java: Added serialVersionUID.
	* javax/swing/SizeRequirements.java: Added serialVersionUID.
	* javax/swing/UIManager.java: Added serialVersionUID.
	* javax/swing/ViewportLayout.java: Added serialVersionUID.
	* javax/swing/border/AbstractBorder.java: Added serialVersionUID.
	* javax/swing/colorchooser/DefaultColorSelectionModel.java:
	Added serialVersionUID.
	* javax/swing/event/EventListenerList.java: Added serialVersionUID.
	* javax/swing/plaf/BorderUIResource.java: Added serialVersionUID.
	* javax/swing/plaf/IconUIResource.java: Added serialVersionUID.
	* javax/swing/plaf/basic/BasicIconFactory.java: Added serialVersionUID.
	* javax/swing/plaf/basic/BasicLookAndFeel.java: Added serialVersionUID.
	* javax/swing/table/AbstractTableModel.java: Added serialVersionUID.
	* javax/swing/table/DefaultTableCellRenderer.java:
	Added serialVersionUID.
	* javax/swing/table/DefaultTableColumnModel.java:
	Added serialVersionUID.
	* javax/swing/table/DefaultTableModel.java: Added serialVersionUID.
	* javax/swing/table/TableColumn.java: Added serialVersionUID.
	* javax/swing/text/StyledEditorKit.java: Added serialVersionUID.
	* javax/swing/tree/DefaultMutableTreeNode.java: Added serialVersionUID.
	* javax/swing/tree/DefaultTreeModel.java: Added serialVersionUID.
	* javax/swing/tree/DefaultTreeSelectionModel.java:
	Added serialVersionUID.
	* javax/swing/tree/TreePath.java: Added serialVersionUID.
	* javax/swing/undo/AbstractUndoableEdit.java: Added serialVersionUID.

74 files changed, 449 insertions, 207 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b0d1bce2..4a1161d60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,86 @@
+2002-10-02  Michael Koch  <konqueror@gmx.de>
+
+	* java/awt/CardLayout.java: Added serialVersionUID.
+	* java/awt/ContainerOrderFocusTraversalPolicy.java:
+	Added serialVersionUID.
+	* java/awt/Cursor.java: Added serialVersionUID.
+	* java/awt/Event.java: Added serialVersionUID.
+	* java/awt/GridBagConstraints.java: Added serialVersionUID.
+	* java/awt/GridBagLayout.java: Added serialVersionUID.
+	* java/awt/GridLayout.java: Added serialVersionUID.
+	* java/awt/datatransfer/DataFlavor.java: Added serialVersionUID.
+	* java/awt/dnd/DragSourceContext.java: Added serialVersionUID.
+	* java/awt/dnd/DropTargetContext.java: Added serialVersionUID.
+	* java/beans/beancontext/BeanContextChildSupport.java:
+	Added serialVersionUID.
+	* java/io/Externalizable.java: Added serialVersionUID.
+	* java/io/File.java: Added serialVersionUID.
+	* java/io/FilePermission.java: Added serialVersionUID.
+	* java/io/Serializable.java: Added serialVersionUID.
+	* java/io/SerializablePermission.java: Added serialVersionUID.
+	* java/net/DatagramPacket.java: New intendation.
+	* java/rmi/activation/ActivationDesc.java: Added serialVersionUID.
+	* java/rmi/activation/ActivationGroupDesc.java: Added serialVersionUID.
+	* java/rmi/activation/ActivationID.java: Added serialVersionUID.
+	* java/rmi/activation/ActivationGroupID.java: Added serialVersionUID.
+	* java/security/Identity.java: Added serialVersionUID.
+	* java/security/KeyPair.java: Added serialVersionUID.
+	* java/security/Provider.java: Added serialVersionUID.
+	* java/security/SecureRandom.java: Added serialVersionUID.
+	* java/security/SecureRandomSpi.java: Added serialVersionUID.
+	* java/security/SignedObject.java: Added serialVersionUID.
+	* java/security/cert/Certificate.java: Added serialVersionUID.
+	* java/text/Format.java: Added serialVersionUID.
+	* java/util/prefs/BackingStoreException.java: Added serialVersionUID.
+	* java/util/prefs/InvalidPreferencesFormatException.java:
+	Added serialVersionUID.
+	* javax/naming/BinaryRefAddr.java: Added serialVersionUID.
+	* javax/naming/Name.java: Added serialVersionUID.
+	* javax/swing/AbstractAction.java: Added serialVersionUID.
+	* javax/swing/AbstractCellEditor.java: Added serialVersionUID.
+	* javax/swing/AbstractListModel.java: Added serialVersionUID.
+	* javax/swing/ActionMap.java: Added serialVersionUID.
+	* javax/swing/ButtonGroup.java: Added serialVersionUID.
+	* javax/swing/DefaultBoundedRangeModel.java: Added serialVersionUID.
+	* javax/swing/DefaultButtonModel.java: Added serialVersionUID.
+	* javax/swing/DefaultCellEditor.java: Added serialVersionUID.
+	* javax/swing/DefaultComboBoxModel.java: Added serialVersionUID.
+	* javax/swing/DefaultDesktopManager.java: Added serialVersionUID.
+	* javax/swing/DefaultListCellRenderer.java: Added serialVersionUID.
+	* javax/swing/DefaultSingleSelectionModel.java: Added serialVersionUID.
+	* javax/swing/InputMap.java: Added serialVersionUID.
+	* javax/swing/JComponent.java: Added serialVersionUID.
+	* javax/swing/JMenu.java: Added serialVersionUID.
+	* javax/swing/JSlider.java: Added serialVersionUID.
+	* javax/swing/KeyStroke.java: Added serialVersionUID.
+	* javax/swing/OverlayLayout.java: Added serialVersionUID.
+	* javax/swing/ScrollPaneLayout.java: Added serialVersionUID.
+	* javax/swing/SizeRequirements.java: Added serialVersionUID.
+	* javax/swing/UIManager.java: Added serialVersionUID.
+	* javax/swing/ViewportLayout.java: Added serialVersionUID.
+	* javax/swing/border/AbstractBorder.java: Added serialVersionUID.
+	* javax/swing/colorchooser/DefaultColorSelectionModel.java:
+	Added serialVersionUID.
+	* javax/swing/event/EventListenerList.java: Added serialVersionUID.
+	* javax/swing/plaf/BorderUIResource.java: Added serialVersionUID.
+	* javax/swing/plaf/IconUIResource.java: Added serialVersionUID.
+	* javax/swing/plaf/basic/BasicIconFactory.java: Added serialVersionUID.
+	* javax/swing/plaf/basic/BasicLookAndFeel.java: Added serialVersionUID.
+	* javax/swing/table/AbstractTableModel.java: Added serialVersionUID.
+	* javax/swing/table/DefaultTableCellRenderer.java:
+	Added serialVersionUID.
+	* javax/swing/table/DefaultTableColumnModel.java:
+	Added serialVersionUID.
+	* javax/swing/table/DefaultTableModel.java: Added serialVersionUID.
+	* javax/swing/table/TableColumn.java: Added serialVersionUID.
+	* javax/swing/text/StyledEditorKit.java: Added serialVersionUID.
+	* javax/swing/tree/DefaultMutableTreeNode.java: Added serialVersionUID.
+	* javax/swing/tree/DefaultTreeModel.java: Added serialVersionUID.
+	* javax/swing/tree/DefaultTreeSelectionModel.java:
+	Added serialVersionUID.
+	* javax/swing/tree/TreePath.java: Added serialVersionUID.
+	* javax/swing/undo/AbstractUndoableEdit.java: Added serialVersionUID.
+
 2002-09-30  Michael Koch  <konqueror@gmx.de>
 
 	* javax/naming/RefAddr:
@@ -66,15 +149,15 @@
 	* java/awt/dnd/DropTargetListener.java: New file.
 	* java/awt/dnd/MouseDragGestureRecognizer.java: New file.
 	* java/awt/dnd/peer/DropTargetContextPeer.java: New file.
-	* java/awt/dnd/Makefile.am: Adding all the new files.
+        * java/awt/dnd/Makefile.am: Adding all the new files.
 
 2002-09-26  Eric Blake  <ebb9@email.byu.edu>
 
-	* java/applet/AppletContext.java (setStream): Fix signature typo.
-	* javax/accessibility/AccessibleEditableText.java (cut, delete):
-	Ditto.
-	* javax/accessibility/AccessibleHyperlink.java
-	(getAccessibleActionAnchor, getAccessibleActionObject): Ditto.
+        * java/applet/AppletContext.java (setStream): Fix signature typo.
+        * javax/accessibility/AccessibleEditableText.java (cut, delete):
+        Ditto.
+        * javax/accessibility/AccessibleHyperlink.java
+        (getAccessibleActionAnchor, getAccessibleActionObject): Ditto.
 
 2002-09-26  Michael Koch  <konqueror@gmx.de>
 
diff --git a/java/awt/CardLayout.java b/java/awt/CardLayout.java
index 5bdb4acf9..38eb91ec0 100644
--- a/java/awt/CardLayout.java
+++ b/java/awt/CardLayout.java
@@ -53,6 +53,8 @@ import java.io.Serializable;
  */
 public class CardLayout implements LayoutManager2, Serializable
 {
+  static final long serialVersionUID = -4328196481005934313L;
+
   /**
    * Initializes a new instance of <code>CardLayout</code> with horizontal
    * and vertical gaps of 0.
diff --git a/java/awt/ContainerOrderFocusTraversalPolicy.java b/java/awt/ContainerOrderFocusTraversalPolicy.java
index 4c0d94e47..e3cf31cb1 100644
--- a/java/awt/ContainerOrderFocusTraversalPolicy.java
+++ b/java/awt/ContainerOrderFocusTraversalPolicy.java
@@ -46,6 +46,8 @@ import java.io.Serializable;
 public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
   implements Serializable
 {
+  static final long serialVersionUID = 486933713763926351L;
+
   private boolean downCycle = true;
 
   public ContainerOrderFocusTraversalPolicy()
diff --git a/java/awt/Cursor.java b/java/awt/Cursor.java
index 2267998a4..5852b8bbf 100644
--- a/java/awt/Cursor.java
+++ b/java/awt/Cursor.java
@@ -44,6 +44,8 @@ package java.awt;
   */
 public class Cursor implements java.io.Serializable
 {
+  static final long serialVersionUID = 8028237497568985504L;
+
   /**
   * Constant for the system default cursor type
   */
diff --git a/java/awt/Event.java b/java/awt/Event.java
index a02016164..c42700512 100644
--- a/java/awt/Event.java
+++ b/java/awt/Event.java
@@ -45,6 +45,8 @@ package java.awt;
 
 public class Event implements java.io.Serializable
 {
+  static final long serialVersionUID = 5488922509400504703L;
+
   public static final int SHIFT_MASK = 1,
 			  CTRL_MASK = 2,
 			  META_MASK = 4,
diff --git a/java/awt/GridBagConstraints.java b/java/awt/GridBagConstraints.java
index dd72a519a..57356ad8e 100644
--- a/java/awt/GridBagConstraints.java
+++ b/java/awt/GridBagConstraints.java
@@ -45,6 +45,8 @@ import java.io.Serializable;
  * GridBagLayout layout manager.  */
 public class GridBagConstraints implements Cloneable, Serializable
 {
+  static final long serialVersionUID = -1000070633030801713L;
+
   /** Fill in both directions.  */
   public static final int BOTH = 1;
   /** Don't fill.  */
diff --git a/java/awt/GridBagLayout.java b/java/awt/GridBagLayout.java
index 29e1beac4..f2ce9156e 100644
--- a/java/awt/GridBagLayout.java
+++ b/java/awt/GridBagLayout.java
@@ -40,11 +40,13 @@ package java.awt;
 import java.io.Serializable;
 
 /**
- * Stub implementeation.
+ * Stub implementation.
  */
 public class GridBagLayout
   implements Serializable, LayoutManager2
 {
+  static final long serialVersionUID = 8838754796412211005L;
+
   public void addLayoutComponent(String name, Component component)
   {
   }
diff --git a/java/awt/GridLayout.java b/java/awt/GridLayout.java
index 32f1cf8f5..58145f8cb 100644
--- a/java/awt/GridLayout.java
+++ b/java/awt/GridLayout.java
@@ -58,6 +58,8 @@ import java.io.Serializable;
  */
 public class GridLayout implements LayoutManager, Serializable
 {
+  static final long serialVersionUID = -7411804673224730901L;
+  
   /** Add a new component to the layout.  This particular implementation
    * does nothing.
    * @param name The name of the component to add.
diff --git a/java/awt/datatransfer/DataFlavor.java b/java/awt/datatransfer/DataFlavor.java
index 3c6b2720e..d33a3eb1c 100644
--- a/java/awt/datatransfer/DataFlavor.java
+++ b/java/awt/datatransfer/DataFlavor.java
@@ -56,6 +56,7 @@ import java.io.UnsupportedEncodingException;
   */
 public class DataFlavor implements java.io.Externalizable, Cloneable
 {
+  static final long serialVersionUID = 8367026044764648243L;
 
 // FIXME: Serialization: Need to write methods for.
 
diff --git a/java/awt/dnd/DragSourceContext.java b/java/awt/dnd/DragSourceContext.java
index ff7e88257..5dd41da6d 100644
--- a/java/awt/dnd/DragSourceContext.java
+++ b/java/awt/dnd/DragSourceContext.java
@@ -50,6 +50,8 @@ import java.util.TooManyListenersException;
 public class DragSourceContext
   implements DragSourceListener, DragSourceMotionListener, Serializable
 {
+  static final long serialVersionUID = -115407898692194719L;
+
   protected static final int DEFAULT = 0;
   protected static final int ENTER = 1;
   protected static final int OVER = 2;
diff --git a/java/awt/dnd/DropTargetContext.java b/java/awt/dnd/DropTargetContext.java
index 255ab844e..86adaade9 100644
--- a/java/awt/dnd/DropTargetContext.java
+++ b/java/awt/dnd/DropTargetContext.java
@@ -48,6 +48,8 @@ import java.util.List;
 
 public class DropTargetContext implements Serializable
 {
+  static final long serialVersionUID = -634158968993743371L;
+
   protected class TransferableProxy implements Transferable
   {
     protected boolean isLocal;
diff --git a/java/beans/beancontext/BeanContextChildSupport.java b/java/beans/beancontext/BeanContextChildSupport.java
index 84373acf5..270854b25 100644
--- a/java/beans/beancontext/BeanContextChildSupport.java
+++ b/java/beans/beancontext/BeanContextChildSupport.java
@@ -60,7 +60,11 @@ import java.io.Serializable;
  * @see java.beans.beancontext.BeanContextChild
  */
 
-public class BeanContextChildSupport implements BeanContextChild, BeanContextServicesListener, Serializable {
+public class BeanContextChildSupport
+  implements BeanContextChild, BeanContextServicesListener, Serializable
+{
+  static final long serialVersionUID = 6328947014421475877L;
+
 	/**
 	 * The peer on which to perform <code>set</code> actions.
 	 * This is here so that this class can be used as a peer.
diff --git a/java/io/Externalizable.java b/java/io/Externalizable.java
index 4e3b1cabc..83f1b653e 100644
--- a/java/io/Externalizable.java
+++ b/java/io/Externalizable.java
@@ -62,6 +62,7 @@ package java.io;
   */
 public interface Externalizable extends Serializable
 {
+  static final long serialVersionUID = -282491828744381764L;
 
 /**
   * This method restores an object's state by reading in the instance data
diff --git a/java/io/File.java b/java/io/File.java
index b2cdee4bf..e31e215fd 100644
--- a/java/io/File.java
+++ b/java/io/File.java
@@ -57,6 +57,7 @@ import gnu.java.io.PlatformHelper;
   */
 public class File implements Serializable, Comparable
 {
+  static final long serialVersionUID = 301077366599181567L;
 
 /*************************************************************************/
 
diff --git a/java/io/FilePermission.java b/java/io/FilePermission.java
index a8cd3d44a..0fc06c914 100644
--- a/java/io/FilePermission.java
+++ b/java/io/FilePermission.java
@@ -41,7 +41,10 @@ package java.io;
 import java.security.*;
 
 
-public final class FilePermission extends Permission implements Serializable {
+public final class FilePermission extends Permission implements Serializable
+{
+  static final long serialVersionUID = 7930732926638008763L;
+
   private static final String CURRENT_DIRECTORY = System.getProperty("user.dir");
   private boolean usingPerms = false;
   private boolean readPerm = false;
diff --git a/java/io/Serializable.java b/java/io/Serializable.java
index 2afdff466..0d6310ce3 100644
--- a/java/io/Serializable.java
+++ b/java/io/Serializable.java
@@ -51,4 +51,5 @@ package java.io;
   */
 public interface Serializable
 {
+  static final long serialVersionUID = 1196656838076753133L;
 } // interface Serializable
diff --git a/java/io/SerializablePermission.java b/java/io/SerializablePermission.java
index 12c2d7622..d9dc3dd92 100644
--- a/java/io/SerializablePermission.java
+++ b/java/io/SerializablePermission.java
@@ -61,7 +61,8 @@ import java.security.BasicPermission;
   */
 public final class SerializablePermission extends BasicPermission
 {
-
+  static final long serialVersionUID = 8537212141160296410L;
+	
 /*
  * Class Variables
  */
diff --git a/java/net/DatagramPacket.java b/java/net/DatagramPacket.java
index d136f8424..7ca6c51a2 100644
--- a/java/net/DatagramPacket.java
+++ b/java/net/DatagramPacket.java
@@ -44,67 +44,66 @@ package java.net;
  */
 
 /**
-  * This class models a packet of data that is to be sent across the network
-  * using a connectionless protocol such as UDP.  It contains the data
-  * to be send, as well as the destination address and port.  Note that
-  * datagram packets can arrive in any order and are not guaranteed to be
-  * delivered at all.
-  * <p>
-  * This class can also be used for receiving data from the network.
-  * <p>
-  * Note that for all method below where the buffer length passed by the
-  * caller cannot exceed the actually length of the byte array passed as
-  * the buffer, if this condition is not true, then the method silently
-  * reduces the length value to maximum allowable value.
-  *
-  * Written using on-line Java Platform 1.2 API Specification, as well
-  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
-  * Status:  Believed complete and correct.
-  *
-  * @author Warren Levy <warrenl@cygnus.com>
-  * @author Aarom M. Renn (arenn@urbanophile.com) (Documentation comments)
-  * @date April 28, 1999.
-  */
-
+ * This class models a packet of data that is to be sent across the network
+ * using a connectionless protocol such as UDP.  It contains the data
+ * to be send, as well as the destination address and port.  Note that
+ * datagram packets can arrive in any order and are not guaranteed to be
+ * delivered at all.
+ * <p>
+ * This class can also be used for receiving data from the network.
+ * <p>
+ * Note that for all method below where the buffer length passed by the
+ * caller cannot exceed the actually length of the byte array passed as
+ * the buffer, if this condition is not true, then the method silently
+ * reduces the length value to maximum allowable value.
+ *
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Believed complete and correct.
+ *
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @author Aarom M. Renn (arenn@urbanophile.com) (Documentation comments)
+ * @date April 28, 1999.
+ */
 public final class DatagramPacket
 {
-/**
-  * The data buffer to send
-  */
+  /**
+   * The data buffer to send
+   */
   private byte[] buffer;
 
-/**
-  * This is the offset into the buffer to start sending from or receiving to.
-  */
+  /**
+   * This is the offset into the buffer to start sending from or receiving to.
+   */
   private int offset;
 
-/**
-  * The length of the data buffer to send
-  */
+  /**
+   * The length of the data buffer to send
+   */
   private int length;
 
-/**
-  * The address to which the packet should be sent or from which it
-  * was received
-  */
+  /**
+   * The address to which the packet should be sent or from which it
+   * was received
+   */
   private InetAddress address;
 
-/**
-  * The port to which the packet should be sent or from which it was
-  * was received.
-  */
+  /**
+   * The port to which the packet should be sent or from which it was
+   * was received.
+   */
   private int port;
 
-/**
-  * This method initializes a new instance of <code>DatagramPacket</code>
-  * which has the specified buffer, offset, and length.
-  *
-  * @param buf The buffer for holding the incoming datagram.
-  * @param offset The offset into the buffer to start writing.
-  * @param length The maximum number of bytes to read.
-  *
-  * @since 1.2
-  */
+  /**
+   * This method initializes a new instance of <code>DatagramPacket</code>
+   * which has the specified buffer, offset, and length.
+   *
+   * @param buf The buffer for holding the incoming datagram.
+   * @param offset The offset into the buffer to start writing.
+   * @param length The maximum number of bytes to read.
+   *
+   * @since 1.2
+   */
   public DatagramPacket(byte[] buf, int offset, int length)
   {
     if (buf == null)
@@ -124,30 +123,30 @@ public final class DatagramPacket
     this.port = -1;
   }
 
-/**
-  * Initializes a new instance of <code>DatagramPacket</code> for
-  * receiving packets from the network.
-  *
-  * @param buf A buffer for storing the returned packet data
-  * @param length The length of the buffer (must be <= buf.length)
-  */
+  /**
+   * Initializes a new instance of <code>DatagramPacket</code> for
+   * receiving packets from the network.
+   *
+   * @param buf A buffer for storing the returned packet data
+   * @param length The length of the buffer (must be <= buf.length)
+   */
   public DatagramPacket(byte[] buf, int length)
   {
     this(buf, 0, length);
   }
 
-/**
-  * Initializes a new instance of <code>DatagramPacket</code> for
-  * transmitting packets across the network.
-  *
-  * @param buf A buffer containing the data to send
-  * @param offset The offset into the buffer to start writing from.
-  * @param len The length of the buffer (must be <= buf.length)
-  * @param addr The address to send to
-  * @param port The port to send to
-  *
-  * @since 1.2
-  */
+  /**
+   * Initializes a new instance of <code>DatagramPacket</code> for
+   * transmitting packets across the network.
+   *
+   * @param buf A buffer containing the data to send
+   * @param offset The offset into the buffer to start writing from.
+   * @param len The length of the buffer (must be <= buf.length)
+   * @param addr The address to send to
+   * @param port The port to send to
+   *
+   * @since 1.2
+   */
   public DatagramPacket(byte[] buf, int offset, int length,
 	InetAddress address, int port)
   {
@@ -172,15 +171,15 @@ public final class DatagramPacket
     this.port = port;
   }
 
-/**
-  * Initializes a new instance of <code>DatagramPacket</code> for
-  * transmitting packets across the network.
-  *
-  * @param buf A buffer containing the data to send
-  * @param length The length of the buffer (must be <= buf.length)
-  * @param address The address to send to
-  * @param port The port to send to
-  */
+  /**
+   * Initializes a new instance of <code>DatagramPacket</code> for
+   * transmitting packets across the network.
+   *
+   * @param buf A buffer containing the data to send
+   * @param length The length of the buffer (must be <= buf.length)
+   * @param address The address to send to
+   * @param port The port to send to
+   */
   public DatagramPacket(byte[] buf, int length, InetAddress address, int port)
   {
     this(buf, 0, length, address, port);
@@ -196,10 +195,12 @@ public final class DatagramPacket
    * @param address The socket address to send to
    *
    * @exception SocketException If an error occurs
+   * @exception IllegalArgumentException If address type is not supported
    *
    * @since 1.4
    */
-  public DatagramPacket(byte[] buf, int offset, int length, SocketAddress address)
+  public DatagramPacket(byte[] buf, int offset, int length,
+		        SocketAddress address)
      throws SocketException
   {
     this(buf, offset, length, ((InetSocketAddress)address).getAddress(),
@@ -215,6 +216,7 @@ public final class DatagramPacket
    * @param address The socket address to send to
    *
    * @exception SocketException If an error occurs
+   * @exception IllegalArgumentException If address type is not supported
    *
    * @since 1.4
    */
@@ -225,74 +227,74 @@ public final class DatagramPacket
          ((InetSocketAddress)address).getPort());
   }
 
-/**
-  * Returns the address that this packet is being sent to or, if it was used
-  * to receive a packet, the address that is was received from.  If the
-  * constructor that doesn not take an address was used to create this object
-  * and no packet was actually read into this object, then this method
-  * returns <code>null</code>.
-  *
-  * @return The address for this packet.
-  */
+  /**
+   * Returns the address that this packet is being sent to or, if it was used
+   * to receive a packet, the address that is was received from.  If the
+   * constructor that doesn not take an address was used to create this object
+   * and no packet was actually read into this object, then this method
+   * returns <code>null</code>.
+   *
+   * @return The address for this packet.
+   */
   public synchronized InetAddress getAddress()
   {
     return address;
   }
 
-/**
-  * Returns the port number this packet is being sent to or, if it was used
-  * to receive a packet, the port that it was received from. If the
-  * constructor that doesn not take an address was used to create this object
-  * and no packet was actually read into this object, then this method
-  * will return 0.
-  *
-  * @return The port number for this packet
-  */
+  /**
+   * Returns the port number this packet is being sent to or, if it was used
+   * to receive a packet, the port that it was received from. If the
+   * constructor that doesn not take an address was used to create this object
+   * and no packet was actually read into this object, then this method
+   * will return 0.
+   *
+   * @return The port number for this packet
+   */
   public synchronized int getPort()
   {
     return port;
   }
 
-/**
-  * Returns the data buffer for this packet
-  *
-  * @return This packet's data buffer
-  */
+  /**
+   * Returns the data buffer for this packet
+   *
+   * @return This packet's data buffer
+   */
   public synchronized byte[] getData()
   {
     return buffer;
   }
 
-/**
-  * This method returns the current offset value into the data buffer
-  * where data will be sent from.
-  *
-  * @return The buffer offset.
-  *
-  * @since 1.2
-  */
+  /**
+   * This method returns the current offset value into the data buffer
+   * where data will be sent from.
+   *
+   * @return The buffer offset.
+   *
+   * @since 1.2
+   */
   public synchronized int getOffset()
   {
     return offset;
   }
 
-/**
-  * Returns the length of the data in the buffer
-  *
-  * @return The length of the data
-  */
+  /**
+   * Returns the length of the data in the buffer
+   *
+   * @return The length of the data
+   */
   public synchronized int getLength()
   {
     return length;
   }
 
-/**
-  * This sets the address to which the data packet will be transmitted.
-  *
-  * @param addr The destination address
-  *
-  * @since 1.1
-  */
+  /**
+   * This sets the address to which the data packet will be transmitted.
+   *
+   * @param addr The destination address
+   *
+   * @since 1.1
+   */
   public synchronized void setAddress(InetAddress iaddr)
   {
     if (iaddr == null)
@@ -301,13 +303,13 @@ public final class DatagramPacket
     address = iaddr;
   }
 
-/**
-  * This sets the port to which the data packet will be transmitted.
-  *
-  * @param port The destination port
-  *
-  * @since 1.1
-  */
+  /**
+   * This sets the port to which the data packet will be transmitted.
+   *
+   * @param port The destination port
+   *
+   * @since 1.1
+   */
   public synchronized void setPort(int iport)
   {
     if (iport < 0 || iport > 65535)
@@ -321,7 +323,7 @@ public final class DatagramPacket
    *
    * @param address The socket address of the remove host
    *
-   * @exception IllegalArgumentException If an error occurs
+   * @exception IllegalArgumentException If address type is not supported
    *
    * @since 1.4
    */
@@ -348,13 +350,15 @@ public final class DatagramPacket
     return new InetSocketAddress (address, port);
   }
 
-/**
-  * Sets the data buffer for this packet.
-  *
-  * @param buf The new buffer for this packet
-  *
-  * @since 1.1
-  */
+  /**
+   * Sets the data buffer for this packet.
+   *
+   * @param buf The new buffer for this packet
+   *
+   * @exception NullPointerException If the argument is null
+   *
+   * @since 1.1
+   */
   public synchronized void setData(byte[] buf)
   {
     // This form of setData requires setLength to be called separately
@@ -365,15 +369,17 @@ public final class DatagramPacket
     buffer = buf;
   }
 
-/**
-  * This method sets the data buffer for the packet.
-  *
-  * @param buf The byte array containing the data for this packet.
-  * @param offset The offset into the buffer to start reading data from.
-  * @param length The number of bytes of data in the buffer.
-  *
-  * @since 1.2
-  */
+  /**
+   * This method sets the data buffer for the packet.
+   *
+   * @param buf The byte array containing the data for this packet.
+   * @param offset The offset into the buffer to start reading data from.
+   * @param length The number of bytes of data in the buffer.
+   *
+   * @exception NullPointerException If the argument is null
+   *
+   * @since 1.2
+   */
   public synchronized void setData(byte[] buf, int offset, int length)
   {
     // This form of setData must be used if offset is to be changed.
@@ -393,13 +399,16 @@ public final class DatagramPacket
     this.length = length;
   }
 
-/**
-  * Sets the length of the data in the buffer. 
-  *
-  * @param length The new length.  (Where len <= buf.length)
-  *
-  * @since 1.1
-  */
+  /**
+   * Sets the length of the data in the buffer. 
+   *
+   * @param length The new length.  (Where len &lt;= buf.length)
+   *
+   * @exception IllegalArgumentException If the length is negative or
+   * if the length is greater than the packet's data buffer length
+   *
+   * @since 1.1
+   */
   public synchronized void setLength(int length)
   {
     if (length < 0)
diff --git a/java/rmi/activation/ActivationDesc.java b/java/rmi/activation/ActivationDesc.java
index 0e4216a82..b0f22aae7 100644
--- a/java/rmi/activation/ActivationDesc.java
+++ b/java/rmi/activation/ActivationDesc.java
@@ -40,8 +40,9 @@ package java.rmi.activation;
 import java.io.Serializable;
 import java.rmi.MarshalledObject;
 
-public final class ActivationDesc
-	implements Serializable {
+public final class ActivationDesc implements Serializable
+{
+  static final long serialVersionUID = 7455834104417690957L;
 
 private ActivationGroupID groupid;
 private String classname;
diff --git a/java/rmi/activation/ActivationGroupDesc.java b/java/rmi/activation/ActivationGroupDesc.java
index da61fccc9..1c627e4d7 100644
--- a/java/rmi/activation/ActivationGroupDesc.java
+++ b/java/rmi/activation/ActivationGroupDesc.java
@@ -41,8 +41,9 @@ import java.io.Serializable;
 import java.util.Properties;
 import java.rmi.MarshalledObject;
 
-public final class ActivationGroupDesc
-	implements Serializable {
+public final class ActivationGroupDesc implements Serializable
+{
+  static final long serialVersionUID = -4936225423168276595L;
 
 public static class CommandEnvironment
 	implements Serializable {
diff --git a/java/rmi/activation/ActivationGroupID.java b/java/rmi/activation/ActivationGroupID.java
index 9ce81609f..9fff53bb7 100644
--- a/java/rmi/activation/ActivationGroupID.java
+++ b/java/rmi/activation/ActivationGroupID.java
@@ -39,8 +39,9 @@ package java.rmi.activation;
 
 import java.io.Serializable;
 
-public class ActivationGroupID
-	implements Serializable {
+public class ActivationGroupID implements Serializable
+{
+  static final long serialVersionUID = -1648432278909740833L;
 
 private ActivationSystem system;
 
diff --git a/java/rmi/activation/ActivationID.java b/java/rmi/activation/ActivationID.java
index 4f1951ef3..62bd7763b 100644
--- a/java/rmi/activation/ActivationID.java
+++ b/java/rmi/activation/ActivationID.java
@@ -41,8 +41,9 @@ import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-public class ActivationID
-	implements Serializable {
+public class ActivationID implements Serializable
+{
+  static final long serialVersionUID = -4608673054848209235L;
 
 private Activator activator;
 
diff --git a/java/security/Identity.java b/java/security/Identity.java
index 4230eb06a..a1af11273 100644
--- a/java/security/Identity.java
+++ b/java/security/Identity.java
@@ -64,6 +64,8 @@ import java.util.Vector;
  */
 public abstract class Identity implements Principal, Serializable
 {
+  static final long serialVersionUID = 3609922007826600659L;
+
   private String name;
   private IdentityScope scope;
   private PublicKey publicKey;
diff --git a/java/security/KeyPair.java b/java/security/KeyPair.java
index c6ba61d4c..c502add50 100644
--- a/java/security/KeyPair.java
+++ b/java/security/KeyPair.java
@@ -48,6 +48,8 @@ import java.io.Serializable;
  */
 public final class KeyPair implements Serializable
 {
+  static final long serialVersionUID = -7565189502268009837L;
+
   private PublicKey publicKey;
   private PrivateKey privateKey;
 
diff --git a/java/security/Provider.java b/java/security/Provider.java
index a1a9654b6..d3e358189 100644
--- a/java/security/Provider.java
+++ b/java/security/Provider.java
@@ -56,6 +56,8 @@ import java.util.Properties;
  */
 public abstract class Provider extends Properties implements Serializable
 {
+  static final long serialVersionUID = -4298000515446427739L;
+
   /**
    * This is a textual description of the provider
    */
diff --git a/java/security/SecureRandom.java b/java/security/SecureRandom.java
index 063c6c1c1..31701cb6f 100644
--- a/java/security/SecureRandom.java
+++ b/java/security/SecureRandom.java
@@ -49,6 +49,8 @@ import java.util.Enumeration;
  */
 public class SecureRandom extends Random
 {
+  static final long serialVersionUID = 4940670005562187L;
+
   //Serialized Field
   long counter = 0;		//Serialized
   MessageDigest digest = null;
diff --git a/java/security/SecureRandomSpi.java b/java/security/SecureRandomSpi.java
index a311b8fe5..1586994d5 100644
--- a/java/security/SecureRandomSpi.java
+++ b/java/security/SecureRandomSpi.java
@@ -50,6 +50,8 @@ import java.io.Serializable;
  */
 public abstract class SecureRandomSpi implements Serializable
 {
+  static final long serialVersionUID = -2991854161009191830L;
+
   /**
      Default Constructor for SecureRandomSpi
    */
diff --git a/java/security/SignedObject.java b/java/security/SignedObject.java
index 93a99e51a..78684e57e 100644
--- a/java/security/SignedObject.java
+++ b/java/security/SignedObject.java
@@ -79,6 +79,8 @@ import java.io.Serializable;
  */
 public final class SignedObject implements Serializable
 {
+  static final long serialVersionUID = 720502720485447167L;
+
   private byte[] content;
   private byte[] signature;
   private String thealgorithm;
diff --git a/java/security/cert/Certificate.java b/java/security/cert/Certificate.java
index 221b2d7f8..25e8aadf1 100644
--- a/java/security/cert/Certificate.java
+++ b/java/security/cert/Certificate.java
@@ -69,7 +69,8 @@ import java.io.ObjectStreamException;
 */
 public abstract class Certificate
 {
-
+  static final long serialVersionUID = -6751606818319535583L;
+	
   private String type;
   /**
      Constructs a new certificate of the specified type. An example
diff --git a/java/text/Format.java b/java/text/Format.java
index fa7ddbbf4..804ef43ff 100644
--- a/java/text/Format.java
+++ b/java/text/Format.java
@@ -59,6 +59,8 @@ import java.io.Serializable;
  */
 public abstract class Format implements Serializable, Cloneable
 {
+  static final long serialVersionUID = -299282585814624189L;
+
   /**
    * This method initializes a new instance of <code>Format</code>.
    * It performs no actions, but acts as a default constructor for
diff --git a/java/util/prefs/BackingStoreException.java b/java/util/prefs/BackingStoreException.java
index 280726d9c..f2c6b4c8b 100644
--- a/java/util/prefs/BackingStoreException.java
+++ b/java/util/prefs/BackingStoreException.java
@@ -58,6 +58,8 @@ import java.io.NotSerializableException;
  */
 public class BackingStoreException extends Exception
 {
+  static final long serialVersionUID = 859796500401108469L;
+
   /**
    * Creates a new exception with a descriptive message.
    *
diff --git a/java/util/prefs/InvalidPreferencesFormatException.java b/java/util/prefs/InvalidPreferencesFormatException.java
index f774e1817..e375db7ab 100644
--- a/java/util/prefs/InvalidPreferencesFormatException.java
+++ b/java/util/prefs/InvalidPreferencesFormatException.java
@@ -57,6 +57,8 @@ import java.io.NotSerializableException;
  */
 public class InvalidPreferencesFormatException extends Exception
 {
+  static final long serialVersionUID = -791715184232119669L;
+
   /**
    * Creates a new exception with a descriptive message. The cause remains
    * uninitialized.
diff --git a/javax/naming/BinaryRefAddr.java b/javax/naming/BinaryRefAddr.java
index d0a3a030f..793552a9e 100644
--- a/javax/naming/BinaryRefAddr.java
+++ b/javax/naming/BinaryRefAddr.java
@@ -50,7 +50,8 @@ import java.util.Arrays;
  */
 public class BinaryRefAddr extends RefAddr
 {
-
+  static final long serialVersionUID = -3415254970957330361L;
+	
   /**
    * The possibly null content of this RefAddr.
    * Set by the constructor and returned by getContent.
diff --git a/javax/naming/Name.java b/javax/naming/Name.java
index 7c3e6d7ef..4a10f321f 100644
--- a/javax/naming/Name.java
+++ b/javax/naming/Name.java
@@ -62,6 +62,8 @@ import java.io.Serializable;
  */
 public interface Name extends Cloneable, Serializable
 {
+  static final long serialVersionUID = -3617482732056931635L;
+
   /**
    * Returns the number of components of this <code>Name</code>.
    * The returned number can be zero.
diff --git a/javax/swing/AbstractAction.java b/javax/swing/AbstractAction.java
index fb81c503b..cf9308d06 100644
--- a/javax/swing/AbstractAction.java
+++ b/javax/swing/AbstractAction.java
@@ -49,7 +49,10 @@ import java.util.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public abstract class AbstractAction implements Action, Cloneable, Serializable {
+public abstract class AbstractAction
+  implements Action, Cloneable, Serializable
+{
+  static final long serialVersionUID = -6803159439231523484L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/AbstractCellEditor.java b/javax/swing/AbstractCellEditor.java
index 098aa9901..e25e97b18 100644
--- a/javax/swing/AbstractCellEditor.java
+++ b/javax/swing/AbstractCellEditor.java
@@ -47,7 +47,10 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public abstract class AbstractCellEditor implements CellEditor, Serializable {
+public abstract class AbstractCellEditor
+  implements CellEditor, Serializable
+{
+  static final long serialVersionUID = -1048006551406220959L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/AbstractListModel.java b/javax/swing/AbstractListModel.java
index 13518cafa..a85bed39d 100644
--- a/javax/swing/AbstractListModel.java
+++ b/javax/swing/AbstractListModel.java
@@ -48,7 +48,10 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public abstract class AbstractListModel implements ListModel, Serializable {
+public abstract class AbstractListModel
+  implements ListModel, Serializable
+{
+  static final long serialVersionUID = -3285184064379168730L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/ActionMap.java b/javax/swing/ActionMap.java
index b95144de4..ea9e0aa36 100644
--- a/javax/swing/ActionMap.java
+++ b/javax/swing/ActionMap.java
@@ -46,7 +46,9 @@ import java.util.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class ActionMap implements Serializable {
+public class ActionMap implements Serializable
+{
+  static final long serialVersionUID = -6277518704513986346L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/ButtonGroup.java b/javax/swing/ButtonGroup.java
index 2301e5194..502d08409 100644
--- a/javax/swing/ButtonGroup.java
+++ b/javax/swing/ButtonGroup.java
@@ -44,6 +44,8 @@ import javax.swing.event.*;
 
 public class ButtonGroup implements Serializable 
 {
+  static final long serialVersionUID = 4259076101881721375L;
+
     Vector v = new Vector();
     ButtonModel sel;
     
diff --git a/javax/swing/DefaultBoundedRangeModel.java b/javax/swing/DefaultBoundedRangeModel.java
index 82ab76758..dbf5f7e19 100644
--- a/javax/swing/DefaultBoundedRangeModel.java
+++ b/javax/swing/DefaultBoundedRangeModel.java
@@ -47,7 +47,10 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class DefaultBoundedRangeModel implements BoundedRangeModel, Serializable {
+public class DefaultBoundedRangeModel
+  implements BoundedRangeModel, Serializable
+{
+  static final long serialVersionUID = 5034068491295259790L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/DefaultButtonModel.java b/javax/swing/DefaultButtonModel.java
index 1dc0c8c97..9d6f4089d 100644
--- a/javax/swing/DefaultButtonModel.java
+++ b/javax/swing/DefaultButtonModel.java
@@ -42,9 +42,11 @@ import java.awt.event.*;
 import java.awt.*;
 import javax.swing.event.*;
 
-public 
-class DefaultButtonModel implements ButtonModel, java.io.Serializable
+public class DefaultButtonModel
+  implements ButtonModel, java.io.Serializable
 {
+  static final long serialVersionUID = -5342609566534980231L;
+
     Vector actions          = new Vector();
 
     Vector items    = new Vector();
diff --git a/javax/swing/DefaultCellEditor.java b/javax/swing/DefaultCellEditor.java
index 3f9442e08..5e35701ff 100644
--- a/javax/swing/DefaultCellEditor.java
+++ b/javax/swing/DefaultCellEditor.java
@@ -50,7 +50,11 @@ import javax.swing.tree.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class DefaultCellEditor extends AbstractCellEditor implements TableCellEditor, TreeCellEditor {
+public class DefaultCellEditor
+  extends AbstractCellEditor
+  implements TableCellEditor, TreeCellEditor
+{
+  static final long serialVersionUID = 3564035141373880027L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/javax/swing/DefaultComboBoxModel.java b/javax/swing/DefaultComboBoxModel.java
index 2ceb15a65..5c8361a2d 100644
--- a/javax/swing/DefaultComboBoxModel.java
+++ b/javax/swing/DefaultComboBoxModel.java
@@ -47,7 +47,9 @@ import java.util.*;
  * @version	1.0
  */
 public class DefaultComboBoxModel extends AbstractListModel 
-		implements MutableComboBoxModel, Serializable {
+		implements MutableComboBoxModel, Serializable
+{
+  static final long serialVersionUID = 6698657703676921904L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/DefaultDesktopManager.java b/javax/swing/DefaultDesktopManager.java
index 5581e580c..132fb6192 100644
--- a/javax/swing/DefaultDesktopManager.java
+++ b/javax/swing/DefaultDesktopManager.java
@@ -46,7 +46,9 @@ import java.io.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class DefaultDesktopManager implements DesktopManager, Serializable {
+public class DefaultDesktopManager implements DesktopManager, Serializable
+{
+  static final long serialVersionUID = 4657624909838017887L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/DefaultListCellRenderer.java b/javax/swing/DefaultListCellRenderer.java
index c6f8809e7..204c4ec23 100644
--- a/javax/swing/DefaultListCellRenderer.java
+++ b/javax/swing/DefaultListCellRenderer.java
@@ -49,7 +49,9 @@ import javax.swing.plaf.*;
  * @version	1.0
  */
 public class DefaultListCellRenderer extends JLabel 
-		implements ListCellRenderer, Serializable {
+		implements ListCellRenderer, Serializable
+{
+  static final long serialVersionUID = 7708947179685189462L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/javax/swing/DefaultSingleSelectionModel.java b/javax/swing/DefaultSingleSelectionModel.java
index 50a35d9d9..2c24d5ee0 100644
--- a/javax/swing/DefaultSingleSelectionModel.java
+++ b/javax/swing/DefaultSingleSelectionModel.java
@@ -48,7 +48,9 @@ import javax.swing.event.*;
  * @version	1.0
  */
 public class DefaultSingleSelectionModel implements 
-		SingleSelectionModel, Serializable {
+		SingleSelectionModel, Serializable
+{
+  static final long serialVersionUID = 3676229404753786004L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/InputMap.java b/javax/swing/InputMap.java
index 9f81121c5..861fe57ea 100644
--- a/javax/swing/InputMap.java
+++ b/javax/swing/InputMap.java
@@ -46,7 +46,9 @@ import java.io.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class InputMap implements Serializable {
+public class InputMap implements Serializable
+{
+  static final long serialVersionUID = -5429059542008604257L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index fad7b6cb2..119e38591 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -61,6 +61,7 @@ import javax.accessibility.*;
  */
 public abstract class JComponent extends Container implements Serializable
 {
+  static final long serialVersionUID = -5242478962609715464L;
         /**
          * accessibleContext
          */
diff --git a/javax/swing/JMenu.java b/javax/swing/JMenu.java
index 0d4d86863..961d8025e 100644
--- a/javax/swing/JMenu.java
+++ b/javax/swing/JMenu.java
@@ -51,7 +51,11 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JMenu extends JMenuItem implements Accessible, MenuElement {
+public class JMenu
+  extends JMenuItem
+  implements Accessible, MenuElement
+{
+  static final long serialVersionUID = 4227225638931828014L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/javax/swing/JSlider.java b/javax/swing/JSlider.java
index e0588288d..58475b67f 100644
--- a/javax/swing/JSlider.java
+++ b/javax/swing/JSlider.java
@@ -49,7 +49,11 @@ import javax.swing.plaf.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JSlider extends JComponent implements SwingConstants, Accessible {
+public class JSlider
+  extends JComponent
+  implements SwingConstants, Accessible
+{
+  static final long serialVersionUID = -1441275936141218479L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/javax/swing/KeyStroke.java b/javax/swing/KeyStroke.java
index b2687cdc1..7fe06995a 100644
--- a/javax/swing/KeyStroke.java
+++ b/javax/swing/KeyStroke.java
@@ -46,7 +46,9 @@ import java.io.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class KeyStroke implements Serializable {
+public class KeyStroke implements Serializable
+{
+  static final long serialVersionUID = -9060180771037902530L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/OverlayLayout.java b/javax/swing/OverlayLayout.java
index a238a436a..4698e10bf 100644
--- a/javax/swing/OverlayLayout.java
+++ b/javax/swing/OverlayLayout.java
@@ -46,7 +46,10 @@ import java.io.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class OverlayLayout implements LayoutManager2, Serializable {
+public class OverlayLayout
+  implements LayoutManager2, Serializable
+{
+  static final long serialVersionUID = 18082829169631543L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/ScrollPaneLayout.java b/javax/swing/ScrollPaneLayout.java
index 503113e45..bd65471d0 100644
--- a/javax/swing/ScrollPaneLayout.java
+++ b/javax/swing/ScrollPaneLayout.java
@@ -47,7 +47,10 @@ import javax.swing.plaf.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class ScrollPaneLayout implements LayoutManager, ScrollPaneConstants, Serializable {
+public class ScrollPaneLayout
+  implements LayoutManager, ScrollPaneConstants, Serializable
+{
+  static final long serialVersionUID = -4480022884523193743L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/javax/swing/SizeRequirements.java b/javax/swing/SizeRequirements.java
index 4b5edf56a..da6d1129d 100644
--- a/javax/swing/SizeRequirements.java
+++ b/javax/swing/SizeRequirements.java
@@ -45,7 +45,9 @@ import java.io.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class SizeRequirements implements Serializable {
+public class SizeRequirements implements Serializable
+{
+  static final long serialVersionUID = 9217749429906736553L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/UIManager.java b/javax/swing/UIManager.java
index 18eebe358..8feaccf30 100644
--- a/javax/swing/UIManager.java
+++ b/javax/swing/UIManager.java
@@ -51,6 +51,8 @@ import java.beans.*;
 
 public class UIManager implements Serializable
 {
+  static final long serialVersionUID = -5547433830339189365L;
+
     static class LookAndFeelInfo
     {
 	String name, clazz;
diff --git a/javax/swing/ViewportLayout.java b/javax/swing/ViewportLayout.java
index f5beb76db..f735fe620 100644
--- a/javax/swing/ViewportLayout.java
+++ b/javax/swing/ViewportLayout.java
@@ -46,7 +46,9 @@ import java.io.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class ViewportLayout implements LayoutManager, Serializable {
+public class ViewportLayout implements LayoutManager, Serializable
+{
+  static final long serialVersionUID = -788225906076097229L;
 
 	//-------------------------------------------------------------
 	// Initialization ---------------------------------------------
diff --git a/javax/swing/border/AbstractBorder.java b/javax/swing/border/AbstractBorder.java
index 971665414..d0285b33a 100644
--- a/javax/swing/border/AbstractBorder.java
+++ b/javax/swing/border/AbstractBorder.java
@@ -42,6 +42,8 @@ import java.awt.*;
 
 public abstract class AbstractBorder implements Border, Serializable
 {
+  static final long serialVersionUID = -545885975315191844L;
+
     AbstractBorder()
     {
     }
diff --git a/javax/swing/colorchooser/DefaultColorSelectionModel.java b/javax/swing/colorchooser/DefaultColorSelectionModel.java
index 74bf0642a..1df4e325e 100644
--- a/javax/swing/colorchooser/DefaultColorSelectionModel.java
+++ b/javax/swing/colorchooser/DefaultColorSelectionModel.java
@@ -48,7 +48,9 @@ import javax.swing.event.*;
  * @version	1.0
  */
 public class DefaultColorSelectionModel 
-		implements ColorSelectionModel, Serializable {
+  implements ColorSelectionModel, Serializable
+{
+  static final long serialVersionUID = 580150227676302096L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/event/EventListenerList.java b/javax/swing/event/EventListenerList.java
index 5017aa543..1197ccb35 100644
--- a/javax/swing/event/EventListenerList.java
+++ b/javax/swing/event/EventListenerList.java
@@ -45,8 +45,9 @@ import java.util.EventListener;
  * EventListenerList
  * @author Andrew Selkirk
  */
-public class EventListenerList	extends		Object
-								implements	Serializable {
+public class EventListenerList extends Object implements Serializable
+{
+  static final long serialVersionUID = -5677132037850737084L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/plaf/BorderUIResource.java b/javax/swing/plaf/BorderUIResource.java
index 2ec1fe59d..6e8a8291d 100644
--- a/javax/swing/plaf/BorderUIResource.java
+++ b/javax/swing/plaf/BorderUIResource.java
@@ -55,6 +55,8 @@ public class BorderUIResource
     extends Object 
     implements Border, UIResource, Serializable
 {
+  static final long serialVersionUID = -3440553684010079691L;
+
     private Border delegate;
 
     /**
diff --git a/javax/swing/plaf/IconUIResource.java b/javax/swing/plaf/IconUIResource.java
index a2db2122c..2d948d782 100644
--- a/javax/swing/plaf/IconUIResource.java
+++ b/javax/swing/plaf/IconUIResource.java
@@ -46,6 +46,8 @@ import javax.swing.Icon;
  */
 public class IconUIResource implements Icon, UIResource, Serializable
 {
+  static final long serialVersionUID = 3327049506004830542L;
+
   public IconUIResource(Icon delegate)
   {
   }
diff --git a/javax/swing/plaf/basic/BasicIconFactory.java b/javax/swing/plaf/basic/BasicIconFactory.java
index 9366cdc4c..3a8adf3bf 100644
--- a/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/javax/swing/plaf/basic/BasicIconFactory.java
@@ -45,6 +45,8 @@ import javax.swing.Icon;
  */
 public class BasicIconFactory implements Serializable
 {
+  static final long serialVersionUID = 5605588811185324383L;
+
   public BasicIconFactory()
   {
   }
diff --git a/javax/swing/plaf/basic/BasicLookAndFeel.java b/javax/swing/plaf/basic/BasicLookAndFeel.java
index 7655ea3b2..c9e0c798e 100644
--- a/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -64,6 +64,8 @@ import javax.swing.text.JTextComponent;
 public abstract class BasicLookAndFeel extends LookAndFeel
   implements Serializable
 {
+  static final long serialVersionUID = 5484702182266873258L;
+
   /**
    * Constructor BasicLookAndFeel
    */
diff --git a/javax/swing/table/AbstractTableModel.java b/javax/swing/table/AbstractTableModel.java
index 790568f88..08eeb829a 100644
--- a/javax/swing/table/AbstractTableModel.java
+++ b/javax/swing/table/AbstractTableModel.java
@@ -46,7 +46,9 @@ import javax.swing.event.*;
  * AbstractTableModel
  * @author Andrew Selkirk
  */
-public abstract class AbstractTableModel implements TableModel, Serializable {
+public abstract class AbstractTableModel implements TableModel, Serializable
+{
+  static final long serialVersionUID = -5798593159423650347L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/table/DefaultTableCellRenderer.java b/javax/swing/table/DefaultTableCellRenderer.java
index af4a02711..a7bcc5c36 100644
--- a/javax/swing/table/DefaultTableCellRenderer.java
+++ b/javax/swing/table/DefaultTableCellRenderer.java
@@ -47,6 +47,8 @@ import javax.swing.JTable;
 public class DefaultTableCellRenderer extends JLabel
   implements TableCellRenderer, Serializable
 {
+  static final long serialVersionUID = 7878911414715528324L;
+
   public static class UIResource extends DefaultTableCellRenderer
     implements javax.swing.plaf.UIResource
   {
diff --git a/javax/swing/table/DefaultTableColumnModel.java b/javax/swing/table/DefaultTableColumnModel.java
index 0ead6bd9e..9ab2fff81 100644
--- a/javax/swing/table/DefaultTableColumnModel.java
+++ b/javax/swing/table/DefaultTableColumnModel.java
@@ -49,7 +49,11 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class DefaultTableColumnModel implements TableColumnModel, PropertyChangeListener, ListSelectionListener, Serializable {
+public class DefaultTableColumnModel
+  implements TableColumnModel, PropertyChangeListener,
+             ListSelectionListener, Serializable
+{
+  static final long serialVersionUID = 6580012493508960512L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/table/DefaultTableModel.java b/javax/swing/table/DefaultTableModel.java
index 3815bb98c..158731085 100644
--- a/javax/swing/table/DefaultTableModel.java
+++ b/javax/swing/table/DefaultTableModel.java
@@ -46,7 +46,10 @@ import javax.swing.event.*;
  * DefaultTableModel
  * @author	Andrew Selkirk
  */
-public class DefaultTableModel extends AbstractTableModel implements Serializable {
+public class DefaultTableModel extends AbstractTableModel
+  implements Serializable
+{
+  static final long serialVersionUID = 6680042567037222321L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/table/TableColumn.java b/javax/swing/table/TableColumn.java
index 8be7c1923..f5ace6256 100644
--- a/javax/swing/table/TableColumn.java
+++ b/javax/swing/table/TableColumn.java
@@ -47,7 +47,9 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class TableColumn implements Serializable {
+public class TableColumn implements Serializable
+{
+  static final long serialVersionUID = -6113660025878112608L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/text/StyledEditorKit.java b/javax/swing/text/StyledEditorKit.java
index 84b27bd11..16af63045 100644
--- a/javax/swing/text/StyledEditorKit.java
+++ b/javax/swing/text/StyledEditorKit.java
@@ -50,7 +50,9 @@ import javax.swing.event.*;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class StyledEditorKit extends DefaultEditorKit {
+public class StyledEditorKit extends DefaultEditorKit
+{
+  static final long serialVersionUID = 7002391892985555948L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/javax/swing/tree/DefaultMutableTreeNode.java b/javax/swing/tree/DefaultMutableTreeNode.java
index 288b0edc1..0c2b5459f 100644
--- a/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/javax/swing/tree/DefaultMutableTreeNode.java
@@ -45,7 +45,10 @@ import java.util.*;
  * DefaultMutableTreeNode
  * @author Andrew Selkirk
  */
-public class DefaultMutableTreeNode implements Cloneable, MutableTreeNode, Serializable {
+public class DefaultMutableTreeNode
+  implements Cloneable, MutableTreeNode, Serializable
+{
+  static final long serialVersionUID = -4298474751201349152L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/tree/DefaultTreeModel.java b/javax/swing/tree/DefaultTreeModel.java
index daf3f1100..d905be96c 100644
--- a/javax/swing/tree/DefaultTreeModel.java
+++ b/javax/swing/tree/DefaultTreeModel.java
@@ -46,7 +46,9 @@ import javax.swing.event.*;
  * DefaultTreeModel
  * @author Andrew Selkirk
  */
-public class DefaultTreeModel implements Serializable, TreeModel {
+public class DefaultTreeModel implements Serializable, TreeModel
+{
+  static final long serialVersionUID = -2621068368932566998L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/tree/DefaultTreeSelectionModel.java b/javax/swing/tree/DefaultTreeSelectionModel.java
index f772c188c..9b5358241 100644
--- a/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -48,7 +48,10 @@ import javax.swing.event.*;
  * DefaultTreeSelectionModel
  * @author Andrew Selkirk
  */
-public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeSelectionModel {
+public class DefaultTreeSelectionModel
+  implements Cloneable, Serializable, TreeSelectionModel
+{
+  static final long serialVersionUID = 3288129636638950196L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/tree/TreePath.java b/javax/swing/tree/TreePath.java
index 56899cf92..77627db77 100644
--- a/javax/swing/tree/TreePath.java
+++ b/javax/swing/tree/TreePath.java
@@ -44,7 +44,9 @@ import java.io.*;
  * TreePath
  * @author Andrew Selkirk
  */
-public class TreePath implements Serializable {
+public class TreePath implements Serializable
+{
+  static final long serialVersionUID = 4380036194768077479L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/javax/swing/undo/AbstractUndoableEdit.java b/javax/swing/undo/AbstractUndoableEdit.java
index e98b87cb3..68ac132c0 100644
--- a/javax/swing/undo/AbstractUndoableEdit.java
+++ b/javax/swing/undo/AbstractUndoableEdit.java
@@ -44,9 +44,10 @@ import java.io.Serializable;
  * AbstractUndoableEdit
  * @author Andrew Selkirk
  */
-public class AbstractUndoableEdit	extends		Object
-									implements	UndoableEdit,
-												Serializable {
+public class AbstractUndoableEdit extends Object
+  implements UndoableEdit, Serializable
+{
+  static final long serialVersionUID = 580150227676302096L;
 
 	//-------------------------------------------------------------
 	// Constants --------------------------------------------------