Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.2455 diff -u -3 -p -u -r1.2455 ChangeLog --- ChangeLog 4 Sep 2004 21:14:05 -0000 1.2455 +++ ChangeLog 5 Sep 2004 01:31:13 -0000 @@ -1,3 +1,18 @@ +2004-09-05 Andrew John Hughes + + * java/awt/Canvas.java, java/awt/Label.java, + java/net/Inet4Address.java, java/text/Format.java, + javax/rmi/CORBA/Stub.java, + javax/security/auth/PrivateCredentialPermission.java, + javax/swing/Box.java, javax/swing/JInternalFrame.java, + javax/swing/JMenu.java, javax/swing/JRootPane.java, + javax/swing/JSpinner.java, javax/swing/JTabbedPane.java, + javax/swing/JToolTip.java, javax/swing/SpinnerListModel.java, + javax/swing/SpinnerNumberModel.java, + javax/swing/plaf/metal/MetalLookAndFeel.java + Added/fixed serial version UIDs and added missing accessibility + roles. + 2004-09-04 Graydon Hoare * javax/swing/Box.java: Fix setting of layout in ctor. Index: java/awt/Canvas.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Canvas.java,v retrieving revision 1.7 diff -u -3 -p -u -r1.7 Canvas.java --- java/awt/Canvas.java 24 Aug 2004 19:00:37 -0000 1.7 +++ java/awt/Canvas.java 5 Sep 2004 01:31:13 -0000 @@ -136,6 +136,10 @@ public class Canvas protected class AccessibleAWTCanvas extends AccessibleAWTComponent { + /** + * For compatability with Sun's JDK + */ + private static final long serialVersionUID = -6325592262103146699L; /** * Constructor for the accessible canvas. Index: java/awt/Label.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Label.java,v retrieving revision 1.13 diff -u -3 -p -u -r1.13 Label.java --- java/awt/Label.java 24 Aug 2004 19:00:37 -0000 1.13 +++ java/awt/Label.java 5 Sep 2004 01:31:13 -0000 @@ -259,6 +259,11 @@ protected class AccessibleAWTLabel extends AccessibleAWTComponent { /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = -3568967560160480438L; + + /** * Constructor for the accessible label. */ public AccessibleAWTLabel() Index: java/net/Inet4Address.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/net/Inet4Address.java,v retrieving revision 1.10 diff -u -3 -p -u -r1.10 Inet4Address.java --- java/net/Inet4Address.java 29 Apr 2004 21:16:42 -0000 1.10 +++ java/net/Inet4Address.java 5 Sep 2004 01:31:13 -0000 @@ -55,6 +55,9 @@ import java.util.Arrays; */ public final class Inet4Address extends InetAddress { + /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ static final long serialVersionUID = 3286316764910316507L; /** Index: java/text/Format.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/text/Format.java,v retrieving revision 1.11 diff -u -3 -p -u -r1.11 Format.java --- java/text/Format.java 28 Apr 2004 19:17:09 -0000 1.11 +++ java/text/Format.java 5 Sep 2004 01:31:14 -0000 @@ -60,6 +60,9 @@ import java.io.Serializable; */ public abstract class Format implements Serializable, Cloneable { + /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ static final long serialVersionUID = -299282585814624189L; public static class Field extends AttributedCharacterIterator.Attribute Index: javax/rmi/CORBA/Stub.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/Stub.java,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 Stub.java --- javax/rmi/CORBA/Stub.java 19 Apr 2004 12:01:42 -0000 1.3 +++ javax/rmi/CORBA/Stub.java 5 Sep 2004 01:31:14 -0000 @@ -50,6 +50,11 @@ import java.rmi.RemoteException; public abstract class Stub extends ObjectImpl implements Serializable { + /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = 1087775603798577179L; + private transient StubDelegate delegate; protected Stub() Index: javax/security/auth/PrivateCredentialPermission.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/security/auth/PrivateCredentialPermission.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 PrivateCredentialPermission.java --- javax/security/auth/PrivateCredentialPermission.java 14 Aug 2004 18:21:35 -0000 1.1 +++ javax/security/auth/PrivateCredentialPermission.java 5 Sep 2004 01:31:14 -0000 @@ -66,6 +66,10 @@ import java.util.StringTokenizer; public class PrivateCredentialPermission extends Permission implements Serializable { + /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = 5284372143517237068L; // Fields. // ------------------------------------------------------------------------- Index: javax/swing/Box.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/Box.java,v retrieving revision 1.12 diff -u -3 -p -u -r1.12 Box.java --- javax/swing/Box.java 4 Sep 2004 21:14:06 -0000 1.12 +++ javax/swing/Box.java 5 Sep 2004 01:31:14 -0000 @@ -70,7 +70,7 @@ public class Box extends JComponent impl public AccessibleRole getAccessibleRole() { - return null; + return AccessibleRole.SWING_COMPONENT; } } @@ -92,7 +92,7 @@ public class Box extends JComponent impl public AccessibleRole getAccessibleRole() { - return null; + return AccessibleRole.FILLER; } } Index: javax/swing/JInternalFrame.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JInternalFrame.java,v retrieving revision 1.6 diff -u -3 -p -u -r1.6 JInternalFrame.java --- javax/swing/JInternalFrame.java 30 Jul 2004 20:21:19 -0000 1.6 +++ javax/swing/JInternalFrame.java 5 Sep 2004 01:31:14 -0000 @@ -77,6 +77,11 @@ public class JInternalFrame extends JCom implements AccessibleValue { /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = 3053003332556893460L; + + /** * Creates a new AccessibleJInternalFrame object. */ protected AccessibleJInternalFrame() @@ -101,7 +106,7 @@ public class JInternalFrame extends JCom */ public AccessibleRole getAccessibleRole() { - return null; + return AccessibleRole.INTERNAL_FRAME; } /** @@ -163,12 +168,22 @@ public class JInternalFrame extends JCom public static class JDesktopIcon extends JComponent implements Accessible { /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = 4672973344731387687L; + + /** * DOCUMENT ME! */ protected class AccessibleJDesktopIcon extends AccessibleJComponent implements AccessibleValue { /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = -1262518205699484927L; + + /** * Creates a new AccessibleJDesktopIcon object. */ protected AccessibleJDesktopIcon() @@ -183,7 +198,7 @@ public class JInternalFrame extends JCom */ public AccessibleRole getAccessibleRole() { - return null; + return AccessibleRole.DESKTOP_ICON; } /** Index: javax/swing/JMenu.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JMenu.java,v retrieving revision 1.8 diff -u -3 -p -u -r1.8 JMenu.java --- javax/swing/JMenu.java 30 Jul 2004 20:21:19 -0000 1.8 +++ javax/swing/JMenu.java 5 Sep 2004 01:31:14 -0000 @@ -794,6 +794,11 @@ public class JMenu extends JMenuItem imp protected class AccessibleJMenu extends AccessibleJMenuItem implements AccessibleSelection { + /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = -8436441079037219095L; + protected AccessibleJMenu() { } Index: javax/swing/JRootPane.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v retrieving revision 1.12 diff -u -3 -p -u -r1.12 JRootPane.java --- javax/swing/JRootPane.java 30 Jul 2004 20:21:19 -0000 1.12 +++ javax/swing/JRootPane.java 5 Sep 2004 01:31:14 -0000 @@ -63,7 +63,9 @@ public class JRootPane extends JComponen // The class used to obtain the accessible role for this object. protected static class AccessibleJRootPane { - /** DOCUMENT ME! */ + /** + * For compatability with Sun's JDK + */ private static final long serialVersionUID = 1082432482784468088L; /** Index: javax/swing/JSpinner.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JSpinner.java,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 JSpinner.java --- javax/swing/JSpinner.java 4 Sep 2004 20:31:20 -0000 1.2 +++ javax/swing/JSpinner.java 5 Sep 2004 01:31:15 -0000 @@ -114,6 +114,11 @@ public class JSpinner extends JComponent LayoutManager { /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = -5317788736173368172L; + + /** * Creates a new DefaultEditor object. * * @param spinner DOCUMENT ME! @@ -215,6 +220,11 @@ public class JSpinner extends JComponent public static class NumberEditor extends DefaultEditor { /** + * For compatability with Sun's JDK + */ + private static final long serialVersionUID = 3791956183098282942L; + + /** * Creates a new NumberEditor object. * * @param spinner DOCUMENT ME! Index: javax/swing/JTabbedPane.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JTabbedPane.java,v retrieving revision 1.12 diff -u -3 -p -u -r1.12 JTabbedPane.java --- javax/swing/JTabbedPane.java 4 Sep 2004 20:31:20 -0000 1.12 +++ javax/swing/JTabbedPane.java 5 Sep 2004 01:31:15 -0000 @@ -73,6 +73,11 @@ public class JTabbedPane extends JCompon SwingConstants { /** + * For compatability with Sun's JDK + */ + private static final long serialVersionUID = 1614381073220130939L; + + /** * DOCUMENT ME! */ protected class AccessibleJTabbedPane extends JComponent.AccessibleJComponent Index: javax/swing/JToolTip.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JToolTip.java,v retrieving revision 1.7 diff -u -3 -p -u -r1.7 JToolTip.java --- javax/swing/JToolTip.java 31 Jul 2004 15:24:02 -0000 1.7 +++ javax/swing/JToolTip.java 5 Sep 2004 01:31:15 -0000 @@ -51,7 +51,9 @@ import javax.swing.plaf.ToolTipUI; */ public class JToolTip extends JComponent implements Accessible { - /** DOCUMENT ME! */ + /** + * For compatability with Sun's JDK + */ private static final long serialVersionUID = -1138929898906751643L; /** @@ -60,6 +62,11 @@ public class JToolTip extends JComponent protected class AccessibleJToolTip extends AccessibleJComponent { /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = -9198131930750121779L; + + /** * Creates a new AccessibleJToolTip object. */ protected AccessibleJToolTip() @@ -83,7 +90,7 @@ public class JToolTip extends JComponent */ public AccessibleRole getAccessibleRole() { - return null; + return AccessibleRole.TOOL_TIP; } } Index: javax/swing/SpinnerListModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/SpinnerListModel.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 SpinnerListModel.java --- javax/swing/SpinnerListModel.java 18 Aug 2004 22:58:40 -0000 1.1 +++ javax/swing/SpinnerListModel.java 5 Sep 2004 01:31:15 -0000 @@ -71,9 +71,9 @@ public class SpinnerListModel implements Serializable { /** - * FIXME: SpinnerListModel needs same serial version as JDK + * For compatability with Sun's JDK */ - // private static final long serialVersionUID = L; + private static final long serialVersionUID = 3358804052191994516L; /** * The backing list for this model. Index: javax/swing/SpinnerNumberModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/SpinnerNumberModel.java,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 SpinnerNumberModel.java --- javax/swing/SpinnerNumberModel.java 4 Sep 2004 20:31:20 -0000 1.2 +++ javax/swing/SpinnerNumberModel.java 5 Sep 2004 01:31:15 -0000 @@ -45,6 +45,11 @@ package javax.swing; */ public class SpinnerNumberModel extends AbstractSpinnerModel { + /** + * For compatability with Sun's JDK + */ + private static final long serialVersionUID = 7279176385485777821L; + /** DOCUMENT ME! */ private Number value; Index: javax/swing/plaf/metal/MetalLookAndFeel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v retrieving revision 1.6 diff -u -3 -p -u -r1.6 MetalLookAndFeel.java --- javax/swing/plaf/metal/MetalLookAndFeel.java 14 Feb 2004 21:42:56 -0000 1.6 +++ javax/swing/plaf/metal/MetalLookAndFeel.java 5 Sep 2004 01:31:15 -0000 @@ -44,6 +44,11 @@ import javax.swing.plaf.basic.BasicLookA public class MetalLookAndFeel extends BasicLookAndFeel { + /** + * For compatability with Sun's JDK 1.4.2 rev. 5 + */ + private static final long serialVersionUID = 6680646159193457980L; + public boolean isNativeLookAndFeel() { return true; } public boolean isSupportedLookAndFeel() { return true; } public String getDescription() { return "Metal look and feel"; }