I'm checking this in. I saw a bunch of AWT accessibility serialization reports in japi, so I went through and fixed them all. There was only one case where a change other than simply adding serialVersionUID was needed.
BTW I noticed this in List.java: // FIXME: Need read/writeObject IMO it would be better if we at least made an attempt to conform to the correct serialized form before setting serialVersionUID in a class. Clearly we're going to need to be running that mauve serialization test suite ... anybody have that set up? Tom Index: ChangeLog from Tom Tromey <[EMAIL PROTECTED]> * java/awt/PopupMenu.java (AccessibleAWTPopupMenu.serialVersionUID): New field. * java/awt/TextField.java (AccessibleAWTTextField.serialVersionUID): New field. * java/awt/TextArea.java (AccessibleAWTTextArea.serialVersionUID): New field. * java/awt/Menu.java (AccessibleAWTMenu.serialVersionUID): New field. * java/awt/CheckboxMenuItem.java (AccessibleAWTCheckboxMenuItem.serialVersionUID): New field. * java/awt/TextComponent.java (AccessibleAWTTextComponent.serialVersionUID): New field. * java/awt/MenuItem.java (AccessibleAWTMenuItem.serialVersionUID): New field. * java/awt/Frame.java (AccessibleAWTFrame.serialVersionUID): New field. * java/awt/Dialog.java (AccessibleAWTDialog.serialVersionUID): New field. * java/awt/Button.java (AccessibleAWTButton.serialVersionUID): New field. * java/awt/Window.java (AccessibleAWTWindow.serialVersionUID): New field. * java/awt/ScrollPane.java (AccessibleAWTScrollPane.serialVersionUID): New field. * java/awt/List.java (AccessibleAWTList.serialVersionUID): New field. (AccessibleAWTListChild.serialVersionUID): Likewise. (AccessibleAWTListChild.parent): Moved earlier. (AccessibleAWTListChild.indexInParent): Renamed. Index: java/awt/Button.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Button.java,v retrieving revision 1.23 diff -u -r1.23 Button.java --- java/awt/Button.java 2 Jul 2005 20:32:23 -0000 1.23 +++ java/awt/Button.java 20 Sep 2005 01:01:18 -0000 @@ -98,6 +98,8 @@ protected class AccessibleAWTButton extends AccessibleAWTComponent implements AccessibleAction, AccessibleValue { + public static final long serialVersionUID = -5932203980244017102L; + protected AccessibleAWTButton() { // Do nothing here. Index: java/awt/CheckboxMenuItem.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/CheckboxMenuItem.java,v retrieving revision 1.20 diff -u -r1.20 CheckboxMenuItem.java --- java/awt/CheckboxMenuItem.java 2 Jul 2005 20:32:23 -0000 1.20 +++ java/awt/CheckboxMenuItem.java 20 Sep 2005 01:01:18 -0000 @@ -335,6 +335,8 @@ implements AccessibleAction, AccessibleValue { // I think the base class provides the necessary implementation + + private static final long serialVersionUID = -1122642964303476L; } /** Index: java/awt/Dialog.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Dialog.java,v retrieving revision 1.22 diff -u -r1.22 Dialog.java --- java/awt/Dialog.java 2 Jul 2005 20:32:24 -0000 1.22 +++ java/awt/Dialog.java 20 Sep 2005 01:01:18 -0000 @@ -519,6 +519,8 @@ protected class AccessibleAWTDialog extends AccessibleAWTWindow { + private static final long serialVersionUID = 4837230331833941201L; + public AccessibleRole getAccessibleRole() { return AccessibleRole.DIALOG; Index: java/awt/Frame.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Frame.java,v retrieving revision 1.33 diff -u -r1.33 Frame.java --- java/awt/Frame.java 15 Aug 2005 18:32:38 -0000 1.33 +++ java/awt/Frame.java 20 Sep 2005 01:01:18 -0000 @@ -591,6 +591,8 @@ protected class AccessibleAWTFrame extends AccessibleAWTWindow { + private static final long serialVersionUID = -6172960752956030250L; + public AccessibleRole getAccessibleRole() { return AccessibleRole.FRAME; Index: java/awt/List.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/List.java,v retrieving revision 1.24 diff -u -r1.24 List.java --- java/awt/List.java 23 Jul 2005 15:47:46 -0000 1.24 +++ java/awt/List.java 20 Sep 2005 01:01:18 -0000 @@ -1088,18 +1088,23 @@ protected class AccessibleAWTList extends AccessibleAWTComponent implements AccessibleSelection, ItemListener, ActionListener { + private static final long serialVersionUID = 7924617370136012829L; + protected class AccessibleAWTListChild extends AccessibleAWTComponent implements Accessible { - private int index; + private static final long serialVersionUID = 4412022926028300317L; + + // Field names are fixed by serialization spec. private List parent; + private int indexInParent; public AccessibleAWTListChild(List parent, int indexInParent) { this.parent = parent; - index = indexInParent; + this.indexInParent = indexInParent; if (parent == null) - index = -1; + this.indexInParent = -1; } /* (non-Javadoc) @@ -1118,14 +1123,14 @@ public AccessibleStateSet getAccessibleStateSet() { AccessibleStateSet states = super.getAccessibleStateSet(); - if (parent.isIndexSelected(index)) + if (parent.isIndexSelected(indexInParent)) states.add(AccessibleState.SELECTED); return states; } public int getAccessibleIndexInParent() { - return index; + return indexInParent; } } Index: java/awt/Menu.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Menu.java,v retrieving revision 1.20 diff -u -r1.20 Menu.java --- java/awt/Menu.java 2 Jul 2005 20:32:25 -0000 1.20 +++ java/awt/Menu.java 20 Sep 2005 01:01:18 -0000 @@ -441,6 +441,8 @@ */ protected class AccessibleAWTMenu extends AccessibleAWTMenuItem { + private static final long serialVersionUID = 5228160894980069094L; + protected AccessibleAWTMenu() { } Index: java/awt/MenuItem.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/MenuItem.java,v retrieving revision 1.25 diff -u -r1.25 MenuItem.java --- java/awt/MenuItem.java 27 Jul 2005 09:15:11 -0000 1.25 +++ java/awt/MenuItem.java 20 Sep 2005 01:01:19 -0000 @@ -108,6 +108,8 @@ extends MenuComponent.AccessibleAWTMenuComponent implements AccessibleAction, AccessibleValue { + private static final long serialVersionUID = -217847831945965825L; + /** Constructor */ public AccessibleAWTMenuItem() { Index: java/awt/PopupMenu.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/PopupMenu.java,v retrieving revision 1.16 diff -u -r1.16 PopupMenu.java --- java/awt/PopupMenu.java 2 Jul 2005 20:32:25 -0000 1.16 +++ java/awt/PopupMenu.java 20 Sep 2005 01:01:19 -0000 @@ -140,6 +140,8 @@ protected class AccessibleAWTPopupMenu extends AccessibleAWTMenu { + private static final long serialVersionUID = -4282044795947239955L; + protected AccessibleAWTPopupMenu() { } Index: java/awt/ScrollPane.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/ScrollPane.java,v retrieving revision 1.24 diff -u -r1.24 ScrollPane.java --- java/awt/ScrollPane.java 2 Jul 2005 20:32:25 -0000 1.24 +++ java/awt/ScrollPane.java 20 Sep 2005 01:01:19 -0000 @@ -592,6 +592,8 @@ protected class AccessibleAWTScrollPane extends AccessibleAWTContainer { + private static final long serialVersionUID = 6100703663886637L; + public AccessibleRole getAccessibleRole() { return AccessibleRole.SCROLL_PANE; Index: java/awt/TextArea.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/TextArea.java,v retrieving revision 1.19 diff -u -r1.19 TextArea.java --- java/awt/TextArea.java 2 Jul 2005 20:32:26 -0000 1.19 +++ java/awt/TextArea.java 20 Sep 2005 01:01:19 -0000 @@ -603,6 +603,8 @@ protected class AccessibleAWTTextArea extends AccessibleAWTTextComponent { + private static final long serialVersionUID = 3472827823632144419L; + protected AccessibleAWTTextArea() { } Index: java/awt/TextComponent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v retrieving revision 1.20 diff -u -r1.20 TextComponent.java --- java/awt/TextComponent.java 15 Aug 2005 20:16:06 -0000 1.20 +++ java/awt/TextComponent.java 20 Sep 2005 01:01:19 -0000 @@ -107,6 +107,8 @@ extends AccessibleAWTComponent implements AccessibleText, TextListener { + private static final long serialVersionUID = 3631432373506317811L; + // Constructor // Adds a listener for tracking caret changes public AccessibleAWTTextComponent() Index: java/awt/TextField.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/TextField.java,v retrieving revision 1.15 diff -u -r1.15 TextField.java --- java/awt/TextField.java 2 Jul 2005 20:32:26 -0000 1.15 +++ java/awt/TextField.java 20 Sep 2005 01:01:19 -0000 @@ -523,6 +523,8 @@ protected class AccessibleAWTTextField extends AccessibleAWTTextComponent { + private static final long serialVersionUID = 6219164359235943158L; + protected AccessibleAWTTextField() { } Index: java/awt/Window.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v retrieving revision 1.55 diff -u -r1.55 Window.java --- java/awt/Window.java 15 Sep 2005 16:49:02 -0000 1.55 +++ java/awt/Window.java 20 Sep 2005 01:01:19 -0000 @@ -101,6 +101,8 @@ protected class AccessibleAWTWindow extends AccessibleAWTContainer { + private static final long serialVersionUID = 4215068635060671780L; + public AccessibleRole getAccessibleRole() { return AccessibleRole.WINDOW; _______________________________________________ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches