Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1937
diff -u -b -B -r1.1937 ChangeLog
--- ChangeLog	11 Jun 2003 10:38:57 -0000	1.1937
+++ ChangeLog	11 Jun 2003 13:15:13 -0000
@@ -1,5 +1,122 @@
 2003-06-11  Michael Koch  <konqueror@gmx.de>
 
+	* javax/swing/AbstractAction.java,
+	javax/swing/AbstractButton.java,
+	javax/swing/AbstractCellEditor.java,
+	javax/swing/AbstractListModel.java,
+	javax/swing/BorderFactory.java,
+	javax/swing/Box.java,
+	javax/swing/BoxLayout.java,
+	javax/swing/ButtonGroup.java,
+	javax/swing/DefaultButtonModel.java,
+	javax/swing/DefaultListModel.java,
+	javax/swing/DefaultListSelectionModel.java,
+	javax/swing/FocusManager.java,
+	javax/swing/ImageIcon.java,
+	javax/swing/InputMap.java,
+	javax/swing/JApplet.java,
+	javax/swing/JButton.java,
+	javax/swing/JCheckBox.java,
+	javax/swing/JCheckBoxMenuItem.java,
+	javax/swing/JColorChooser.java,
+	javax/swing/JComboBox.java,
+	javax/swing/JComponent.java,
+	javax/swing/JDesktopPane.java,
+	javax/swing/JDialog.java,
+	javax/swing/JEditorPane.java,
+	javax/swing/JFileChooser.java,
+	javax/swing/JFormattedTextField.java,
+	javax/swing/JFrame.java,
+	javax/swing/JLabel.java,
+	javax/swing/JLayeredPane.java,
+	javax/swing/JList.java,
+	javax/swing/JMenuBar.java,
+	javax/swing/JMenuItem.java,
+	javax/swing/JOptionPane.java,
+	javax/swing/JPanel.java,
+	javax/swing/JPasswordField.java,
+	javax/swing/JPopupMenu.java,
+	javax/swing/JProgressBar.java,
+	javax/swing/JRadioButton.java,
+	javax/swing/JRadioButtonMenuItem.java,
+	javax/swing/JRootPane.java,
+	javax/swing/JScrollBar.java,
+	javax/swing/JScrollPane.java,
+	javax/swing/JSeparator.java,
+	javax/swing/JSlider.java,
+	javax/swing/JTabbedPane.java,
+	javax/swing/JTable.java,
+	javax/swing/JTextField.java,
+	javax/swing/JToggleButton.java,
+	javax/swing/JToolBar.java,
+	javax/swing/JToolTip.java,
+	javax/swing/JTree.java,
+	javax/swing/JViewport.java,
+	javax/swing/JWindow.java,
+	javax/swing/KeyStroke.java,
+	javax/swing/ListSelectionModel.java,
+	javax/swing/LookAndFeel.java,
+	javax/swing/RepaintManager.java,
+	javax/swing/ScrollPaneLayout.java,
+	javax/swing/SizeRequirements.java,
+	javax/swing/SwingConstants.java,
+	javax/swing/Timer.java,
+	javax/swing/UIDefaults.java,
+	javax/swing/UIManager.java,
+	javax/swing/border/AbstractBorder.java,
+	javax/swing/border/CompoundBorder.java,
+	javax/swing/colorchooser/AbstractColorChooserPanel.java,
+	javax/swing/colorchooser/ColorChooserComponentFactory.java,
+	javax/swing/colorchooser/ColorSelectionModel.java,
+	javax/swing/colorchooser/DefaultColorSelectionModel.java,
+	javax/swing/event/AncestorEvent.java,
+	javax/swing/event/HyperlinkEvent.java,
+	javax/swing/event/InternalFrameAdapter.java,
+	javax/swing/event/InternalFrameEvent.java,
+	javax/swing/event/ListDataEvent.java,
+	javax/swing/event/MouseInputAdapter.java,
+	javax/swing/event/SwingPropertyChangeSupport.java,
+	javax/swing/event/TableModelEvent.java,
+	javax/swing/event/TreeWillExpandListener.java,
+	javax/swing/event/UndoableEditEvent.java,
+	javax/swing/filechooser/FileFilter.java,
+	javax/swing/filechooser/FileSystemView.java,
+	javax/swing/filechooser/FileView.java,
+	javax/swing/plaf/BorderUIResource.java,
+	javax/swing/plaf/basic/BasicDefaults.java,
+	javax/swing/table/AbstractTableModel.java,
+	javax/swing/table/DefaultTableCellRenderer.java,
+	javax/swing/table/DefaultTableColumnModel.java,
+	javax/swing/table/DefaultTableModel.java,
+	javax/swing/table/TableColumn.java,
+	javax/swing/text/JTextComponent.java,
+	javax/swing/tree/AbstractLayoutCache.java,
+	javax/swing/tree/DefaultMutableTreeNode.java,
+	javax/swing/tree/DefaultTreeCellEditor.java,
+	javax/swing/tree/DefaultTreeCellRenderer.java,
+	javax/swing/tree/DefaultTreeModel.java,
+	javax/swing/tree/DefaultTreeSelectionModel.java,
+	javax/swing/tree/FixedHeightLayoutCache.java,
+	javax/swing/tree/TreeCellEditor.java,
+	javax/swing/tree/TreeModel.java,
+	javax/swing/tree/TreeNode.java,
+	javax/swing/tree/TreePath.java,
+	javax/swing/tree/TreeSelectionModel.java,
+	javax/swing/tree/VariableHeightLayoutCache.java,
+	javax/swing/undo/AbstractUndoableEdit.java,
+	javax/swing/undo/CompoundEdit.java,
+	javax/swing/undo/StateEdit.java,
+	javax/swing/undo/UndoManager.java,
+	javax/swing/undo/UndoableEditSupport.java:
+	New versions from classpath.
+	* javax/swing/table/JTableHeader.java:
+	New file from classpath.
+	* Makefile.am
+	(java_awt_sources): Added javax/swing/table/JTableHeader.java.
+	* Makefile.in: Regenerated.
+
+2003-06-11  Michael Koch  <konqueror@gmx.de>
+
 	* java/nio/MappedByteBuffer.java,
 	java/nio/channels/Channels.java,
 	java/nio/channels/ServerSocketChannel.java,
Index: javax/swing/AbstractAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractAction.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractAction.java
--- javax/swing/AbstractAction.java	31 Mar 2003 12:19:21 -0000	1.2
+++ javax/swing/AbstractAction.java	11 Jun 2003 13:15:13 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
 import java.awt.event.*;
 import java.beans.*;
 import java.io.*;
@@ -207,12 +207,4 @@
 	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
 		changeSupport.removePropertyChangeListener(listener);
 	} // removePropertyChangeListener()
-
-	/**
-	 * actionPerformed
-	 * @param event TODO
-	 */
-	public abstract void actionPerformed(ActionEvent event);
-
-
-} // AbstractAction
+}
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AbstractButton.java
--- javax/swing/AbstractButton.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/AbstractButton.java	11 Jun 2003 13:15:14 -0000
@@ -35,18 +35,33 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.awt.*;
-import java.awt.event.*;
 
-import javax.swing.event.*;
-import javax.swing.plaf.*;
-import javax.swing.text.*;
-import javax.accessibility.*;
+package javax.swing;
 
-import java.util.*;
-import java.beans.*;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.ItemSelectable;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeListener;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleIcon;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleRelationSet;
+import javax.accessibility.AccessibleText;
+import javax.accessibility.AccessibleValue;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ButtonUI;
+import javax.swing.text.AttributeSet;
 
 /**
  * Provides basic button functionality
Index: javax/swing/AbstractCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractCellEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractCellEditor.java
--- javax/swing/AbstractCellEditor.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/AbstractCellEditor.java	11 Jun 2003 13:15:14 -0000
@@ -35,12 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.io.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.io.Serializable;
+import java.util.EventObject;
+import javax.swing.event.CellEditorListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.EventListenerList;
 
 /**
  * AbstractCellEditor
Index: javax/swing/AbstractListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractListModel.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 AbstractListModel.java
--- javax/swing/AbstractListModel.java	29 Apr 2003 09:26:29 -0000	1.4
+++ javax/swing/AbstractListModel.java	11 Jun 2003 13:15:14 -0000
@@ -189,17 +189,4 @@
   {
     return (ListDataListener[]) getListeners (ListDataListener.class);
   }
-
-  /**
-   * getElementAt
-   * @param index TODO
-   * @returns Object
-   */
-  public abstract Object getElementAt (int index);
-
-  /**
-   * getSize
-   * @returns int
-   */
-  public abstract int getSize ();
 }
Index: javax/swing/BorderFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/BorderFactory.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BorderFactory.java
--- javax/swing/BorderFactory.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/BorderFactory.java	11 Jun 2003 13:15:14 -0000
@@ -38,332 +38,406 @@
 
 package javax.swing;
 
-import java.awt.*;
-import java.awt.font.*;
-import javax.swing.border.*;
-
+import java.awt.Color;
+import java.awt.Font;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.EtchedBorder;
+import javax.swing.border.LineBorder;
+import javax.swing.border.MatteBorder;
+import javax.swing.border.TitledBorder;
 
 public class BorderFactory
 {
-  public static Border createLineBorder(Color color)
-  { /*
-    Creates a line border withe the specified color.
-
-    Parameters:
-    color - a Color to use for the lineReturns:
-    the Border object
-createLineBorder
-    */ 
-    return null;
- }
-
-public static Border createLineBorder(Color color,
-                                      int thickness)
-  { /*
-
-    Creates a line border withe the specified color and width. The width applies to all 4 sides of the border. To specify widths individually for the top, bottom, left, and right, use createMatteBorder(int,int,int,int,Color).
-
-    Parameters:
-    color - a Color to use for the linethickness - an int specifying the width in pixelsReturns:
-    the Border object
-createRaisedBevelBorder
-    */ 
-    return null;
-  }
-
-
-public static Border createRaisedBevelBorder()
-  { /*
-
-    Created a border with a raised beveled edge, using brighter shades of the component's current background color for highlighting, and darker shading for shadows. (In a raised border, highlights are on top and shadows are underneath.)
-
-    Returns:
-    the Border object
-createLoweredBevelBorder
-
+  /**
+   * Creates a line border withe the specified color.
+   *
+   * @param color A color to use for the line.
+   *
+   * @return The Border object
     */ 
+  public static Border createLineBorder(Color color)
+  {
     return null;
  }
 
-public static Border createLoweredBevelBorder()
-  { /*
-
-    Created a border with a lowered beveled edge, using brighter shades of the component's current background color for highlighting, and darker shading for shadows. (In a lowered border, shadows are on top and highlights are underneath.)
-
-    Returns:
-    the Border object
-createBevelBorder
-
+  /**
+   * Creates a line border withe the specified color and width. The width
+   * applies to all 4 sides of the border. To specify widths individually for
+   * the top, bottom, left, and right, use
+   * createMatteBorder(int,int,int,int,Color).
+   *
+   * @param color A color to use for the line.
+   * @param thickness An int specifying the width in pixels.
+   *
+   * @return The Border object
+   */ 
+  public static Border createLineBorder (Color color, int thickness)
+  {
+    return new LineBorder (color, thickness);
+  }
+
+  /**
+   * Created a border with a raised beveled edge, using brighter shades of
+   * the component's current background color for highlighting, and darker
+   * shading for shadows. (In a raised border, highlights are on top and
+   * shadows are underneath.)
+   *
+   * @return The Border object
+   */ 
+  public static Border createRaisedBevelBorder ()
+  {
+    return new BevelBorder (BevelBorder.RAISED);
+  }
+
+  /**
+   * Created a border with a lowered beveled edge, using brighter shades of
+   * the component's current background color for highlighting, and darker
+   * shading for shadows. (In a lowered border, shadows are on top and
+   * highlights are underneath.)
+   *
+   * @return The Border object
+   */ 
+  public static Border createLoweredBevelBorder ()
+  {
+    return new BevelBorder (BevelBorder.LOWERED);
+  }
+
+  /**
+   * Create a beveled border of the specified type, using brighter shades of
+   * the component's current background color for highlighting, and darker
+   * shading for shadows. (In a lowered border, shadows are on top and
+   * highlights are underneath.).
+   *
+   * @param type An int specifying either BevelBorder.LOWERED or
+   * BevelBorder.RAISED
+   *
+   * @Return The Border object
+   */ 
+  public static Border createBevelBorder (int type)
+  {
+    return new BevelBorder (type);
+  }
+
+  /**
+   * Create a beveled border of the specified type, using the specified
+   * highlighting and shadowing. The outer edge of the highlighted area uses
+   * a brighter shade of the highlight color. The inner edge of the shadow
+   * area uses a brighter shade of the shadaw color.
+   *
+   * @param type An int specifying either BevelBorder.LOWERED or
+   * BevelBorder.RAISED
+   * @param highlight A Color object for highlights
+   * @param shadow A Color object for shadows
+   *
+   * @return The Border object
     */ 
-    return null;
- }
-
-public static Border createBevelBorder(int type)
-
-  { /*
-    Create a beveled border of the specified type, using brighter shades of the component's current background color for highlighting, and darker shading for shadows. (In a lowered border, shadows are on top and highlights are underneath.).
-
-    Parameters:
-    type - an int specifying either BevelBorder.LOWERED or BevelBorder.LOWEREDReturns:
-    the Border object
-createBevelBorder
-
-    */ 
-    return null;
- }
-
-public static Border createBevelBorder(int type,
-                                       Color highlight,
+  public static Border createBevelBorder (int type, Color highlight,
                                        Color shadow)
-  { /*
-
-    Create a beveled border of the specified type, using the specified highlighting and shadowing. The outer edge of the highlighted area uses a brighter shade of the highlight color. The inner edge of the shadow area uses a brighter shade of the shadaw color.
-
-    Parameters:
-    type - an int specifying either BevelBorder.LOWERED or BevelBorder.LOWEREDhighlight - a Color object for highlightsshadow - a Color object for shadowsReturns:
-    the Border object
-createBevelBorder
-
-    */ 
-    return null;
+  {
+    return new BevelBorder (type, highlight, shadow);
  }
 
-public static Border createBevelBorder(int type,
-                                       Color highlightOuter,
-                                       Color highlightInner,
-                                       Color shadowOuter,
-                                       Color shadowInner)
-  { /*
-
-    Create a beveled border of the specified type, using the specified colors for the inner and outer highlight and shadow areas.
-
-    Parameters:
-    type - an int specifying either BevelBorder.LOWERED or BevelBorder.LOWEREDhighlightOuter - a Color object for the outer edge of the highlight areahighlightInner - a Color object for the inner edge of the highlight areashadowOuter - a Color object for the outer edge of the shadow areashadowInner - a Color object for the inner edge of the shadow areaReturns:
-    the Border object
-createEtchedBorder
+  /**
+   * Create a beveled border of the specified type, using the specified colors
+   * for the inner and outer highlight and shadow areas.
+   *
+   * @param type An int specifying either BevelBorder.LOWERED or
+   * BevelBorder.RAISED
+   * @param highlightOuter A Color object for the outer edge of the
+   * highlight area
+   * @param highlightInner A Color object for the inner edge of the
+   * highlight area
+   * @param shadowOuter A Color object for the outer edge of the shadow area
+   * @param shadowInner A Color object for the inner edge of the shadow area
+   *
+   * @return The Border object
     */ 
-    return null;
- }
-
-
-public static Border createEtchedBorder()
-  { /*
-
-    Create a border with an "etched" look using the component's current background color for highlighting and shading.
-
-    Returns:
-    the Border object
-createEtchedBorder
-
+  public static Border createBevelBorder (int type, Color highlightOuter,
+                                          Color highlightInner,
+                                          Color shadowOuter, Color shadowInner)
+  {
+    return new BevelBorder (type, highlightOuter, highlightInner, shadowOuter,
+			    shadowInner);
+  }
+
+  /**
+   * Create a border with an "etched" look using the component's current
+   * background color for highlighting and shading.
+   *
+   * @return The Border object
+   */ 
+  public static Border createEtchedBorder ()
+  {
+    return new EtchedBorder ();
+  }
+
+  /**
+   * Create a border with an "etched" look using the component's current
+   * background color for highlighting and shading.
+   *
+   * @return The Border object
+   */ 
+  public static Border createEtchedBorder (int etchType)
+  {
+    return new EtchedBorder (etchType);
+  }
+
+  /**
+   * Create a border with an "etched" look using the specified highlighting and
+   * shading colors.
+   *
+   * @param highlight A Color object for the border highlights
+   * @param shadow A Color object for the border shadows
+   *
+   * @return The Border object
+   */ 
+  public static Border createEtchedBorder (Color highlight, Color shadow)
+  {
+    return new EtchedBorder (highlight, shadow);
+  }
+
+  /**
+   * Create a border with an "etched" look using the specified highlighting and
+   * shading colors.
+   *
+   * @param highlight A Color object for the border highlights
+   * @param shadow A Color object for the border shadows
+   *
+   * @return The Border object
     */ 
-    return null;
- }
-
-public static Border createEtchedBorder(Color highlight,
+  public static Border createEtchedBorder (int etchType, Color highlight,
                                         Color shadow)
-  { /*
-
-    Create a border with an "etched" look using the specified highlighting and shading colors.
-
-    Parameters:
-    highlight - a Color object for the border highlightsshadow - a Color object for the border shadowsReturns:
-    the Border object
-createTitledBorder
-
-    */ 
-    return null;
+  {
+    return new EtchedBorder (etchType, highlight, shadow);
  }
 
-  public static TitledBorder createTitledBorder(String title)
-  { /*
-    Create a new title border specifying the text of the title, using the default border (etched), using the default text position (sitting on the top line) and default justification (left) and using the default font and text color determined by the current look and feel.
-
-    Parameters:
-    title - a String containing the text of the titleReturns:
-    the TitledBorder object
-createTitledBorder
-
+  /**
+   * Create a new title border specifying the text of the title, using the
+   * default border (etched), using the default text position (sitting on the
+   * top line) and default justification (left) and using the default font and
+   * text color determined by the current look and feel.
+   *
+   * @param title A String containing the text of the title
+   *
+   * @return The TitledBorder object
+   */ 
+  public static TitledBorder createTitledBorder (String title)
+  {
+    return new TitledBorder (title);
+  }
+
+  /**
+   * Create a new title border with an empty title specifying the border
+   * object, using the default text position (sitting on the top line) and
+   * default justification (left) and using the default font, text color,
+   * and border determined by the current look and feel. (The Motif and Windows
+   * look and feels use an etched border; The Java look and feel use a
+   * gray border.)
+   *
+   * @param border The Border object to add the title to
+   *
+   * @return The TitledBorder object
+   */ 
+  public static TitledBorder createTitledBorder (Border border)
+  {
+    return new TitledBorder (border);
+  }
+
+  /**
+   * Add a title to an existing border, specifying the text of the title, using
+   * the default positioning (sitting on the top line) and default
+   * justification (left) and using the default font and text color determined
+   * by the current look and feel.
+   *
+   * @param order The Border object to add the title to
+   * @param title A String containing the text of the title
+   *
+   * @return The TitledBorder object
+   */ 
+  public static TitledBorder createTitledBorder (Border border, String title)
+  {
+    return new TitledBorder (border, title);
+  }
+
+  /**
+   * Add a title to an existing border, specifying the text of the title along
+   * with its positioning, using the default font and text color determined by
+   * the current look and feel.
+   *
+   * @param border The Border object to add the title to
+   * @param title A String containing the text of the title
+   * @param titleJustification An int specifying the left/right position of
+   * the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or
+   * TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).
+   * @param titlePosition An int specifying the vertical position of the text
+   * in relation to the border -- one of: TitledBorder.ABOVE_TOP,
+   * TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP,
+   * TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom
+   * line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).
+   *
+   * @return The TitledBorder object
     */ 
-    return null;
- }
-
-  public static TitledBorder createTitledBorder(Border border)
-  { /*
-
-    Create a new title border with an empty title specifying the border object, using the default text position (sitting on the top line) and default justification (left) and using the default font, text color, and border determined by the current look and feel. (The Motif and Windows look and feels use an etched border; The Java look and feel use a gray border.)
-
-    Parameters:
-    border - the Border object to add the title toReturns:
-    the TitledBorder object
-createTitledBorder
-
-    */ 
-    return null;
- }
-
-public static TitledBorder createTitledBorder(Border border,
-                                              String title)
-  { /*
-
-    Add a title to an existing border, specifying the text of the title, using the default positioning (sitting on the top line) and default justification (left) and using the default font and text color determined by the current look and feel.
-
-    Parameters:
-    border - the Border object to add the title totitle - a String containing the text of the titleReturns:
-    the TitledBorder object
-createTitledBorder
-
-    */ 
-    return null;
- }
-
-public static TitledBorder createTitledBorder(Border border,
-                                              String title,
+  public static TitledBorder createTitledBorder (Border border, String title,
                                               int titleJustification,
                                               int titlePosition)
-  { /*
-
-    Add a title to an existing border, specifying the text of the title along with its positioning, using the default font and text color determined by the current look and feel.
-
-    Parameters:
-    border - the Border object to add the title totitle - a String containing the text of the titletitleJustification - an int specifying the left/right position of the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).titlePosition - an int specifying the vertical position of the text in relation to the border -- one of: TitledBorder.ABOVE_TOP, TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).Returns:
-    the TitledBorder object
-createTitledBorder
-
-    */ 
-    return null;
+  {
+    return new TitledBorder (border, title, titleJustification, titlePosition);
  }
 
-public static TitledBorder createTitledBorder(Border border,
-                                              String title,
+  /**
+   * Add a title to an existing border, specifying the text of the title along
+   * with its positioning and font, using the default text color determined by
+   * the current look and feel.
+   *
+   * @param border - the Border object to add the title to
+   * @param title - a String containing the text of the title
+   * @param titleJustification - an int specifying the left/right position of
+   * the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or
+   * TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).
+   * @param titlePosition - an int specifying the vertical position of the
+   * text in relation to the border -- one of: TitledBorder.ABOVE_TOP,
+   * TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP,
+   * TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom
+   * line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).
+   * @param titleFont - a Font object specifying the title font
+   *
+   * @return The TitledBorder object
+   */ 
+  public static TitledBorder createTitledBorder (Border border, String title,
                                               int titleJustification,
                                               int titlePosition,
                                               Font titleFont)
-  { /*
-
-    Add a title to an existing border, specifying the text of the title along with its positioning and font, using the default text color determined by the current look and feel.
-
-    Parameters:
-    border - the Border object to add the title totitle - a String containing the text of the titletitleJustification - an int specifying the left/right position of the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).titlePosition - an int specifying the vertical position of the text in relation to the border -- one of: TitledBorder.ABOVE_TOP, TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).titleFont - a Font object specifying the title fontReturns:
-    the TitledBorder object
-createTitledBorder
-
+  {
+    return new TitledBorder (border, title, titleJustification, titlePosition,
+			     titleFont);
+  }
+
+  /**
+   * Add a title to an existing border, specifying the text of the title along
+   * with its positioning, font, and color.
+   *
+   * @param border - the Border object to add the title to
+   * @param title - a String containing the text of the title
+   * @param titleJustification - an int specifying the left/right position of
+   * the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or
+   * TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).
+   * @param titlePosition - an int specifying the vertical position of the text
+   * in relation to the border -- one of: TitledBorder.ABOVE_TOP,
+   * TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP,
+   * TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom
+   * line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).
+   * @param titleFont - a Font object specifying the title font
+   * @param titleColor - a Color object specifying the title color
+   *
+   * @return The TitledBorder object
     */ 
-    return null;
- }
-
-public static TitledBorder createTitledBorder(Border border,
+  public static TitledBorder createTitledBorder (Border border,
                                               String title,
                                               int titleJustification,
                                               int titlePosition,
                                               Font titleFont,
                                               Color titleColor)
-  { /*
-
-    Add a title to an existing border, specifying the text of the title along with its positioning, font, and color.
-
-    Parameters:
-    border - the Border object to add the title totitle - a String containing the text of the titletitleJustification - an int specifying the left/right position of the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).titlePosition - an int specifying the vertical position of the text in relation to the border -- one of: TitledBorder.ABOVE_TOP, TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).titleFont - a Font object specifying the title fonttitleColor - a Color object specifying the title colorReturns:
-    the TitledBorder object
-createEmptyBorder
-
+  {
+    return new TitledBorder (border, title, titleJustification, titlePosition,
+			     titleFont, titleColor);
+  }
+
+  /**
+   * Creates an empty border that takes up no space. (The width of the top,
+   * bottom, left, and right sides are all zero.)
+   *
+   * @return The Border object
+   */ 
+  public static Border createEmptyBorder ()
+  {
+    return new EmptyBorder (0, 0, 0, 0);
+  }
+
+  /**
+   * Creates an empty border that takes up no space but which does no drawing,
+   * specifying the width of the top, left, bottom, and right sides.
+   *
+   * @param top An int specifying the width of the top in pixels
+   * @param left An int specifying the width of the left side in pixels
+   * @param bottom An int specifying the width of the right side in pixels
+   * @param right An int specifying the width of the bottom in pixels
+   *
+   * @return The Border object
     */ 
-    return null;
- }
-
-public static Border createEmptyBorder()
-  { /*
-
-    Creates an empty border that takes up no space. (The width of the top, bottom, left, and right sides are all zero.)
-
-    Returns:
-    the Border object
-createEmptyBorder
-
-    */ 
-    return null;
- }
-
-public static Border createEmptyBorder(int top,
-                                       int left,
-                                       int bottom,
+  public static Border createEmptyBorder (int top, int left, int bottom,
                                        int right)
-  { /*
-
-    Creates an empty border that takes up no space but which does no drawing, specifying the width of the top, left, bottom, and right sides.
-
-    Parameters:
-    top - an int specifying the width of the top in pixelsleft - an int specifying the width of the left side in pixelsbottom - an int specifying the width of the right side in pixelsright - an int specifying the width of the bottom in pixelsReturns:
-    the Border object
-createCompoundBorder
-
-    */ 
-    return null;
+  {
+    return new EmptyBorder (top, left, bottom, right);
  }
 
-public static CompoundBorder createCompoundBorder()
-  { /*
-
-    Create a compound border with a null inside edge and a null outside edge.
-
-    Returns:
-    the CompoundBorder object
-createCompoundBorder
+  /**
+   * Create a compound border with a null inside edge and a null outside edge.
+   *
+   * @return The CompoundBorder object
+   */ 
+  public static CompoundBorder createCompoundBorder ()
+  {
+    return new CompoundBorder ();
+  }
+
+  /**
+   * Create a compound border specifying the border objects to use for the
+   * outside and inside edges.
+   *
+   * @param outsideBorder A Border object for the outer edge of the
+   * compound border
+   * @param insideBorder A Border object for the inner edge of the
+   * compound border
+   *
+   * @return The CompoundBorder object
     */ 
-    return null;
- }
-
-
-public static CompoundBorder createCompoundBorder(Border outsideBorder,
+  public static CompoundBorder createCompoundBorder (Border outsideBorder,
                                                   Border insideBorder)
-  { /*
-
-    Create a compound border specifying the border objects to use for the outside and inside edges.
-
-    Parameters:
-    outsideBorder - a Border object for the outer edge of the compound borderinsideBorder - a Border object for the inner edge of the compound borderReturns:
-    the CompoundBorder object
-createMatteBorder
-    */ 
-    return null;
- }
-
-
-public static MatteBorder createMatteBorder(int top,
-                                            int left,
-                                            int bottom,
-                                            int right,
-                                            Color color)
-  { /*
-
-    Create a matte-look border using a solid color. (The difference between this border and a line border is that you can specify the individual border dimensions.)
-
-    Parameters:
-    top - an int specifying the width of the top in pixelsleft - an int specifying the width of the left side in pixelsbottom - an int specifying the width of the right side in pixelsright - an int specifying the width of the bottom in pixelscolor - a Color to use for the borderReturns:
-    the MatteBorder object
-createMatteBorder
-
-    */ 
-    return null;
+  {
+    return new CompoundBorder (outsideBorder, insideBorder);
  }
 
-public static MatteBorder createMatteBorder(int top,
-                                            int left,
-                                            int bottom,
-                                            int right,
-                                            Icon tileIcon)
-  { /*
-
-    Create a matte-look border that consists of multiple tiles of a specified icon. Multiple copies of the icon are placed side-by-side to fill up the border area.
-
-    Note:
-    If the icon doesn't load, the border area is painted gray.
-
-    Parameters:
-    top - an int specifying the width of the top in pixelsleft - an int specifying the width of the left side in pixelsbottom - an int specifying the width of the right side in pixelsright - an int specifying the width of the bottom in pixelstileIcon - the Icon object used for the border tilesReturns:
-    the MatteBorder object
-
-    */ 
-    return null;
+  /**
+   * Create a matte-look border using a solid color. (The difference between
+   * this border and a line border is that you can specify the individual
+   * border dimensions.)
+   *
+   * @param top An int specifying the width of the top in pixels
+   * @param left An int specifying the width of the left side in pixels
+   * @param bottom An int specifying the width of the right side in pixels
+   * @param right An int specifying the width of the bottom in pixels
+   * @param color A Color to use for the border
+   *
+   * @return The MatteBorder object
+   */ 
+  public static MatteBorder createMatteBorder (int top, int left, int bottom,
+					       int right, Color color)
+  {
+    return new MatteBorder (top, left, bottom, right, color);
+  }
+
+  /**
+   * Create a matte-look border that consists of multiple tiles of a specified
+   * icon. Multiple copies of the icon are placed side-by-side to fill up the
+   * border area.
+   *
+   * Note:
+   * If the icon doesn't load, the border area is painted gray.
+   *
+   * @param top An int specifying the width of the top in pixels
+   * @param left An int specifying the width of the left side in pixels
+   * @param bottom An int specifying the width of the right side in pixels
+   * @param right An int specifying the width of the bottom in pixels
+   * @param tileIcon The Icon object used for the border tiles
+   *
+   * @return The MatteBorder object
+   */ 
+  public static MatteBorder createMatteBorder (int top, int left, int bottom,
+					       int right, Icon tileIcon)
+  {
+    return new MatteBorder (top, left, bottom, right, tileIcon);
  }
-
 }
Index: javax/swing/Box.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Box.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Box.java
--- javax/swing/Box.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/Box.java	11 Jun 2003 13:15:14 -0000
@@ -35,14 +35,17 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
+import javax.accessibility.Accessible;
+
 /**
  * Needs some work I guess....
  *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
-public class Box extends JComponent
+public class Box extends JComponent implements Accessible
 {
     Box(int a)
     {
Index: javax/swing/BoxLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/BoxLayout.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 BoxLayout.java
--- javax/swing/BoxLayout.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/BoxLayout.java	11 Jun 2003 13:15:14 -0000
@@ -35,9 +35,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Container;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.LayoutManager2;
+import java.io.Serializable;
 
 /**
  * A layout for swing components.
@@ -46,7 +52,7 @@
  *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
-public class BoxLayout implements LayoutManager2
+public class BoxLayout implements LayoutManager2, Serializable
 {
     GridLayout      gridbag;
     
Index: javax/swing/ButtonGroup.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ButtonGroup.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ButtonGroup.java
--- javax/swing/ButtonGroup.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/ButtonGroup.java	11 Jun 2003 13:15:17 -0000
@@ -35,12 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.io.*;
-import java.util.*;
-import javax.swing.event.*;
+package javax.swing;
 
+import java.io.Serializable;
+import java.util.Enumeration;
+import java.util.Vector;
 
 public class ButtonGroup implements Serializable 
 {
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultButtonModel.java	11 Jun 2003 13:15:17 -0000
@@ -35,15 +35,22 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.util.*;
-import java.awt.event.*;
-import java.awt.*;
-import javax.swing.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.Serializable;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
 
 public class DefaultButtonModel
-  implements ButtonModel, java.io.Serializable
+  implements ButtonModel, Serializable
 {
   static final long serialVersionUID = -5342609566534980231L;
 
Index: javax/swing/DefaultListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultListModel.java
--- javax/swing/DefaultListModel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DefaultListModel.java	11 Jun 2003 13:15:17 -0000
@@ -35,17 +35,21 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+import java.util.Vector;
 
 /**
  * DefaultListModel
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class DefaultListModel extends AbstractListModel {
+public class DefaultListModel extends AbstractListModel
+{
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
Index: javax/swing/DefaultListSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListSelectionModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultListSelectionModel.java
--- javax/swing/DefaultListSelectionModel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DefaultListSelectionModel.java	11 Jun 2003 13:15:17 -0000
@@ -35,12 +35,16 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import javax.swing.event.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.ListSelectionListener;
 
-public class DefaultListSelectionModel implements ListSelectionModel
+public class DefaultListSelectionModel implements Cloneable, ListSelectionModel, Serializable
 {
     int mode = SINGLE_SELECTION;
 
Index: javax/swing/FocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/FocusManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FocusManager.java
--- javax/swing/FocusManager.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/FocusManager.java	11 Jun 2003 13:15:17 -0000
@@ -35,18 +35,20 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.DefaultKeyboardFocusManager;
+import java.awt.event.KeyEvent;
 
 /**
  * FocusManager
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public abstract class FocusManager {
+public abstract class FocusManager extends DefaultKeyboardFocusManager
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/ImageIcon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ImageIcon.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ImageIcon.java
--- javax/swing/ImageIcon.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ImageIcon.java	11 Jun 2003 13:15:17 -0000
@@ -35,12 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.awt.*;
-import java.awt.image.*;
 
+package javax.swing;
 
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Toolkit;
+import java.io.Serializable;
+import java.net.URL;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
 
 public class ImageIcon implements Icon
 {
Index: javax/swing/InputMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/InputMap.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 InputMap.java
--- javax/swing/InputMap.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/InputMap.java	11 Jun 2003 13:15:17 -0000
@@ -35,11 +35,19 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * InputMap
Index: javax/swing/JApplet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JApplet.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JApplet.java
--- javax/swing/JApplet.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JApplet.java	11 Jun 2003 13:15:17 -0000
@@ -35,18 +35,19 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.applet.*;
-import java.awt.*;
-import java.awt.event.*;
 
+package javax.swing;
 
+import java.applet.Applet;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.LayoutManager;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
-
 
 public class JApplet extends Applet
 {
Index: javax/swing/JButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JButton.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JButton.java
--- javax/swing/JButton.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JButton.java	11 Jun 2003 13:15:17 -0000
@@ -49,6 +49,8 @@
  */
 public class JButton extends AbstractButton implements Accessible 
 {
+  private static final long serialVersionUID = -1907255238954382202L;
+
     boolean def, is_def;
 
     
Index: javax/swing/JCheckBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBox.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JCheckBox.java
--- javax/swing/JCheckBox.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JCheckBox.java	11 Jun 2003 13:15:17 -0000
@@ -35,12 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import javax.accessibility.AccessibleContext;
 
 /**
  * An instance of JCheckbox can be added to a panel, frame etc
Index: javax/swing/JCheckBoxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JCheckBoxMenuItem.java	11 Jun 2003 13:15:17 -0000
@@ -46,7 +46,8 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, Accessible {
+public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, Accessible
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JColorChooser.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JColorChooser.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JColorChooser.java
--- javax/swing/JColorChooser.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JColorChooser.java	11 Jun 2003 13:15:17 -0000
@@ -35,15 +35,20 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.colorchooser.*;
-import javax.swing.plaf.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
+import javax.swing.colorchooser.ColorSelectionModel;
+import javax.swing.plaf.ColorChooserUI;
 
 /**
  * JColorChooser
Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComboBox.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JComboBox.java
--- javax/swing/JComboBox.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JComboBox.java	11 Jun 2003 13:15:17 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
@@ -52,8 +52,11 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JComboBox extends JComponent implements ItemSelectable, 
-		ListDataListener, ActionListener, Accessible {
+public class JComboBox extends JComponent
+  implements ItemSelectable, ListDataListener, ActionListener, Accessible
+{
+  private static final long serialVersionUID = 5654585963292734470L;
+
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
@@ -766,6 +769,7 @@
 	/**
 	 * isFocusTraversable
 	 * @returns boolean
+         * @deprecated
 	 */
 	public boolean isFocusTraversable() {
 		return false; // TODO
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JComponent.java
--- javax/swing/JComponent.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/JComponent.java	11 Jun 2003 13:15:18 -0000
@@ -35,21 +35,44 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.awt.*;
-import java.awt.peer.*;
-import java.awt.event.*;
-import java.io.*;
 
-import javax.swing.event.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-
-import java.util.*;
-import java.beans.*;
+package javax.swing;
 
-import javax.accessibility.*;
+import java.awt.AWTEvent;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionListener;
+import java.awt.event.ContainerEvent;
+import java.awt.event.ContainerListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.peer.LightweightPeer;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+import java.io.Serializable;
+import java.util.Vector;
+import java.util.Hashtable;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleExtendedComponent;
+import javax.accessibility.AccessibleKeyBinding;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleStateSet;
+import javax.swing.event.AncestorListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.border.Border;
+import javax.swing.plaf.ComponentUI;
 
 /**
  * Every component in swing inherits from this class (JLabel, JButton, etc).
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JDesktopPane.java
--- javax/swing/JDesktopPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JDesktopPane.java	11 Jun 2003 13:15:18 -0000
@@ -47,7 +47,8 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JDesktopPane extends JLayeredPane implements Accessible {
+public class JDesktopPane extends JLayeredPane implements Accessible
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JDialog.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDialog.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JDialog.java
--- javax/swing/JDialog.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JDialog.java	11 Jun 2003 13:15:18 -0000
@@ -35,16 +35,21 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+package javax.swing;
 
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.LayoutManager;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
 
 /**
  * Unlike JComponent derivatives, JDialog inherits from
Index: javax/swing/JEditorPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JEditorPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JEditorPane.java
--- javax/swing/JEditorPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JEditorPane.java	11 Jun 2003 13:15:18 -0000
@@ -35,15 +35,19 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.text.*;
-import javax.swing.event.*;
-import java.awt.event.*;
-import java.awt.*;
-import javax.accessibility.*;
+import java.awt.Dimension;
+import java.awt.event.KeyEvent;
+import java.io.InputStream;
+import java.net.URL;
+import javax.accessibility.AccessibleContext;
+import javax.swing.text.EditorKit;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.PlainEditorKit;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
 
 public class JEditorPane extends JTextComponent
 {
Index: javax/swing/JFileChooser.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFileChooser.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JFileChooser.java
--- javax/swing/JFileChooser.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JFileChooser.java	11 Jun 2003 13:15:18 -0000
@@ -35,17 +35,22 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-import javax.accessibility.*;
-import javax.swing.filechooser.*;
+import java.awt.Component;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Vector;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
 import javax.swing.filechooser.FileFilter;
-import javax.swing.plaf.*;
+import javax.swing.filechooser.FileSystemView;
+import javax.swing.filechooser.FileView;
+import javax.swing.plaf.FileChooserUI;
 
 /**
  * JFileChooser
Index: javax/swing/JFormattedTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFormattedTextField.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JFormattedTextField.java
--- javax/swing/JFormattedTextField.java	17 Mar 2003 09:09:39 -0000	1.1
+++ javax/swing/JFormattedTextField.java	11 Jun 2003 13:15:18 -0000
@@ -41,6 +41,7 @@
 import java.awt.event.FocusEvent;
 import java.io.Serializable;
 import java.text.Format;
+import java.text.ParseException;
 import javax.swing.text.Document;
 import javax.swing.text.DocumentFilter;
 import javax.swing.text.NavigationFilter;
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFrame.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JFrame.java
--- javax/swing/JFrame.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JFrame.java	11 Jun 2003 13:15:18 -0000
@@ -35,15 +35,20 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+package javax.swing;
 
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.LayoutManager;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
 
 /**
  * Unlike JComponent derivatives, JFrame inherits from
Index: javax/swing/JLabel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JLabel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JLabel.java
--- javax/swing/JLabel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JLabel.java	11 Jun 2003 13:15:18 -0000
@@ -35,19 +35,16 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.awt.*;
-import javax.swing.plaf.*;
 
+package javax.swing;
 
+import java.awt.Component;
+import java.awt.Image;
+import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
-
+import javax.swing.plaf.LabelUI;
 
-public class JLabel extends JComponent implements SwingConstants
+public class JLabel extends JComponent implements Accessible, SwingConstants
 {
     String text;
     Icon icon;
Index: javax/swing/JLayeredPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JLayeredPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JLayeredPane.java
--- javax/swing/JLayeredPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JLayeredPane.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,13 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
+import javax.accessibility.Accessible;
 
-public class JLayeredPane extends JComponent
+public class JLayeredPane extends JComponent implements Accessible
 {
     JLayeredPane()
     {
Index: javax/swing/JList.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JList.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JList.java
--- javax/swing/JList.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JList.java	11 Jun 2003 13:15:18 -0000
@@ -1,5 +1,5 @@
 /* JList.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,21 +35,21 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import javax.swing.event.*;
-
-import java.awt.*;
-import javax.swing.plaf.*;
-import java.util.*;
 
+package javax.swing;
 
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.util.Vector;
+import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.plaf.ListUI;
 
-public class JList extends JComponent implements Scrollable
+public class JList extends JComponent implements Accessible, Scrollable
 {
     Color select_back, select_fore;
     ListCellRenderer render;
@@ -143,14 +143,13 @@
     
     public void setListData(final Vector listData)
     {
-	// XXX - FIXME Don't also name this AL, workaround for gcj 3.1.
-	class ALData extends AbstractListModel 
+	class AL extends AbstractListModel 
 	{
 	    public int getSize()              { return listData.size(); }
 	    public Object getElementAt(int i) { return listData.elementAt(i); }
 	};
 	
-        setModel (new ALData());
+        setModel (new AL());
     }
     
     
Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuBar.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JMenuBar.java
--- javax/swing/JMenuBar.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JMenuBar.java	11 Jun 2003 13:15:18 -0000
@@ -35,7 +35,13 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
+
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import javax.accessibility.Accessible;
 
 public class JMenuBar extends JComponent
 {
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuItem.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JMenuItem.java
--- javax/swing/JMenuItem.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JMenuItem.java	11 Jun 2003 13:15:18 -0000
@@ -35,16 +35,26 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.MenuDragMouseEvent;
+import javax.swing.event.MenuDragMouseListener;
+import javax.swing.event.MenuKeyEvent;
+import javax.swing.event.MenuKeyListener;
+import javax.swing.plaf.MenuItemUI;
 
 /**
  * JMenuItem
Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JOptionPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JOptionPane.java
--- javax/swing/JOptionPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JOptionPane.java	11 Jun 2003 13:15:18 -0000
@@ -35,14 +35,16 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import javax.swing.plaf.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Frame;
+import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
+import javax.swing.plaf.OptionPaneUI;
 
 public class JOptionPane extends JComponent 
 {
Index: javax/swing/JPanel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPanel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JPanel.java
--- javax/swing/JPanel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JPanel.java	11 Jun 2003 13:15:18 -0000
@@ -35,22 +35,21 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
-import javax.swing.plaf.*;
+package javax.swing;
 
+import java.awt.FlowLayout;
+import java.awt.LayoutManager;
+import javax.swing.plaf.PanelUI;
+import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
 
 /**
  * An instance of JPanel can be added to a panel, frame etc
  *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
-public class JPanel extends JComponent
+public class JPanel extends JComponent implements Accessible
 {
     public JPanel()
     {
Index: javax/swing/JPasswordField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPasswordField.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JPasswordField.java
--- javax/swing/JPasswordField.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JPasswordField.java	11 Jun 2003 13:15:18 -0000
@@ -218,6 +218,7 @@
 	/**
 	 * getText
 	 * @returns String
+         * @deprecated
 	 */
 	public String getText() {
 		return null; // TODO
@@ -229,6 +230,7 @@
 	 * @param length TODO
 	 * @exception BadLocationException TODO
 	 * @returns String
+         * @deprecated
 	 */
 	public String getText(int offset, int length) throws BadLocationException {
 		return null; // TODO
Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPopupMenu.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JPopupMenu.java
--- javax/swing/JPopupMenu.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JPopupMenu.java	11 Jun 2003 13:15:18 -0000
@@ -51,7 +51,8 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JPopupMenu extends JComponent implements Accessible, MenuElement {
+public class JPopupMenu extends JComponent implements Accessible, MenuElement
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JProgressBar.java
--- javax/swing/JProgressBar.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JProgressBar.java	11 Jun 2003 13:15:18 -0000
@@ -49,7 +49,8 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JProgressBar extends JComponent implements SwingConstants, Accessible {
+public class JProgressBar extends JComponent implements SwingConstants, Accessible
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JRadioButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButton.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JRadioButton.java
--- javax/swing/JRadioButton.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JRadioButton.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import javax.accessibility.AccessibleContext;
 
 public class JRadioButton extends JToggleButton
 {
Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JRadioButtonMenuItem.java	11 Jun 2003 13:15:18 -0000
@@ -46,7 +46,8 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class JRadioButtonMenuItem extends JMenuItem implements Accessible {
+public class JRadioButtonMenuItem extends JMenuItem implements Accessible
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRootPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JRootPane.java
--- javax/swing/JRootPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JRootPane.java	11 Jun 2003 13:15:18 -0000
@@ -35,15 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+package javax.swing;
 
-import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.awt.LayoutManager2;
+import java.io.Serializable;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleComponent;
 
 /**
  * This class is where JComponents are added to.
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollBar.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JScrollBar.java
--- javax/swing/JScrollBar.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JScrollBar.java	11 Jun 2003 13:15:18 -0000
@@ -35,8 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
+import java.awt.Adjustable;
+import java.awt.event.AdjustmentListener;
+import javax.accessibility.Accessible;
 
 public class JScrollBar extends JComponent
 {
Index: javax/swing/JScrollPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JScrollPane.java
--- javax/swing/JScrollPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JScrollPane.java	11 Jun 2003 13:15:18 -0000
@@ -35,13 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
-import javax.swing.plaf.*;
+package javax.swing;
 
+import java.awt.Component;
+import javax.accessibility.Accessible;
+import javax.swing.plaf.ScrollPaneUI;
 
-public class JScrollPane extends JComponent
+public class JScrollPane extends JComponent implements Accessible, ScrollPaneConstants
 {
     protected JViewport  columnHeader;
     protected JViewport  rowHeader;
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JSeparator.java
--- javax/swing/JSeparator.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JSeparator.java	11 Jun 2003 13:15:18 -0000
@@ -48,7 +48,8 @@
  * @version	1.0
  */
 public class JSeparator extends JComponent 
-		implements SwingConstants, Accessible {
+  implements SwingConstants, Accessible
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSlider.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JSlider.java
--- javax/swing/JSlider.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/JSlider.java	11 Jun 2003 13:15:18 -0000
@@ -35,14 +35,22 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.io.*;
-import java.util.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
-import javax.swing.plaf.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleValue;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.SliderUI;
 
 /**
  * JSlider
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTabbedPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTabbedPane.java
--- javax/swing/JTabbedPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JTabbedPane.java	11 Jun 2003 13:15:18 -0000
@@ -35,19 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.util.*;
-import javax.swing.plaf.*;
-import java.awt.*;
 
+package javax.swing;
 
+import java.awt.Component;
+import java.util.Vector;
+import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleState;
-import javax.accessibility.AccessibleStateSet;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.TabbedPaneUI;
 
-public class JTabbedPane extends JComponent
+public class JTabbedPane extends JComponent implements Accessible, SwingConstants
 {
     class Tab
     {
Index: javax/swing/JTable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTable.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JTable.java
--- javax/swing/JTable.java	29 Apr 2003 12:34:49 -0000	1.3
+++ javax/swing/JTable.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
+import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Rectangle;
+import java.util.Hashtable;
 import java.util.Vector;
 import javax.accessibility.Accessible;
 import javax.swing.event.ChangeEvent;
@@ -49,9 +53,10 @@
 import javax.swing.event.TableColumnModelListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.JTableHeader;
 import javax.swing.table.TableModel;
+import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableColumnModel;
-import javax.swing.table.DefaultTableModel;
 
 public class JTable extends JComponent
   implements TableModelListener, Scrollable, TableColumnModelListener,
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTextField.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTextField.java
--- javax/swing/JTextField.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JTextField.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.event.*;
-import java.util.*;
+package javax.swing;
 
-import javax.accessibility.*;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+import javax.accessibility.AccessibleStateSet;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
 
 public class JTextField extends JEditorPane
 {
Index: javax/swing/JToggleButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToggleButton.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JToggleButton.java
--- javax/swing/JToggleButton.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JToggleButton.java	11 Jun 2003 13:15:18 -0000
@@ -35,14 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.swing.plaf.ButtonUI;
 
-public class JToggleButton extends AbstractButton
+public class JToggleButton extends AbstractButton implements Accessible
 {
     public JToggleButton()
     {
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JToolBar.java
--- javax/swing/JToolBar.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JToolBar.java	11 Jun 2003 13:15:18 -0000
@@ -50,7 +50,8 @@
  * @version	1.0
  */
 public class JToolBar extends JComponent 
-		implements SwingConstants, Accessible {
+  implements SwingConstants, Accessible
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/JToolTip.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolTip.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JToolTip.java
--- javax/swing/JToolTip.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JToolTip.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,13 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
+package javax.swing;
 
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
 
-public class JToolTip extends JComponent
+public class JToolTip extends JComponent implements Accessible
 {
     String text;
 
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTree.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTree.java
--- javax/swing/JTree.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JTree.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,28 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.io.Serializable;
+import java.util.Hashtable;
+import java.util.Vector;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.plaf.TreeUI;
+import javax.swing.tree.DefaultTreeSelectionModel;
+import javax.swing.tree.TreeCellEditor;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
 
 public class JTree extends JComponent implements Scrollable, Accessible
 {
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JViewport.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JViewport.java
--- javax/swing/JViewport.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JViewport.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,17 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import javax.swing.plaf.*;
-import java.awt.*;
+package javax.swing;
 
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import javax.accessibility.Accessible;
+import javax.swing.plaf.ViewportUI;
 
 public class JViewport extends JComponent
 {
Index: javax/swing/JWindow.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JWindow.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JWindow.java
--- javax/swing/JWindow.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JWindow.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,22 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.accessibility.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.LayoutManager;
+import java.awt.Window;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
 
 /**
  * Unlike JComponent derivatives, JWindow inherits from
Index: javax/swing/KeyStroke.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/KeyStroke.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 KeyStroke.java
--- javax/swing/KeyStroke.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/KeyStroke.java	11 Jun 2003 13:15:18 -0000
@@ -37,9 +37,9 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.event.*;
-import java.io.*;
+import java.awt.AWTKeyStroke;
+import java.awt.event.KeyEvent;
+import java.io.Serializable;
 
 /**
  * KeyStroke
Index: javax/swing/ListSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ListSelectionModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ListSelectionModel.java
--- javax/swing/ListSelectionModel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ListSelectionModel.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
+package javax.swing;
 
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionListener;
 
 public interface ListSelectionModel
 {
Index: javax/swing/LookAndFeel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/LookAndFeel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 LookAndFeel.java
--- javax/swing/LookAndFeel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/LookAndFeel.java	11 Jun 2003 13:15:18 -0000
@@ -35,9 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import javax.swing.text.*;
+import java.awt.Component;
+import javax.swing.text.JTextComponent;
 
 public abstract class LookAndFeel
 {
Index: javax/swing/RepaintManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/RepaintManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 RepaintManager.java
--- javax/swing/RepaintManager.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/RepaintManager.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.util.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /**
  * RepaintManager
Index: javax/swing/ScrollPaneLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ScrollPaneLayout.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ScrollPaneLayout.java
--- javax/swing/ScrollPaneLayout.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/ScrollPaneLayout.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.awt.Rectangle;
+import java.io.Serializable;
 
 /**
  * ScrollPaneLayout
Index: javax/swing/SizeRequirements.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SizeRequirements.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 SizeRequirements.java
--- javax/swing/SizeRequirements.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/SizeRequirements.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * SizeRequirements
Index: javax/swing/SwingConstants.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingConstants.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 SwingConstants.java
--- javax/swing/SwingConstants.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/SwingConstants.java	11 Jun 2003 13:15:18 -0000
@@ -35,9 +35,8 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
 
+package javax.swing;
 
 public  interface SwingConstants
 {
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Timer.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Timer.java
--- javax/swing/Timer.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/Timer.java	11 Jun 2003 13:15:18 -0000
@@ -35,13 +35,17 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.event.*;
-import java.util.*;
+package javax.swing;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.Serializable;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.event.EventListenerList;
 
-public class Timer
+public class Timer implements Serializable
 {
   int ticks;
   static boolean verbose;
Index: javax/swing/UIDefaults.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/UIDefaults.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 UIDefaults.java
--- javax/swing/UIDefaults.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/UIDefaults.java	11 Jun 2003 13:15:18 -0000
@@ -77,7 +77,7 @@
     Object createValue(UIDefaults table);
   } // interface LazyValue
 
-  public static class ProxyLazyValue
+  public static class ProxyLazyValue implements LazyValue
   {
     public ProxyLazyValue(String s)
     {
@@ -100,6 +100,8 @@
       throw new Error("not implemented");
     }
   } // class ProxyLazyValue
+
+  private static final long serialVersionUID = 7341222528856548117L;
 
   public UIDefaults()
   {
Index: javax/swing/UIManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/UIManager.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 UIManager.java
--- javax/swing/UIManager.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/UIManager.java	11 Jun 2003 13:15:18 -0000
@@ -35,19 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-import java.io.*;
-import java.awt.*;
-
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
 
+package javax.swing;
 
-import java.beans.*;
-
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Insets;
+import java.beans.PropertyChangeListener;
+import java.io.Serializable;
+import javax.swing.border.Border;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 public class UIManager implements Serializable
 {
Index: javax/swing/border/AbstractBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/AbstractBorder.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 AbstractBorder.java
--- javax/swing/border/AbstractBorder.java	5 Jun 2003 19:59:44 -0000	1.3
+++ javax/swing/border/AbstractBorder.java	11 Jun 2003 13:15:18 -0000
@@ -1,5 +1,5 @@
 /* AbstractBorder.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,85 +44,149 @@
 import java.awt.Rectangle;
 import java.io.Serializable;
 
-public abstract class AbstractBorder implements Border, Serializable
+
+/**
+ * An invisible zero-width border, serving as a base class for
+ * implementing more interesting borders.
+ *
+ * @author Sascha Brawer (brawer@dandelis.ch)
+ * @author Ronald Veldema (rveldema@cs.vu.nl)
+ */
+public abstract class AbstractBorder
+  implements Border, Serializable
 {
   static final long serialVersionUID = -545885975315191844L;
 
-  public AbstractBorder ()
-  {
-  }
 
-    public void paintBorder(Component c,
-			    Graphics g,
-			    int x,
-			    int y,
-			    int width,
-			    int height) 
+  /**
+   * Constructs a new AbstractBorder.
+   */
+  public AbstractBorder ()
     {
-	System.out.println("HMMMMM, abstract-border.paintBorder");
     }
 
 
-    public Insets getBorderInsets(Component c, Insets insets) 
-    {
-	if (insets == null)
-	    insets = new Insets(0,0,0,0);
+  /**
+   * Performs nothing, because the default implementation provided by
+   * this class is an invisible, zero-width border. Subclasses will
+   * likely want to override this method, but they are not required
+   * for doing so.
+   *
+   * @param c the component whose border is to be painted.
+   * @param g the graphics for painting.
+   * @param x the horizontal position for painting the border.
+   * @param y the vertical position for painting the border.
+   * @param width the width of the available area for painting the border.
+   * @param height the height of the available area for painting the border.
+   */
+  public void paintBorder (Component c, Graphics g,
+                           int x, int y, int width, int height) 
+  {
+    /* A previous version of Classpath had emitted a warning when
+     * this method was called. The warning was removed because it is
+     * perfectly legal for a subclass to not override the paintBorder
+     * method. An example would be EmptyBorder.
+     */
+  }
         
-	insets.left = insets.top = insets.right = insets.bottom = 5;
 
-        return insets;
+  /**
+   * Determines the insets of this border. The implementation provided
+   * by AbstractButton returns Insets for a zero-width border, whose
+   * <code>left</code>, <code>right</code>, <code>top</code> and
+   * <code>bottom</code> fields are all zero.
+   *
+   * @param c the component whose border is to be measured.
+   *
+   * @return a newly created Insets object, indicating a zero-width
+   *         border.
+   */
+  public Insets getBorderInsets (Component c)
+  {
+    return new Insets (0, 0, 0, 0);
     }
 
-    public Insets getBorderInsets(Component c)
+
+  /**
+   * Determines the insets of this border. The implementation provided
+   * by AbstractButton sets the <code>left</code>, <code>right</code>,
+   * <code>top</code> and <code>bottom</code> fields of the passed
+   * <code>insets</code> parameter to zero.
+   *
+   * @param c the component in the center of this border.
+   *
+   * @param insets an Insets object for holding the insets of this
+   *        border.
+   *
+   * @return the <code>insets</code> object.
+   */
+  public Insets getBorderInsets (Component c, Insets insets) 
     {
-        return getBorderInsets(c, new Insets(0,0,0,0));
+    insets.left = insets.right = insets.top = insets.bottom = 0;
+    return insets;
     }
 
 
-    public boolean isBorderOpaque() 
-    {   return false;   }
-
-    public Rectangle getInteriorRectangle(Component c,
-					  int x,
-					  int y,
-					  int width, 
-					  int height) 
-    {
-        return getInteriorRectangle(c,
-				    this,
-				    x,
-				    y,
-				    width,
-				    height);
+  /**
+   * Determines whether or not this border is opaque. An opaque border
+   * fills every pixel in its area when painting. Partially
+   * translucent borders must return <code>false</code>, or ugly
+   * artifacts can appear on screen. The default implementation
+   * provided by AbstractBorder always returns <code>false</code>.
+   *
+   * @return <code>false</code>.
+   */
+  public boolean isBorderOpaque () 
+  {
+    return false;
     }
 
         
-    public static Rectangle getInteriorRectangle(Component c,
-						 Border b,
-						 int x,
-						 int y,
-						 int width,
-						 int height)
-    {
-	if(b != null)
-	    {
-		Insets insets = b.getBorderInsets(c);
+  /**
+   * Returns a rectangle that covers the specified area minus this
+   * border.  Components that wish to determine an area into which
+   * they can safely draw without intersecting with a border might
+   * want to use this helper method.
+   *
+   * @param c the component in the center of this border.
+   * @param x the horizontal position of the border.
+   * @param y the vertical position of the border.
+   * @param width the width of the available area for the border.
+   * @param height the height of the available area for the border.
+   */
+  public Rectangle getInteriorRectangle (Component c,
+                                         int x, int y, int width, int height) 
+  {
+    return getInteriorRectangle (c, this, x, y, width, height);
+  }
 		
-		int w = insets.right - insets.left;
-		int h = insets.top   - insets.bottom;
 
-		return new Rectangle(x + insets.left,
-				     y + insets.top,
-				     width - w,
-				     height - h);
-	    }
-        else
-            {
-		return new Rectangle(x,
-				     y,
-				     width,
-				     height);
+  /**
+   * Returns a rectangle that covers the specified area minus a
+   * border.  Components that wish to determine an area into which
+   * they can safely draw without intersecting with a border might
+   * want to use this helper method.
+   *
+   * @param c the component in the center of this border.
+   * @param x the horizontal position of the border.
+   * @param y the vertical position of the border.
+   * @param width the width of the available area for the border.
+   * @param height the height of the available area for the border.
+   */
+  public static Rectangle getInteriorRectangle (Component c, Border b,
+                                                int x, int y, int width, int height)
+  {
+    Insets borderInsets;
+
+    if (b != null)
+    {
+      borderInsets = b.getBorderInsets (c);
+      x += borderInsets.left;
+      y += borderInsets.top;
+      width -= borderInsets.left + borderInsets.right;
+      height -= borderInsets.top + borderInsets.bottom;
 	    }
+
+    return new Rectangle (x, y, width, height);
     }
 }
-
Index: javax/swing/border/CompoundBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/CompoundBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CompoundBorder.java
--- javax/swing/border/CompoundBorder.java	5 Jun 2003 19:59:44 -0000	1.2
+++ javax/swing/border/CompoundBorder.java	11 Jun 2003 13:15:18 -0000
@@ -1,5 +1,5 @@
 /* CompoundBorder.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,45 +42,212 @@
 import java.awt.Graphics;
 import java.awt.Insets;
 
-public class CompoundBorder extends AbstractBorder
+/**
+ * A Border that is composed of an interior and an exterior border,
+ * where the interior border is tightly nested into the exterior.
+ *
+ * @author Sascha Brawer (brawer@dandelis.ch)
+ */
+public class CompoundBorder
+  extends AbstractBorder
 {
+  static final long serialVersionUID = 9054540377030555103L;
+
+
+  /**
+   * The inside border, which is painted between the bordered
+   * Component and the outside border. It is valid for
+   * <code>insideBorder</code> to be <code>null</code>.
+   */
   protected Border insideBorder;
+
+
+  /**
+   * The outside border, which is painted outside both the
+   * bordered Component and the inside border. It is valid for
+   * <code>outsideBorder</code> to be <code>null</code>.
+   */
   protected Border outsideBorder;
 
+
+  /**
+   * Constructs a CompoundBorder whose inside and outside borders
+   * are both <code>null</code>. While this does not really make
+   * any sense (there exists a class EmptyBorder as well, and not
+   * every Component needs to have a border at all), the API
+   * specification requires the existence of this constructor.
+   *
+   * @see EmptyBorder
+   */
   public CompoundBorder ()
   {
     this (null, null);
   }
 
+
+  /**
+   * Constructs a CompoundBorder with the specified inside and
+   * outside borders.
+   *
+   * @param outsideBorder the outside border, which is painted to the
+   *        outside of both <code>insideBorder</code> and the bordered
+   *        compoonent. It is acceptable to pass <code>null</code>, in
+   *        which no outside border is painted.
+   *
+   * @param insideBorder the inside border, which is painted to
+   *        between <code>outsideBorder</code> and the bordered
+   *        component. It is acceptable to pass <code>null</code>, in
+   *        which no intside border is painted.
+   */
   public CompoundBorder (Border outsideBorder, Border insideBorder)
   {
     this.outsideBorder = outsideBorder;
     this.insideBorder = insideBorder;
   }
     
-    public Insets getBorderInsets(Component  c,
-				  Insets s)
+
+  /**
+   * Determines whether or not this border is opaque. An opaque
+   * border fills every pixel in its area when painting. Partially
+   * translucent borders must return <code>false</code>, or ugly
+   * artifacts can appear on screen.
+   *
+   * @return <code>true</code> if both the inside and outside borders
+   *         are opaque, or <code>false</code> otherwise.
+   */
+  public boolean isBorderOpaque ()
+  {
+    /* While it would be safe to assume true for the opacity of
+     * a null border, this behavior would not be according to
+     * the API specification. Also, it is pathological to have
+     * null borders anyway.
+     */
+    if ((insideBorder == null) || (outsideBorder == null))
+      return false;
+
+    return insideBorder.isBorderOpaque()
+      && outsideBorder.isBorderOpaque();
+  }
+    
+
+  /**
+   * Paints the compound border by first painting the outside border,
+   * then painting the inside border tightly nested into the outside. 
+   *
+   * @param c the component whose border is to be painted.
+   * @param g the graphics for painting.
+   * @param x the horizontal position for painting the border.
+   * @param y the vertical position for painting the border.
+   * @param width the width of the available area for painting the border.
+   * @param height the height of the available area for painting the border.
+   */
+  public void paintBorder(Component c, Graphics g,
+                          int x, int y, int width, int height)
+  {
+    /* If there is an outside border, paint it and reduce the
+     * bounding box by its insets.
+     */
+    if (outsideBorder != null)
+    {
+      Insets outsideInsets;
+
+      outsideBorder.paintBorder(c, g, x, y, width, height);
+      outsideInsets = outsideBorder.getBorderInsets(c);
+
+      x += outsideInsets.left;
+      y += outsideInsets.top;
+
+      /* Reduce width and height by the respective extent of the
+       * outside border.
+       */
+      width -= outsideInsets.left + outsideInsets.right;
+      height -= outsideInsets.top + outsideInsets.bottom;
+    }
+
+    if (insideBorder != null)
+      insideBorder.paintBorder(c, g, x, y, width, height);
+  }
+
+
+  /**
+   * Changes the specified insets to the insets of this border,
+   * which is the sum of the insets of the inside and the outside
+   * border.
+   *
+   * @param c the component in the center of this border.
+   * @param insets an Insets object for holding the added insets.
+   *
+   * @return the <code>insets</code> object.
+   */
+  public Insets getBorderInsets(Component c, Insets insets)
     {
-	if (s == null)
-	    s = new Insets(0,0,0,0);
+    Insets borderInsets;
 	
-	s.left = s.right = s.top = s.bottom = 5;
+    if (insets == null)
+      insets = new Insets (0,0,0,0);
+    else
+      insets.left = insets.right = insets.top = insets.bottom = 0;
 	
-	return s;
+    /* If there is an outside border, add it to insets. */
+    if (outsideBorder != null)
+    {
+      borderInsets = outsideBorder.getBorderInsets(c);
+      insets.left += borderInsets.left;
+      insets.right += borderInsets.right;
+      insets.top += borderInsets.top;
+      insets.bottom += borderInsets.bottom;
     }
     
-    public boolean isBorderOpaque()
+    /* If there is an inside border, add it to insets. */
+    if (insideBorder != null)
     {
-	return false;
+      borderInsets = insideBorder.getBorderInsets(c);
+      insets.left += borderInsets.left;
+      insets.right += borderInsets.right;
+      insets.top += borderInsets.top;
+      insets.bottom += borderInsets.bottom;
+    }
+
+    return insets;
     }
     
-    public void paintBorder(Component  c, 
-			    Graphics  g,
-			    int  x,
-			    int  y,
-			    int  width,
-			    int  height)
+
+  /**
+   * Determines the insets of this border, which is the sum of the
+   * insets of the inside and the outside border.
+   *
+   * @param c the component in the center of this border.
+   */
+  public Insets getBorderInsets (Component c)
+  {
+    /* It is not clear why CompoundBorder does not simply inherit
+     * the implementation from AbstractBorder. However, we want
+     * to be compatible with the API specification, which overrides
+     * the getBorderInsets(Component) method.
+     */
+    return getBorderInsets (c, null);
+  }
+
+
+  /**
+   * Returns the outside border, which is painted outside both the
+   * bordered Component and the inside border. It is valid for the
+   * result to be <code>null</code>.
+   */
+  public Border getOutsideBorder ()
+  {
+    return outsideBorder;
+  }
+
+
+  /**
+   * Returns the inside border, which is painted between the bordered
+   * Component and the outside border. It is valid for the result to
+   * be <code>null</code>.
+   */
+  public Border getInsideBorder ()
     {
+    return insideBorder;
     }
 }
 
Index: javax/swing/colorchooser/AbstractColorChooserPanel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AbstractColorChooserPanel.java
--- javax/swing/colorchooser/AbstractColorChooserPanel.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/colorchooser/AbstractColorChooserPanel.java	11 Jun 2003 13:15:18 -0000
@@ -35,13 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.colorchooser;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import java.awt.Graphics;
+import javax.swing.Icon;
+import javax.swing.JColorChooser;
+import javax.swing.JPanel;
 
 /**
  * AbstractColorChooserPanel
Index: javax/swing/colorchooser/ColorChooserComponentFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ColorChooserComponentFactory.java
--- javax/swing/colorchooser/ColorChooserComponentFactory.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/colorchooser/ColorChooserComponentFactory.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.colorchooser;
 
-// Imports
-import javax.swing.*;
+import javax.swing.JComponent;
 
 /**
  * ColorChooserComponentFactory
Index: javax/swing/colorchooser/ColorSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/colorchooser/ColorSelectionModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ColorSelectionModel.java
--- javax/swing/colorchooser/ColorSelectionModel.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/colorchooser/ColorSelectionModel.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.colorchooser;
 
-// Imports
-import java.awt.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import javax.swing.event.ChangeListener;
 
 /**
  * ColorSelectionModel
Index: javax/swing/colorchooser/DefaultColorSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultColorSelectionModel.java
--- javax/swing/colorchooser/DefaultColorSelectionModel.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/colorchooser/DefaultColorSelectionModel.java	11 Jun 2003 13:15:18 -0000
@@ -1,4 +1,4 @@
-/* BoundedRangeModel.java --
+/* DefaultColorSelectionModel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -35,12 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.colorchooser;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import java.io.Serializable;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
 
 /**
  * DefaultColorSelectionModel
Index: javax/swing/event/AncestorEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/AncestorEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AncestorEvent.java
--- javax/swing/event/AncestorEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/AncestorEvent.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
-import javax.swing.*;
-import java.awt.*;
+import java.awt.AWTEvent;
+import java.awt.Container;
+import javax.swing.JComponent;
 
 /**
  * Ancestor Event
Index: javax/swing/event/HyperlinkEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/HyperlinkEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 HyperlinkEvent.java
--- javax/swing/event/HyperlinkEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/HyperlinkEvent.java	11 Jun 2003 13:15:18 -0000
@@ -35,18 +35,20 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
-import java.net.*;
-import java.util.*;
+import java.net.URL;
+import java.util.EventObject;
+import javax.swing.text.Element;
 
 /**
  * HyperlinkEvent
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public class HyperlinkEvent extends EventObject {
+public class HyperlinkEvent extends EventObject
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/event/InternalFrameAdapter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/InternalFrameAdapter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 InternalFrameAdapter.java
--- javax/swing/event/InternalFrameAdapter.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/InternalFrameAdapter.java	11 Jun 2003 13:15:18 -0000
@@ -41,8 +42,8 @@
  * InternalFrameAdapter
  * @author Andrew Selkirk
  */
-public class InternalFrameAdapter	extends		Object
-									implements	InternalFrameListener {
+public abstract class InternalFrameAdapter implements InternalFrameListener
+{
 
 	//-------------------------------------------------------------
 	// Initialization ---------------------------------------------
Index: javax/swing/event/InternalFrameEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/InternalFrameEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 InternalFrameEvent.java
--- javax/swing/event/InternalFrameEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/InternalFrameEvent.java	11 Jun 2003 13:15:18 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
 import java.awt.AWTEvent;
 import javax.swing.JInternalFrame;
 
Index: javax/swing/event/ListDataEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/ListDataEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ListDataEvent.java
--- javax/swing/event/ListDataEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/ListDataEvent.java	11 Jun 2003 13:15:18 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
 import java.util.EventObject;
 
 /**
Index: javax/swing/event/MouseInputAdapter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/MouseInputAdapter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 MouseInputAdapter.java
--- javax/swing/event/MouseInputAdapter.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/MouseInputAdapter.java	11 Jun 2003 13:15:18 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
 import java.awt.event.MouseEvent;
 
 /**
Index: javax/swing/event/SwingPropertyChangeSupport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/SwingPropertyChangeSupport.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 SwingPropertyChangeSupport.java
--- javax/swing/event/SwingPropertyChangeSupport.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/SwingPropertyChangeSupport.java	11 Jun 2003 13:15:18 -0000
@@ -49,6 +49,8 @@
 public final	class SwingPropertyChangeSupport
 				extends PropertyChangeSupport {
 
+  private static final long serialVersionUID = 7162625831330845068L;
+
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
 	//-------------------------------------------------------------
Index: javax/swing/event/TableModelEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/TableModelEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TableModelEvent.java
--- javax/swing/event/TableModelEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/TableModelEvent.java	11 Jun 2003 13:15:18 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
 import java.util.EventObject;
 import javax.swing.table.TableModel;
 
Index: javax/swing/event/TreeWillExpandListener.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/TreeWillExpandListener.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeWillExpandListener.java
--- javax/swing/event/TreeWillExpandListener.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/TreeWillExpandListener.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
 import java.util.EventListener;
+import javax.swing.tree.ExpandVetoException;
 
 /**
  * TreeWillExpandListener interface
Index: javax/swing/event/UndoableEditEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/UndoableEditEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 UndoableEditEvent.java
--- javax/swing/event/UndoableEditEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/UndoableEditEvent.java	11 Jun 2003 13:15:18 -0000
@@ -48,6 +48,8 @@
  */
 public class UndoableEditEvent extends EventObject {
 
+  private static final long serialVersionUID = 4418044561759134484L;
+
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
 	//-------------------------------------------------------------
Index: javax/swing/filechooser/FileFilter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/filechooser/FileFilter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FileFilter.java
--- javax/swing/filechooser/FileFilter.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/filechooser/FileFilter.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.filechooser;
 
-// Imports
-import java.io.*;
+import java.io.File;
 
 /**
  * FileFilter
Index: javax/swing/filechooser/FileSystemView.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/filechooser/FileSystemView.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FileSystemView.java
--- javax/swing/filechooser/FileSystemView.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/filechooser/FileSystemView.java	11 Jun 2003 13:15:18 -0000
@@ -35,10 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.filechooser;
 
-// Imports
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import javax.swing.Icon;
 
 /**
  * FileSystemView
Index: javax/swing/filechooser/FileView.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/filechooser/FileView.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FileView.java
--- javax/swing/filechooser/FileView.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/filechooser/FileView.java	11 Jun 2003 13:15:18 -0000
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.filechooser;
 
-// Imports
-import java.io.*;
-import javax.swing.*;
+import java.io.File;
+import javax.swing.Icon;
 
 /**
  * FileView
Index: javax/swing/plaf/BorderUIResource.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/BorderUIResource.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BorderUIResource.java
--- javax/swing/plaf/BorderUIResource.java	5 Jun 2003 21:18:31 -0000	1.3
+++ javax/swing/plaf/BorderUIResource.java	11 Jun 2003 13:15:18 -0000
@@ -67,7 +67,6 @@
      */
     public BorderUIResource(Border delegate)
     {
-	super ();
 	this.delegate = delegate;
     }
 
@@ -128,7 +127,7 @@
 				     Color highlight, 
 				     Color shadow) 
 	{
-	    super (bevelType);
+	  super (bevelType, highlight, shadow);
 	}
 	public BevelBorderUIResource(int bevelType,
 				     Color highlightOuter,
@@ -136,7 +135,8 @@
 				     Color shadowOuter,
 				     Color shadowInner) 
 	{
-	    super (bevelType);
+	  super (bevelType, highlightOuter, highlightInner, shadowOuter,
+		 shadowInner);
 	}
     }
 
@@ -191,7 +191,7 @@
 	public EtchedBorderUIResource(int etchType, Color highlight, 
 				      Color shadow)
 	{
-	  super (etchType);
+          super (etchType, highlight, shadow);
 	}
 
     }
@@ -210,7 +210,7 @@
 	public LineBorderUIResource(Color color,
 				    int thickness)
 	{
-	   super (color); 
+	   super (color, thickness);
 	}
     }
 
@@ -224,12 +224,13 @@
 	public MatteBorderUIResource(int top, int left, int bottom, 
 				     int right, Color color)
 	{
-	  super (top, left, bottom, right, color);
+          super (new Insets (top, left, bottom, right), color);
 	}
 	public MatteBorderUIResource(int top, int left, int bottom,
 				     int right, Icon tileIcon)
 	{
-	  super (top, left, bottom, right, tileIcon);
+          super (new Insets (top, left, bottom, right), tileIcon);
+
 	}
 	public MatteBorderUIResource(Icon tileIcon)
 	{
@@ -254,24 +255,24 @@
 	}
 	TitledBorderUIResource(Border border, String title)
 	{
-          super (border);
+          super (border, title);
 	}
 	TitledBorderUIResource(Border border, String title,
 			       int titleJustification, int titlePosition)
 	{
-          super (border);
+          super (border, title, titleJustification, titlePosition);
 	}
 	TitledBorderUIResource(Border border, String title,
 			       int titleJustification, int titlePosition,
 			       Font titleFont)
 	{
-          super (border);
+          super (border, title, titleJustification, titlePosition, titleFont);
 	}
 	TitledBorderUIResource(Border border, String title,
 			       int titleJustification, int titlePosition,
 			       Font titleFont, Color titleColor)
 	{
-          super (border);
+          super (border, title, titleJustification, titlePosition, titleFont, titleColor);
 	}
     }
 }
Index: javax/swing/plaf/basic/BasicDefaults.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicDefaults.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicDefaults.java
--- javax/swing/plaf/basic/BasicDefaults.java	5 Jun 2003 21:18:31 -0000	1.3
+++ javax/swing/plaf/basic/BasicDefaults.java	11 Jun 2003 13:15:18 -0000
@@ -38,9 +38,12 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import java.awt.*;
-import javax.swing.border.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.UIDefaults;
+import javax.swing.border.MatteBorder;
 
 class BasicBorder extends MatteBorder
 {
Index: javax/swing/table/AbstractTableModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/AbstractTableModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractTableModel.java
--- javax/swing/table/AbstractTableModel.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/table/AbstractTableModel.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.table;
 
-// Imports
-import java.io.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.io.Serializable;
+import java.util.EventListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 
 /**
  * AbstractTableModel
Index: javax/swing/table/DefaultTableCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/DefaultTableCellRenderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTableCellRenderer.java
--- javax/swing/table/DefaultTableCellRenderer.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/table/DefaultTableCellRenderer.java	11 Jun 2003 13:15:18 -0000
@@ -41,6 +42,8 @@
 import java.io.Serializable;
 import javax.swing.JLabel;
 import javax.swing.JTable;
+import javax.swing.border.Border;
+
 /**
  * STUBBED
  */
Index: javax/swing/table/DefaultTableColumnModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/DefaultTableColumnModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTableColumnModel.java
--- javax/swing/table/DefaultTableColumnModel.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/table/DefaultTableColumnModel.java	11 Jun 2003 13:15:18 -0000
@@ -35,14 +35,22 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.table;
 
-// Imports
-import java.beans.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.Serializable;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TableColumnModelEvent;
+import javax.swing.event.TableColumnModelListener;
 
 /**
  * DefaultTableColumnModel
Index: javax/swing/table/DefaultTableModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/DefaultTableModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTableModel.java
--- javax/swing/table/DefaultTableModel.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/table/DefaultTableModel.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.table;
 
-// Imports
-import java.io.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.io.Serializable;
+import java.util.Vector;
+import javax.swing.event.TableModelEvent;
 
 /**
  * DefaultTableModel
Index: javax/swing/table/TableColumn.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/TableColumn.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 TableColumn.java
--- javax/swing/table/TableColumn.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/table/TableColumn.java	11 Jun 2003 13:15:18 -0000
@@ -35,12 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.table;
 
-// Imports
-import java.beans.*;
-import java.io.*;
-import javax.swing.event.*;
+import java.beans.PropertyChangeListener;
+import java.io.Serializable;
+import javax.swing.event.SwingPropertyChangeSupport;
 
 /**
  * TableColumn
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/JTextComponent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTextComponent.java
--- javax/swing/text/JTextComponent.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/JTextComponent.java	11 Jun 2003 13:15:19 -0000
@@ -43,13 +43,20 @@
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Point;
-import javax.accessibility.*;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleText;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 import javax.swing.Scrollable;
 import javax.swing.UIManager;
-import javax.swing.event.*;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import javax.swing.plaf.TextUI;
 
 public abstract class JTextComponent extends JComponent
Index: javax/swing/tree/AbstractLayoutCache.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/AbstractLayoutCache.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AbstractLayoutCache.java
--- javax/swing/tree/AbstractLayoutCache.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/AbstractLayoutCache.java	11 Jun 2003 13:15:19 -0000
@@ -35,18 +35,19 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.awt.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.awt.Rectangle;
+import java.util.Enumeration;
+import javax.swing.event.TreeModelEvent;
 
 /**
  * AbstractLayoutCache
  * @author Andrew Selkirk
  */
-public abstract class AbstractLayoutCache implements RowMapper {
+public abstract class AbstractLayoutCache implements RowMapper
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
Index: javax/swing/tree/DefaultMutableTreeNode.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/DefaultMutableTreeNode.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultMutableTreeNode.java
--- javax/swing/tree/DefaultMutableTreeNode.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/tree/DefaultMutableTreeNode.java	11 Jun 2003 13:15:19 -0000
@@ -35,11 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Random;
+import java.util.Stack;
+import java.util.Vector;
 
 /**
  * DefaultMutableTreeNode
Index: javax/swing/tree/DefaultTreeCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/DefaultTreeCellEditor.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultTreeCellEditor.java
--- javax/swing/tree/DefaultTreeCellEditor.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/DefaultTreeCellEditor.java	11 Jun 2003 13:15:19 -0000
@@ -35,16 +35,29 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.EventObject;
+import javax.swing.Icon;
+import javax.swing.JTextField;
+import javax.swing.JTree;
+import javax.swing.border.Border;
+import javax.swing.event.CellEditorListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 
 /**
  * DefaultTreeCellEditor
Index: javax/swing/tree/DefaultTreeCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/DefaultTreeCellRenderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTreeCellRenderer.java
--- javax/swing/tree/DefaultTreeCellRenderer.java	24 Mar 2003 14:05:02 -0000	1.2
+++ javax/swing/tree/DefaultTreeCellRenderer.java	11 Jun 2003 13:15:19 -0000
@@ -35,11 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.awt.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import javax.swing.JTree;
 
 /**
  * DefaultTreeCellRenderer
Index: javax/swing/tree/DefaultTreeModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/DefaultTreeModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTreeModel.java
--- javax/swing/tree/DefaultTreeModel.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/tree/DefaultTreeModel.java	11 Jun 2003 13:15:19 -0000
@@ -35,12 +35,16 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.io.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.EventListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeModelListener;
 
 /**
  * DefaultTreeModel
Index: javax/swing/tree/DefaultTreeSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/DefaultTreeSelectionModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTreeSelectionModel.java
--- javax/swing/tree/DefaultTreeSelectionModel.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/tree/DefaultTreeSelectionModel.java	11 Jun 2003 13:15:19 -0000
@@ -35,14 +35,21 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.beans.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.event.SwingPropertyChangeSupport;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 
 /**
  * DefaultTreeSelectionModel
Index: javax/swing/tree/FixedHeightLayoutCache.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/FixedHeightLayoutCache.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FixedHeightLayoutCache.java
--- javax/swing/tree/FixedHeightLayoutCache.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/FixedHeightLayoutCache.java	11 Jun 2003 13:15:19 -0000
@@ -35,12 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.awt.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.awt.Rectangle;
+import java.util.Enumeration;
+import javax.swing.event.TreeModelEvent;
 
 /**
  * FixedHeightLayoutCache
Index: javax/swing/tree/TreeCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/TreeCellEditor.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeCellEditor.java
--- javax/swing/tree/TreeCellEditor.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/TreeCellEditor.java	11 Jun 2003 13:15:19 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
 import java.awt.Component;
 import javax.swing.JTree;
 
Index: javax/swing/tree/TreeModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/TreeModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeModel.java
--- javax/swing/tree/TreeModel.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/TreeModel.java	11 Jun 2003 13:15:19 -0000
@@ -35,10 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.TreeModelListener;
 
 /**
  * TreeModel interface
Index: javax/swing/tree/TreeNode.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/TreeNode.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeNode.java
--- javax/swing/tree/TreeNode.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/TreeNode.java	11 Jun 2003 13:15:19 -0000
@@ -35,10 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.util.*;
+import java.util.Enumeration;
 
 /**
  * TreeNode interface
Index: javax/swing/tree/TreePath.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/TreePath.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 TreePath.java
--- javax/swing/tree/TreePath.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/tree/TreePath.java	11 Jun 2003 13:15:19 -0000
@@ -35,10 +35,13 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * TreePath
Index: javax/swing/tree/TreeSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/TreeSelectionModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeSelectionModel.java
--- javax/swing/tree/TreeSelectionModel.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/TreeSelectionModel.java	11 Jun 2003 13:15:19 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
 import java.beans.PropertyChangeListener;
 import javax.swing.event.TreeSelectionListener;
 
Index: javax/swing/tree/VariableHeightLayoutCache.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/VariableHeightLayoutCache.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 VariableHeightLayoutCache.java
--- javax/swing/tree/VariableHeightLayoutCache.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/tree/VariableHeightLayoutCache.java	11 Jun 2003 13:15:19 -0000
@@ -35,12 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.tree;
 
-// Imports
-import java.awt.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.awt.Rectangle;
+import java.util.Enumeration;
+import javax.swing.event.TreeModelEvent;
 
 /**
  * VariableHeightLayoutCache
Index: javax/swing/undo/AbstractUndoableEdit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/undo/AbstractUndoableEdit.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractUndoableEdit.java
--- javax/swing/undo/AbstractUndoableEdit.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/undo/AbstractUndoableEdit.java	11 Jun 2003 13:15:19 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.undo;
 
-// Imports
 import java.io.Serializable;
 
 /**
Index: javax/swing/undo/CompoundEdit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/undo/CompoundEdit.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 CompoundEdit.java
--- javax/swing/undo/CompoundEdit.java	9 Aug 2002 04:26:13 -0000	1.1
+++ javax/swing/undo/CompoundEdit.java	11 Jun 2003 13:15:19 -0000
@@ -35,9 +35,9 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.undo;
 
-// Imports
 import java.util.Vector;
 
 /**
Index: javax/swing/undo/StateEdit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/undo/StateEdit.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 StateEdit.java
--- javax/swing/undo/StateEdit.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/undo/StateEdit.java	11 Jun 2003 13:15:19 -0000
@@ -35,10 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.undo;
 
-// Imports
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Iterator;
 
 /**
  * StateEdit
Index: javax/swing/undo/UndoManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/undo/UndoManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 UndoManager.java
--- javax/swing/undo/UndoManager.java	9 Aug 2002 04:26:13 -0000	1.1
+++ javax/swing/undo/UndoManager.java	11 Jun 2003 13:15:19 -0000
@@ -35,10 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.undo;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.event.UndoableEditListener;
 
 /**
  * UndoManager
Index: javax/swing/undo/UndoableEditSupport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/undo/UndoableEditSupport.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 UndoableEditSupport.java
--- javax/swing/undo/UndoableEditSupport.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/undo/UndoableEditSupport.java	11 Jun 2003 13:15:19 -0000
@@ -35,11 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.undo;
 
-// Imports
-import java.util.*;
-import javax.swing.event.*;
+import java.util.Vector;
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.event.UndoableEditListener;
 
 /**
  * UndoableEditSupport
