This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[GUI] Patch: javax.swing - serialVersionUID and other little issues.
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 7 Jun 2004 14:43:16 +0200
- Subject: [GUI] Patch: javax.swing - serialVersionUID and other little issues.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to java-gui-branch to add
serialVersionUID in javax.swing where needed.
Michael
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(serialVersionUID): New member variable.
(AccessibleAbstractButton.serialVersionUID): Likewise.
(AbstractButton): Made public.
* javax/swing/Box.java
(AccessibleBox.serialVersionUID): New member variable.
(Filler.serialVersionUID): Likewise.
* javax/swing/DefaultListSelectionModel.java
(serialVersionUID): Likewise.
* javax/swing/JApplet.java
(serialVersionUID): Likewise.
* javax/swing/JCheckBox.java
(serialVersionUID): Likewise.
* javax/swing/JCheckBoxMenuItem.java
(serialVersionUID): Likewise.
(AccessibleJCheckBoxMenuItem.serialVersionUID): Likewise.
* javax/swing/JColorChooser.java
(serialVersionUID): Likewise.
(AccessibleJColorChooser.serialVersionUID): Likewise.
* javax/swing/JComponent.java
(serialVersionUID): Made private.
(AccessibleJComponent.serialVersionUID): New member variable.
* javax/swing/JDesktopPane.java
(serialVersionUID): Likewise.
* javax/swing/JDialog.java
(serialVersionUID): Likewise.
* javax/swing/JFormattedTextField.java
(serialVersionUID): Fixed value.
* javax/swing/JFrame.java
(serialVersionUID): New member variable.
(getDefaultCloseOpertation): Made public.
* javax/swing/JLayeredPane.java
(serialVersionUID): Likewise.
(LAYER_PROPERTY): Made final, fixed value.
(JLayeredPane): Made public.
* javax/swing/JMenu.java
(AccessibleJMenu.serialVersionUID): New member variable.
(WinListener.serialVersionUID): Likewise.
* javax/swing/JMenuBar.java
(serialVersionUID): Likewise.
(getComponentAtIndex): Added @deprecated tag.
* javax/swing/JMenuItem.java
(serialVersionUID): New member variable.
(AccessibleJMenuItem.serialVersionUID): Likewise.
* javax/swing/JOptionPane.java
(serialVersionUID): Likewise.
(AccessibleJOptionPane.serialVersionUID): Likewise.
* javax/swing/JPopupMenu.java
(serialVersionUID): Likewise.
(AccessibleJPopupMenu.serialVersionUID): Likewise.
(getPopupMenuListeners): New method.
(getComponentAtIndex): Added @deprecated tag.
* javax/swing/JProgressBar.java
(serialVersionUID): New member variable.
(AccessibleJProgressBar.serialVersionUID): Likewise.
* javax/swing/JRadioButton.java
(serialVersionUID): Likewise.
* javax/swing/JRadioButtonMenuItem.java
(serialVersionUID): Likewise.
(AccessibleJRadioButtonMenuItem.serialVersionUID): Likewise.
* javax/swing/JScrollBar.java
(serialVersionUID): Likewise.
(AccessibleJScrollBar.serialVersionUID): Likewise.
* javax/swing/JSeparator.java
(serialVersionUID): Likewise.
(AccessibleJSeparator.serialVersionUID): Likewise.
* javax/swing/JSlider.java: Fixed javadocs.
(AccessibleJSlider.serialVersionUID): New member variable.
* javax/swing/JSplitPane.java: Added copyright statement.
(serialVersionUID): New member variable.
(AccessibleJSplitPane.serialVersionUID): Likewise.
* javax/swing/JTabbedPane.java
(serialVersionUID): Likewise.
(AccessibleJTabbedPane.serialVersionUID): Likewise.
(ModelListener.serialVersionUID): Likewise.
(ModelListener.ModelListener): New constructor.
(SCROLL_TAB_LAYOUT): Made public final, fixed value.
(WRAP_TAB_LAYOUT): Likewise.
* javax/swing/JTable.java
(serialVersionUID): New member variable.
* javax/swing/JToggleButton.java
(serialVersionUID): Likewise.
(ToggleButtonModel): Made static.
(ToggleButtonModel.serialVersionUID): New member variable.
* javax/swing/JToolTip.java
(serialVersionUID): Likewise.
* javax/swing/JTree.java
(serialVersionUID): Likewise.
* javax/swing/JWindow.java
(serialVersionUID): Likewise.
* javax/swing/Timer.java
(serialVersionUID): Likewise.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAxGLqWSOgCCdjSDsRAnGYAJ46hOXghTjQf+joBkL68VIQi3zYswCfaUxd
42ah2kyqy2m4KPdHA1b7k2Y=
=xdaf
-----END PGP SIGNATURE-----
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.5.2.1
diff -u -b -B -r1.5.2.1 AbstractButton.java
--- javax/swing/AbstractButton.java 26 Feb 2004 00:34:01 -0000 1.5.2.1
+++ javax/swing/AbstractButton.java 7 Jun 2004 12:36:42 -0000
@@ -158,6 +158,8 @@
public abstract class AbstractButton extends JComponent
implements ItemSelectable, SwingConstants
{
+ private static final long serialVersionUID = -937921345538462020L;
+
/** The icon displayed by default. */
Icon default_icon;
@@ -296,6 +298,8 @@
extends AccessibleJComponent implements AccessibleAction, AccessibleValue,
AccessibleText
{
+ private static final long serialVersionUID = -5673062525319836790L;
+
protected AccessibleAbstractButton(JComponent c)
{
super(c);
@@ -463,7 +467,7 @@
/**
* Creates a new AbstractButton object.
*/
- AbstractButton()
+ public AbstractButton()
{
this("",null);
}
Index: javax/swing/Box.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Box.java,v
retrieving revision 1.3.2.4
diff -u -b -B -r1.3.2.4 Box.java
--- javax/swing/Box.java 11 May 2004 19:37:01 -0000 1.3.2.4
+++ javax/swing/Box.java 7 Jun 2004 12:36:42 -0000
@@ -1,5 +1,5 @@
/* Box.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -57,6 +57,8 @@
protected class AccessibleBox extends AccessibleAWTContainer
{
+ private static final long serialVersionUID = -7775079816389931944L;
+
protected AccessibleBox()
{
}
@@ -69,6 +71,8 @@
public static class Filler extends JComponent implements Accessible
{
+ private static final long serialVersionUID = -1204263191910183998L;
+
protected class AccessibleBoxFiller// extends AccessibleAWTComponent
{
protected AccessibleBoxFiller()
Index: javax/swing/DefaultListSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListSelectionModel.java,v
retrieving revision 1.4.2.1
diff -u -b -B -r1.4.2.1 DefaultListSelectionModel.java
--- javax/swing/DefaultListSelectionModel.java 26 Feb 2004 00:34:02 -0000 1.4.2.1
+++ javax/swing/DefaultListSelectionModel.java 7 Jun 2004 12:36:42 -0000
@@ -62,6 +62,7 @@
ListSelectionModel,
Serializable
{
+ private static final long serialVersionUID = -5718799865110415860L;
/** The list of ListSelectionListeners subscribed to this selection model. */
protected EventListenerList listenerList = new EventListenerList();
Index: javax/swing/JApplet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JApplet.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 JApplet.java
--- javax/swing/JApplet.java 30 Apr 2004 16:31:28 -0000 1.3.2.1
+++ javax/swing/JApplet.java 7 Jun 2004 12:36:43 -0000
@@ -1,5 +1,5 @@
/* JApplet.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -51,6 +51,7 @@
public class JApplet extends Applet implements RootPaneContainer
{
+ private static final long serialVersionUID = 7269359214497372587L;
public final static int HIDE_ON_CLOSE = 0;
public final static int EXIT_ON_CLOSE = 1;
Index: javax/swing/JCheckBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBox.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JCheckBox.java
--- javax/swing/JCheckBox.java 12 Feb 2004 00:17:23 -0000 1.3
+++ javax/swing/JCheckBox.java 7 Jun 2004 12:36:43 -0000
@@ -1,5 +1,5 @@
/* JCheckBox.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -47,6 +47,8 @@
*/
public class JCheckBox extends JToggleButton
{
+ private static final long serialVersionUID = -5246739313864538930L;
+
public JCheckBox()
{
this(null, null);
Index: javax/swing/JCheckBoxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.3.8.4
diff -u -b -B -r1.3.8.4 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java 3 Jun 2004 14:21:50 -0000 1.3.8.4
+++ javax/swing/JCheckBoxMenuItem.java 7 Jun 2004 12:36:43 -0000
@@ -50,6 +50,8 @@
public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants,
Accessible
{
+ private static final long serialVersionUID = -6676402307973384715L;
+
private static final String uiClassID = "CheckBoxMenuItemUI";
private boolean state;
private Object[] selectedObjects;
@@ -217,6 +219,8 @@
*/
protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem
{
+ private static final long serialVersionUID = 1079958073579370777L;
+
/**
* Creates a new AccessibleJCheckBoxMenuItem object.
*
Index: javax/swing/JColorChooser.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JColorChooser.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JColorChooser.java
--- javax/swing/JColorChooser.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/JColorChooser.java 7 Jun 2004 12:36:43 -0000
@@ -1,5 +1,5 @@
/* JColorChooser.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -57,6 +57,8 @@
*/
public class JColorChooser extends JComponent implements Accessible {
+ private static final long serialVersionUID = 9168066781620640889L;
+
//-------------------------------------------------------------
// Classes ----------------------------------------------------
//-------------------------------------------------------------
@@ -66,6 +68,8 @@
*/
protected class AccessibleJColorChooser extends JComponent.AccessibleJComponent {
+ private static final long serialVersionUID = -2038297864782299082L;
+
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.7.2.6
diff -u -b -B -r1.7.2.6 JComponent.java
--- javax/swing/JComponent.java 21 May 2004 23:34:11 -0000 1.7.2.6
+++ javax/swing/JComponent.java 7 Jun 2004 12:36:43 -0000
@@ -90,7 +90,7 @@
*/
public abstract class JComponent extends Container implements Serializable
{
- static final long serialVersionUID = -5242478962609715464L;
+ private static final long serialVersionUID = -7908749299918704233L;
/**
* Accessibility support is currently missing.
@@ -117,6 +117,8 @@
public void componentRemoved(ContainerEvent valevent) {}
}
+ private static final long serialVersionUID = -7047089700479897799L;
+
protected ContainerListener accessibleContainerHandler;
protected FocusListener accessibleFocusHandler;
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JDesktopPane.java
--- javax/swing/JDesktopPane.java 9 Jan 2004 10:18:47 -0000 1.3
+++ javax/swing/JDesktopPane.java 7 Jun 2004 12:36:43 -0000
@@ -51,6 +51,8 @@
*/
public class JDesktopPane extends JLayeredPane implements Accessible
{
+ private static final long serialVersionUID = 766333777224038726L;
+
//-------------------------------------------------------------
// Classes ----------------------------------------------------
Index: javax/swing/JDialog.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDialog.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 JDialog.java
--- javax/swing/JDialog.java 3 May 2004 19:10:59 -0000 1.2.18.1
+++ javax/swing/JDialog.java 7 Jun 2004 12:36:43 -0000
@@ -62,6 +62,7 @@
public class JDialog extends Dialog implements Accessible, WindowConstants,
RootPaneContainer
{
+ private static final long serialVersionUID = -864070866424508218L;
/** DOCUMENT ME! */
protected AccessibleContext accessibleContext;
Index: javax/swing/JFormattedTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFormattedTextField.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JFormattedTextField.java
--- javax/swing/JFormattedTextField.java 5 Feb 2004 18:48:53 -0000 1.3
+++ javax/swing/JFormattedTextField.java 7 Jun 2004 12:36:43 -0000
@@ -1,5 +1,5 @@
/* JFormattedTextField.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -52,7 +52,7 @@
*/
public class JFormattedTextField extends JTextField
{
- private static final long serialVersionUID = 2889768923115424035L;
+ private static final long serialVersionUID = 5464657870110180632L;
public abstract static class AbstractFormatter implements Serializable
{
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFrame.java,v
retrieving revision 1.4.2.1
diff -u -b -B -r1.4.2.1 JFrame.java
--- javax/swing/JFrame.java 30 Apr 2004 16:31:29 -0000 1.4.2.1
+++ javax/swing/JFrame.java 7 Jun 2004 12:36:43 -0000
@@ -1,5 +1,5 @@
/* JFrame.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -59,6 +59,8 @@
*/
public class JFrame extends Frame implements RootPaneContainer
{
+ private static final long serialVersionUID = -3362141868504252139L;
+
public final static int HIDE_ON_CLOSE = 0;
public final static int EXIT_ON_CLOSE = 1;
public final static int DISPOSE_ON_CLOSE = 2;
@@ -192,7 +194,7 @@
return accessibleContext;
}
- int getDefaultCloseOperation()
+ public int getDefaultCloseOperation()
{ return close_action; }
Index: javax/swing/JLayeredPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JLayeredPane.java,v
retrieving revision 1.6.8.2
diff -u -b -B -r1.6.8.2 JLayeredPane.java
--- javax/swing/JLayeredPane.java 21 May 2004 23:34:11 -0000 1.6.8.2
+++ javax/swing/JLayeredPane.java 7 Jun 2004 12:36:44 -0000
@@ -82,6 +82,7 @@
* <dd>An offset into a layer's "logical drawing order". Layer position 0
* is drawn last. Layer position -1 is a synonym for the first layer
* position (the logical "bottom").</dd>
+ * </dl>
*
* <p><b>Note:</b> the layer numbering order is the <em>reverse</em> of the
* component indexing and position order</p>
@@ -88,11 +89,11 @@
*
* @author Graydon Hoare <graydon@redhat.com>
*/
-
public class JLayeredPane extends JComponent implements Accessible
{
+ private static final long serialVersionUID = 5534920399324590459L;
- public static String LAYER_PROPERTY = "LAYER_PROPERTY";
+ public static final String LAYER_PROPERTY = "layeredContainerLayer";
public static Integer FRAME_CONTENT_LAYER = new Integer (-30000);
@@ -105,7 +106,7 @@
TreeMap layers; // Layer Number (Integer) -> Layer Size (Integer)
Hashtable componentToLayer; // Component -> Layer Number (Integer)
- JLayeredPane()
+ public JLayeredPane()
{
layers = new TreeMap ();
componentToLayer = new Hashtable ();
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenu.java,v
retrieving revision 1.3.8.2
diff -u -b -B -r1.3.8.2 JMenu.java
--- javax/swing/JMenu.java 3 Jun 2004 14:21:51 -0000 1.3.8.2
+++ javax/swing/JMenu.java 7 Jun 2004 12:36:44 -0000
@@ -684,6 +684,8 @@
protected class AccessibleJMenu extends AccessibleJMenuItem
implements AccessibleSelection
{
+ private static final long serialVersionUID = -8131864021059524309L;
+
/**
* Creates a new AccessibleJMenu object.
*
@@ -808,6 +810,8 @@
*/
protected class WinListener extends WindowAdapter implements Serializable
{
+ private static final long serialVersionUID = -6415815570638474823L;
+
JPopupMenu popupMenu;
/**
Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuBar.java,v
retrieving revision 1.2.18.2
diff -u -b -B -r1.2.18.2 JMenuBar.java
--- javax/swing/JMenuBar.java 3 Jun 2004 14:21:51 -0000 1.2.18.2
+++ javax/swing/JMenuBar.java 7 Jun 2004 12:36:44 -0000
@@ -70,6 +70,8 @@
*/
public class JMenuBar extends JComponent implements Accessible, MenuElement
{
+ private static final long serialVersionUID = -8191026883931977036L;
+
private transient SingleSelectionModel selectionModel;
private boolean paintBorder;
private Insets margin;
@@ -133,6 +135,8 @@
* @param i DOCUMENT ME!
*
* @return DOCUMENT ME!
+ *
+ * @deprecated Replaced by getComponent(int)
*/
public Component getComponentAtIndex(int i)
{
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuItem.java,v
retrieving revision 1.2.18.5
diff -u -b -B -r1.2.18.5 JMenuItem.java
--- javax/swing/JMenuItem.java 3 Jun 2004 14:21:51 -0000 1.2.18.5
+++ javax/swing/JMenuItem.java 7 Jun 2004 12:36:44 -0000
@@ -66,6 +66,8 @@
public class JMenuItem extends AbstractButton implements Accessible,
MenuElement
{
+ private static final long serialVersionUID = -1681004643499461044L;
+
private static final String uiClassID = "MenuItemUI";
private KeyStroke accelerator;
@@ -587,6 +589,8 @@
protected class AccessibleJMenuItem extends AccessibleAbstractButton
implements ChangeListener
{
+ private static final long serialVersionUID = 6748924232082076534L;
+
/**
* Creates a new AccessibleJMenuItem object.
*
Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JOptionPane.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 JOptionPane.java
--- javax/swing/JOptionPane.java 3 May 2004 19:10:59 -0000 1.3.2.1
+++ javax/swing/JOptionPane.java 7 Jun 2004 12:36:44 -0000
@@ -60,6 +60,8 @@
*/
protected class AccessibleJOptionPane extends JComponent.AccessibleJComponent
{
+ private static final long serialVersionUID = 686071432213084821L;
+
/**
* Creates a new AccessibleJOptionPane object.
*/
@@ -79,6 +81,8 @@
}
}
+ private static final long serialVersionUID = 5231143276678566796L;
+
/** The value returned when cancel option is selected. */
public static final int CANCEL_OPTION = 2;
Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPopupMenu.java,v
retrieving revision 1.3.8.4
diff -u -b -B -r1.3.8.4 JPopupMenu.java
--- javax/swing/JPopupMenu.java 3 Jun 2004 14:21:51 -0000 1.3.8.4
+++ javax/swing/JPopupMenu.java 7 Jun 2004 12:36:45 -0000
@@ -71,6 +71,8 @@
*/
public class JPopupMenu extends JComponent implements Accessible, MenuElement
{
+ private static final long serialVersionUID = -8336996630009646009L;
+
private static final String uiClassID = "PopupMenuUI";
private static final Object defaultLWPopupEnabledKey = null;
private static boolean defaultLWPopupEnabled = true;
@@ -421,6 +423,12 @@
listenerList.remove(PopupMenuListener.class, listener);
}
+ public PopupMenuListener[] getPopupMenuListeners()
+ {
+ return ((PopupMenuListener[])
+ listenerList.getListeners(PopupMenuListener.class));
+ }
+
/**
* DOCUMENT ME!
*/
@@ -610,6 +618,8 @@
* @param index DOCUMENT ME!
*
* @return DOCUMENT ME!
+ *
+ * @deprecated Replaced by getComponent(int)
*/
public Component getComponentAtIndex(int index)
{
@@ -967,6 +977,8 @@
*/
protected class AccessibleJPopupMenu extends AccessibleJComponent
{
+ private static final long serialVersionUID = 7423261328879849768L;
+
/**
* Creates a new AccessibleJPopupMenu object.
*
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.3.8.4
diff -u -b -B -r1.3.8.4 JProgressBar.java
--- javax/swing/JProgressBar.java 23 Mar 2004 14:42:19 -0000 1.3.8.4
+++ javax/swing/JProgressBar.java 7 Jun 2004 12:36:45 -0000
@@ -87,6 +87,8 @@
protected class AccessibleJProgressBar extends AccessibleJComponent
implements AccessibleValue
{
+ private static final long serialVersionUID = -2938130009392721813L;
+
/**
* Constructor AccessibleJProgressBar
*
@@ -170,6 +172,8 @@
}
}
+ private static final long serialVersionUID = 1980046021813598781L;
+
/** Fired in a PropertyChangeEvent when the "borderPainted" property changes. */
public static final String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
Index: javax/swing/JRadioButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButton.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JRadioButton.java
--- javax/swing/JRadioButton.java 12 Feb 2004 00:17:23 -0000 1.3
+++ javax/swing/JRadioButton.java 7 Jun 2004 12:36:45 -0000
@@ -1,5 +1,5 @@
/* JRadioButton.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -42,6 +42,8 @@
public class JRadioButton extends JToggleButton
{
+ private static final long serialVersionUID = 7751949583255506856L;
+
public JRadioButton()
{
this(null, null);
Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.3.8.5
diff -u -b -B -r1.3.8.5 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java 3 Jun 2004 14:21:51 -0000 1.3.8.5
+++ javax/swing/JRadioButtonMenuItem.java 7 Jun 2004 12:36:45 -0000
@@ -49,6 +49,8 @@
*/
public class JRadioButtonMenuItem extends JMenuItem implements Accessible
{
+ private static final long serialVersionUID = 8482658191548521743L;
+
private static final String uiClassID = "RadioButtonMenuItemUI";
/**
@@ -195,6 +197,8 @@
*/
protected class AccessibleJRadioButtonMenuItem extends AccessibleJMenuItem
{
+ private static final long serialVersionUID = 4381471510145292179L;
+
/**
* Creates a new AccessibleJRadioButtonMenuItem object.
*
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollBar.java,v
retrieving revision 1.2.18.3
diff -u -b -B -r1.2.18.3 JScrollBar.java
--- javax/swing/JScrollBar.java 21 May 2004 23:34:13 -0000 1.2.18.3
+++ javax/swing/JScrollBar.java 7 Jun 2004 12:36:45 -0000
@@ -69,6 +69,8 @@
protected class AccessibleJScrollBar extends JComponent.AccessibleJComponent
implements AccessibleValue
{
+ private static final long serialVersionUID = -7758162392045586663L;
+
/**
* Creates a new AccessibleJSlider object.
*
@@ -152,6 +154,8 @@
}
}
+ private static final long serialVersionUID = -8195169869225066566L;
+
/** Fired in a PropertyChangeEvent when the "blockIncrement" changes. */
public static final String BLOCK_INCREMENT_CHANGED_PROPERTY = "blockIncrement";
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.3.8.2
diff -u -b -B -r1.3.8.2 JSeparator.java
--- javax/swing/JSeparator.java 9 Mar 2004 16:38:14 -0000 1.3.8.2
+++ javax/swing/JSeparator.java 7 Jun 2004 12:36:45 -0000
@@ -57,6 +57,8 @@
*/
protected class AccessibleJSeparator extends AccessibleJComponent
{
+ private static final long serialVersionUID = 916332890553201095L;
+
/**
* Constructor AccessibleJSeparator
*
@@ -78,6 +80,8 @@
}
}
+ private static final long serialVersionUID = 125301223445282357L;
+
/** The orientation of the JSeparator. */
private transient int orientation = HORIZONTAL;
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSlider.java,v
retrieving revision 1.3.18.7
diff -u -b -B -r1.3.18.7 JSlider.java
--- javax/swing/JSlider.java 19 Apr 2004 19:46:05 -0000 1.3.18.7
+++ javax/swing/JSlider.java 7 Jun 2004 12:36:45 -0000
@@ -71,7 +71,7 @@
* </p>
*
* <table>
- * <tr><th> Property </td><th> Stored in </td><th> Bound? </td></tr>
+ * <tr><th> Property </th><th> Stored in </th><th> Bound? </th></tr>
* <tr><td> extent </td><td> model </td><td> no </td></tr>
* <tr><td> inverted </td><td> slider </td><td> yes </td></tr>
* <tr><td> labelTable </td><td> slider </td><td> yes </td></tr>
@@ -125,6 +125,8 @@
protected class AccessibleJSlider extends JComponent.AccessibleJComponent
implements AccessibleValue
{
+ private static final long serialVersionUID = -6301740148041106789L;
+
/**
* Creates a new AccessibleJSlider object.
*
@@ -414,7 +416,7 @@
* This method returns a name to identify which look and feel class will be
* the UI delegate for the slider.
*
- * @return The L&F classID. "SliderUI"
+ * @return The Look and Feel classID. "SliderUI"
*/
public String getUIClassID()
{
Index: javax/swing/JSplitPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSplitPane.java,v
retrieving revision 1.2.8.1
diff -u -b -B -r1.2.8.1 JSplitPane.java
--- javax/swing/JSplitPane.java 19 Apr 2004 19:46:05 -0000 1.2.8.1
+++ javax/swing/JSplitPane.java 7 Jun 2004 12:36:45 -0000
@@ -1,3 +1,40 @@
+/* JSplitPane.java --
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
package javax.swing;
@@ -26,6 +63,8 @@
protected class AccessibleJSplitPane extends JComponent.AccessibleJComponent
implements AccessibleValue
{
+ private static final long serialVersionUID = -1788116871416305366L;
+
/**
* Creates a new AccessibleJSplitPane object.
*
@@ -109,6 +148,8 @@
}
}
+ private static final long serialVersionUID = -5634142046175988380L;
+
/** The constraints string used to add components to the bottom. */
public static final String BOTTOM = "bottom";
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTabbedPane.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 JTabbedPane.java
--- javax/swing/JTabbedPane.java 23 Mar 2004 14:42:19 -0000 1.3.2.1
+++ javax/swing/JTabbedPane.java 7 Jun 2004 12:36:46 -0000
@@ -81,6 +81,8 @@
protected class AccessibleJTabbedPane extends JComponent.AccessibleJComponent
implements AccessibleSelection, ChangeListener
{
+ private static final long serialVersionUID = 7610530885966830483L;
+
/**
* Creates a new AccessibleJTabbedPane object.
*
@@ -226,6 +228,12 @@
*/
protected class ModelListener implements ChangeListener, Serializable
{
+ private static final long serialVersionUID = 497359819958114132L;
+
+ protected ModelListener()
+ {
+ }
+
/**
* This method is called whenever the model is changed.
*
@@ -379,6 +387,8 @@
return title;
}
+ private static final long serialVersionUID = 1614381073220130939L;
+
/**
* This method sets the title of the tab.
*
@@ -542,10 +552,10 @@
protected SingleSelectionModel model;
/** Indicates that the TabbedPane is in scrolling mode. */
- static int SCROLL_TAB_LAYOUT = 0;
+ public static final int SCROLL_TAB_LAYOUT = 1;
/** Indicates that the TabbedPane is in wrap mode. */
- static int WRAP_TAB_LAYOUT = 1;
+ public static final int WRAP_TAB_LAYOUT = 0;
/** The current tabPlacement of the TabbedPane. */
protected int tabPlacement = SwingConstants.TOP;
Index: javax/swing/JTable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTable.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JTable.java
--- javax/swing/JTable.java 11 Jun 2003 13:20:39 -0000 1.4
+++ javax/swing/JTable.java 7 Jun 2004 12:36:46 -0000
@@ -1,5 +1,5 @@
/* JTable.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -62,6 +62,8 @@
implements TableModelListener, Scrollable, TableColumnModelListener,
ListSelectionListener, CellEditorListener, Accessible
{
+ private static final long serialVersionUID = 3876025080382781659L;
+
public static final int AUTO_RESIZE_ALL_COLUMNS = 4;
public static final int AUTO_RESIZE_LAST_COLUMN = 3;
public static final int AUTO_RESIZE_NEXT_COLUMN = 1;
Index: javax/swing/JToggleButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToggleButton.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JToggleButton.java
--- javax/swing/JToggleButton.java 12 Feb 2004 00:17:23 -0000 1.4
+++ javax/swing/JToggleButton.java 7 Jun 2004 12:36:46 -0000
@@ -1,5 +1,5 @@
/* JToggleButton.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,8 +45,10 @@
public class JToggleButton extends AbstractButton implements Accessible
{
- public class ToggleButtonModel extends DefaultButtonModel
+ public static class ToggleButtonModel extends DefaultButtonModel
{
+ private static final long serialVersionUID = -1589950750899943974L;
+
public void setPressed(boolean b)
{
if (! isEnabled())
@@ -62,6 +64,8 @@
}
+ private static final long serialVersionUID = -3128248873429850443L;
+
public JToggleButton()
{
this(null, null);
Index: javax/swing/JToolTip.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolTip.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JToolTip.java
--- javax/swing/JToolTip.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/JToolTip.java 7 Jun 2004 12:36:46 -0000
@@ -1,5 +1,5 @@
/* JToolTip.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -43,6 +43,8 @@
public class JToolTip extends JComponent implements Accessible
{
+ private static final long serialVersionUID = -1138929898906751643L;
+
String text;
JToolTip(String text)
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTree.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JTree.java
--- javax/swing/JTree.java 12 Feb 2004 00:17:23 -0000 1.3
+++ javax/swing/JTree.java 7 Jun 2004 12:36:46 -0000
@@ -1,5 +1,5 @@
/* JTree.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -60,6 +60,8 @@
public class JTree extends JComponent implements Scrollable, Accessible
{
+ private static final long serialVersionUID = 7559816092864483649L;
+
JTree()
{
updateUI();
Index: javax/swing/JWindow.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JWindow.java,v
retrieving revision 1.3.18.2
diff -u -b -B -r1.3.18.2 JWindow.java
--- javax/swing/JWindow.java 3 May 2004 15:38:32 -0000 1.3.18.2
+++ javax/swing/JWindow.java 7 Jun 2004 12:36:46 -0000
@@ -1,5 +1,5 @@
/* JWindow.java --
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -60,6 +60,8 @@
*/
public class JWindow extends Window implements Accessible, RootPaneContainer
{
+ private static final long serialVersionUID = 5420698392125238833L;
+
public final static int HIDE_ON_CLOSE = 0;
public final static int EXIT_ON_CLOSE = 1;
public final static int DISPOSE_ON_CLOSE = 2;
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Timer.java,v
retrieving revision 1.3.18.1
diff -u -b -B -r1.3.18.1 Timer.java
--- javax/swing/Timer.java 22 Mar 2004 23:38:20 -0000 1.3.18.1
+++ javax/swing/Timer.java 7 Jun 2004 12:36:46 -0000
@@ -1,5 +1,5 @@
/* Timer.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -47,6 +47,8 @@
public class Timer implements Serializable
{
+ private static final long serialVersionUID = -1116180831621385484L;
+
protected EventListenerList listenerList = new EventListenerList();
int ticks;