Index: javax/swing/AbstractAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractAction.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 AbstractAction.java
--- javax/swing/AbstractAction.java	11 Jun 2003 13:20:38 -0000	1.3
+++ javax/swing/AbstractAction.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* AbstractAction.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,13 @@
 
 package javax.swing;
 
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import javax.swing.event.*;
-import java.util.*;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import javax.swing.event.SwingPropertyChangeSupport;
 
 /**
  * AbstractAction
Index: javax/swing/AbstractSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractSet.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AbstractSet.java
--- javax/swing/AbstractSet.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/AbstractSet.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* AbstractSet.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,9 @@
 
 package javax.swing;
 
-import java.util.*;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * Empty
Index: javax/swing/Action.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Action.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Action.java
--- javax/swing/Action.java	12 Oct 2003 13:20:49 -0000	1.3
+++ javax/swing/Action.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* Action.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionListener;
 import java.beans.PropertyChangeListener;
 
 /**
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ActionMap.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ActionMap.java
--- javax/swing/ActionMap.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/ActionMap.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* ActionMap.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,17 @@
 
 package javax.swing;
 
-// 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.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * ActionMap
Index: javax/swing/BoundedRangeModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/BoundedRangeModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BoundedRangeModel.java
--- javax/swing/BoundedRangeModel.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/BoundedRangeModel.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* BoundedRangeModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 /**
  * BoundedRangeModel
Index: javax/swing/ButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ButtonModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ButtonModel.java
--- javax/swing/ButtonModel.java	14 Jul 2003 05:33:30 -0000	1.2
+++ javax/swing/ButtonModel.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* ButtonModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,10 @@
 
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.event.*;
+import java.awt.ItemSelectable;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemListener;
+import javax.swing.event.ChangeListener;
 
 public interface ButtonModel extends ItemSelectable
 {  
Index: javax/swing/CellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CellEditor.java
--- javax/swing/CellEditor.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/CellEditor.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* CellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.util.*;
-import javax.swing.event.*;
+import java.util.EventObject;
+import javax.swing.event.CellEditorListener;
 
 /**
  * CellEditor
Index: javax/swing/CellRendererPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellRendererPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 CellRendererPane.java
--- javax/swing/CellRendererPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/CellRendererPane.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* CellRendererPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,15 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.accessibility.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
 
 /**
  * CellRendererPane
Index: javax/swing/ComboBoxEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ComboBoxEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ComboBoxEditor.java
--- javax/swing/ComboBoxEditor.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/ComboBoxEditor.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* ComboBoxEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.event.ActionListener;
 
 /**
  * ComboBoxEditor
Index: javax/swing/DebugGraphics.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DebugGraphics.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DebugGraphics.java
--- javax/swing/DebugGraphics.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DebugGraphics.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DebugGraphics.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,16 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.image.*;
-import java.io.*;
-import java.text.*;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.image.ImageObserver;
+import java.io.PrintStream;
+import java.text.AttributedCharacterIterator;
 
 /**
  * DebugGraphics
Index: javax/swing/DefaultCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultCellEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultCellEditor.java
--- javax/swing/DefaultCellEditor.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultCellEditor.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultCellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,13 +37,15 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.table.*;
-import javax.swing.tree.*;
+import java.awt.Component;
+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.EventObject;
+import javax.swing.table.TableCellEditor;
+import javax.swing.tree.TreeCellEditor;
 
 /**
  * DefaultCellEditor
Index: javax/swing/DefaultCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultCellRenderer.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultCellRenderer.java
--- javax/swing/DefaultCellRenderer.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DefaultCellRenderer.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultCellRenderer.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,10 @@
 
 package javax.swing;
 
-import java.awt.*;
-
-
 // this is what SUN basically told us to do so:
 // no icon though as that's not implemented yet....
+
+import java.awt.Component;
 
 public class DefaultCellRenderer extends JLabel implements ListCellRenderer 
 {
Index: javax/swing/DefaultComboBoxModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultComboBoxModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultComboBoxModel.java
--- javax/swing/DefaultComboBoxModel.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultComboBoxModel.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultComboBoxModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Vector;
 
 /**
  * DefaultComboBoxModel
Index: javax/swing/DefaultDesktopManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultDesktopManager.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultDesktopManager.java
--- javax/swing/DefaultDesktopManager.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultDesktopManager.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultDesktopManager.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
+import java.awt.Rectangle;
+import java.io.Serializable;
 
 /**
  * DefaultDesktopManager
Index: javax/swing/DefaultFocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultFocusManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultFocusManager.java
--- javax/swing/DefaultFocusManager.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DefaultFocusManager.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultFocusManager.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,10 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.event.KeyEvent;
+import java.util.Stack;
 
 /**
  * DefaultFocusManager
Index: javax/swing/DefaultListCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListCellRenderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultListCellRenderer.java
--- javax/swing/DefaultListCellRenderer.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultListCellRenderer.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultListCellRenderer.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,10 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.Rectangle;
+import java.io.Serializable;
+import javax.swing.border.Border;
 
 /**
  * DefaultListCellRenderer
Index: javax/swing/Icon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Icon.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Icon.java
--- javax/swing/Icon.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/Icon.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* Icon.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,8 @@
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
 
 public interface Icon
 {
Index: javax/swing/JButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JButton.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JButton.java
--- javax/swing/JButton.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JButton.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JButton.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,9 @@
 
 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;
 
 /**
  * An instance of JButton 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.2
diff -u -b -B -r1.2 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JCheckBoxMenuItem.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JCheckBoxMenuItem.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,11 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
 
 /**
  * JCheckBoxMenuItem
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JDesktopPane.java
--- javax/swing/JDesktopPane.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JDesktopPane.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JDesktopPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,12 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.plaf.DesktopPaneUI;
 
 /**
  * JDesktopPane
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenu.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JMenu.java
--- javax/swing/JMenu.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/JMenu.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JMenu.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,14 +37,23 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import java.util.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Hashtable;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleSelection;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+import javax.swing.event.ChangeListener;
 
 /**
  * JMenu
Index: javax/swing/JPanel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPanel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JPanel.java
--- javax/swing/JPanel.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JPanel.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JPanel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +39,10 @@
 
 import java.awt.FlowLayout;
 import java.awt.LayoutManager;
-import javax.swing.plaf.PanelUI;
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
+import javax.swing.plaf.PanelUI;
+
 
 /**
  * An instance of JPanel can be added to a panel, frame etc
Index: javax/swing/JPasswordField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPasswordField.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JPasswordField.java
--- javax/swing/JPasswordField.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JPasswordField.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JPasswordField.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,12 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.text.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
 
 /**
  * JPasswordField
Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPopupMenu.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JPopupMenu.java
--- javax/swing/JPopupMenu.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JPopupMenu.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JPopupMenu.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,14 +37,21 @@
 
 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.Dimension;
+import java.awt.Graphics;
+import java.awt.Insets;
+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.PopupMenuListener;
+import javax.swing.plaf.PopupMenuUI;
 
 /**
  * JPopupMenu
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JProgressBar.java
--- javax/swing/JProgressBar.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JProgressBar.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JProgressBar.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,12 +37,17 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
-import javax.swing.plaf.*;
+import java.awt.Graphics;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+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.ProgressBarUI;
 
 /**
  * JProgressBar