2003-06-08 Michael Koch <konqueror@gmx.de>

	* javax/swing/AbstractButton.java,
	javax/swing/AbstractCellEditor.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/JCheckBox.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/JRadioButton.java,
	javax/swing/JRootPane.java,
	javax/swing/JScrollBar.java,
	javax/swing/JSlider.java,
	javax/swing/JTabbedPane.java,
	javax/swing/JTextField.java,
	javax/swing/JToggleButton.java,
	javax/swing/JToolTip.java,
	javax/swing/JTree.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/UIManager.java:
	Reworked import statements to explicitely import used classes.

48 files changed, 395 insertions, 216 deletions

diff --git a/javax/swing/AbstractButton.java b/javax/swing/AbstractButton.java
index b675d808a..32524c568 100644
--- a/javax/swing/AbstractButton.java
+++ b/javax/swing/AbstractButton.java
@@ -35,18 +35,33 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
diff --git a/javax/swing/AbstractCellEditor.java b/javax/swing/AbstractCellEditor.java
index e25e97b18..026ab30f8 100644
--- a/javax/swing/AbstractCellEditor.java
+++ b/javax/swing/AbstractCellEditor.java
@@ -35,12 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/BorderFactory.java b/javax/swing/BorderFactory.java
index 808144fdd..737bc3ecb 100644
--- a/javax/swing/BorderFactory.java
+++ b/javax/swing/BorderFactory.java
@@ -38,10 +38,16 @@ exception statement from your version. */
 
 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
 {
diff --git a/javax/swing/Box.java b/javax/swing/Box.java
index a425db50b..6f6d74052 100644
--- a/javax/swing/Box.java
+++ b/javax/swing/Box.java
@@ -35,8 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
+import javax.accessibility.Accessible;
+
 /**
  * Needs some work I guess....
  *
diff --git a/javax/swing/BoxLayout.java b/javax/swing/BoxLayout.java
index 00d9cb438..23009fe68 100644
--- a/javax/swing/BoxLayout.java
+++ b/javax/swing/BoxLayout.java
@@ -35,9 +35,15 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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 @@ import java.awt.*;
  *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
-public class BoxLayout implements LayoutManager2
+public class BoxLayout implements LayoutManager2, Serializable
 {
     GridLayout      gridbag;
     
diff --git a/javax/swing/ButtonGroup.java b/javax/swing/ButtonGroup.java
index 502d08409..c872ab76a 100644
--- a/javax/swing/ButtonGroup.java
+++ b/javax/swing/ButtonGroup.java
@@ -35,12 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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 
 {
diff --git a/javax/swing/DefaultButtonModel.java b/javax/swing/DefaultButtonModel.java
index 9d6f4089d..52b78b337 100644
--- a/javax/swing/DefaultButtonModel.java
+++ b/javax/swing/DefaultButtonModel.java
@@ -35,15 +35,22 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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;
 
diff --git a/javax/swing/DefaultListModel.java b/javax/swing/DefaultListModel.java
index 3a8416359..43846a5cd 100644
--- a/javax/swing/DefaultListModel.java
+++ b/javax/swing/DefaultListModel.java
@@ -35,17 +35,21 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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 --------------------------------------------------
diff --git a/javax/swing/DefaultListSelectionModel.java b/javax/swing/DefaultListSelectionModel.java
index 64ae505fd..394bc5bc2 100644
--- a/javax/swing/DefaultListSelectionModel.java
+++ b/javax/swing/DefaultListSelectionModel.java
@@ -35,10 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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
 {
diff --git a/javax/swing/FocusManager.java b/javax/swing/FocusManager.java
index c770bd024..00cf47106 100644
--- a/javax/swing/FocusManager.java
+++ b/javax/swing/FocusManager.java
@@ -35,11 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.DefaultKeyboardFocusManager;
+import java.awt.event.KeyEvent;
 
 /**
  * FocusManager
diff --git a/javax/swing/ImageIcon.java b/javax/swing/ImageIcon.java
index ded11a134..872558d08 100644
--- a/javax/swing/ImageIcon.java
+++ b/javax/swing/ImageIcon.java
@@ -35,12 +35,18 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
 {
diff --git a/javax/swing/InputMap.java b/javax/swing/InputMap.java
index 861fe57ea..d748fb53e 100644
--- a/javax/swing/InputMap.java
+++ b/javax/swing/InputMap.java
@@ -35,11 +35,19 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/JApplet.java b/javax/swing/JApplet.java
index 094123a2c..ed450ced7 100644
--- a/javax/swing/JApplet.java
+++ b/javax/swing/JApplet.java
@@ -35,18 +35,19 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
 {
diff --git a/javax/swing/JCheckBox.java b/javax/swing/JCheckBox.java
index 4e6810ca2..4d2cee7e0 100644
--- a/javax/swing/JCheckBox.java
+++ b/javax/swing/JCheckBox.java
@@ -35,12 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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
diff --git a/javax/swing/JColorChooser.java b/javax/swing/JColorChooser.java
index c9c22f18c..8881dc355 100644
--- a/javax/swing/JColorChooser.java
+++ b/javax/swing/JColorChooser.java
@@ -35,15 +35,20 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/JComboBox.java b/javax/swing/JComboBox.java
index 4837e9720..54f287de3 100644
--- a/javax/swing/JComboBox.java
+++ b/javax/swing/JComboBox.java
@@ -35,9 +35,9 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 119e38591..7cfa7435d 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -35,21 +35,44 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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).
diff --git a/javax/swing/JDialog.java b/javax/swing/JDialog.java
index 61b9d40a4..11f27b239 100644
--- a/javax/swing/JDialog.java
+++ b/javax/swing/JDialog.java
@@ -35,16 +35,21 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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
diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java
index a2db3ee90..bce9dc706 100644
--- a/javax/swing/JEditorPane.java
+++ b/javax/swing/JEditorPane.java
@@ -35,15 +35,19 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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
 {
diff --git a/javax/swing/JFileChooser.java b/javax/swing/JFileChooser.java
index cfa435c6d..988e75b77 100644
--- a/javax/swing/JFileChooser.java
+++ b/javax/swing/JFileChooser.java
@@ -35,17 +35,22 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/JFormattedTextField.java b/javax/swing/JFormattedTextField.java
index c7838e80a..f26af99e6 100644
--- a/javax/swing/JFormattedTextField.java
+++ b/javax/swing/JFormattedTextField.java
@@ -41,6 +41,7 @@ package javax.swing;
 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;
diff --git a/javax/swing/JFrame.java b/javax/swing/JFrame.java
index 947bfab0e..9f4436ffb 100644
--- a/javax/swing/JFrame.java
+++ b/javax/swing/JFrame.java
@@ -35,15 +35,20 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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
diff --git a/javax/swing/JLabel.java b/javax/swing/JLabel.java
index a4d6fa16f..f1f219627 100644
--- a/javax/swing/JLabel.java
+++ b/javax/swing/JLabel.java
@@ -35,17 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
 {
diff --git a/javax/swing/JLayeredPane.java b/javax/swing/JLayeredPane.java
index ca49378db..4d7a9664f 100644
--- a/javax/swing/JLayeredPane.java
+++ b/javax/swing/JLayeredPane.java
@@ -35,9 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
+import javax.accessibility.Accessible;
 
 public class JLayeredPane extends JComponent
 {
diff --git a/javax/swing/JList.java b/javax/swing/JList.java
index b12e3c3d7..2f67a5881 100644
--- a/javax/swing/JList.java
+++ b/javax/swing/JList.java
@@ -35,19 +35,19 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
 {
diff --git a/javax/swing/JMenuBar.java b/javax/swing/JMenuBar.java
index dcceb9e31..24440db59 100644
--- a/javax/swing/JMenuBar.java
+++ b/javax/swing/JMenuBar.java
@@ -35,8 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import javax.accessibility.Accessible;
+
 public class JMenuBar extends JComponent
 {
   JMenuBar()
diff --git a/javax/swing/JMenuItem.java b/javax/swing/JMenuItem.java
index 7d3bfef9a..db09f2297 100644
--- a/javax/swing/JMenuItem.java
+++ b/javax/swing/JMenuItem.java
@@ -35,16 +35,26 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/JOptionPane.java b/javax/swing/JOptionPane.java
index 71904021a..5dc10c7dc 100644
--- a/javax/swing/JOptionPane.java
+++ b/javax/swing/JOptionPane.java
@@ -35,14 +35,16 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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 
 {
diff --git a/javax/swing/JPanel.java b/javax/swing/JPanel.java
index b50271628..dc6c44edf 100644
--- a/javax/swing/JPanel.java
+++ b/javax/swing/JPanel.java
@@ -35,15 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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
diff --git a/javax/swing/JRadioButton.java b/javax/swing/JRadioButton.java
index 7671b1d3f..14bfcebb1 100644
--- a/javax/swing/JRadioButton.java
+++ b/javax/swing/JRadioButton.java
@@ -35,12 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import javax.accessibility.AccessibleContext;
 
 public class JRadioButton extends JToggleButton
 {
diff --git a/javax/swing/JRootPane.java b/javax/swing/JRootPane.java
index e7216d706..f0121b8ce 100644
--- a/javax/swing/JRootPane.java
+++ b/javax/swing/JRootPane.java
@@ -35,15 +35,18 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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.
diff --git a/javax/swing/JScrollBar.java b/javax/swing/JScrollBar.java
index 482ed8f62..1cf6667d4 100644
--- a/javax/swing/JScrollBar.java
+++ b/javax/swing/JScrollBar.java
@@ -35,8 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
+import java.awt.Adjustable;
+import java.awt.event.AdjustmentListener;
+import javax.accessibility.Accessible;
 
 public class JScrollBar extends JComponent
 {
diff --git a/javax/swing/JSlider.java b/javax/swing/JSlider.java
index 58475b67f..c9fc022fa 100644
--- a/javax/swing/JSlider.java
+++ b/javax/swing/JSlider.java
@@ -35,14 +35,22 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/JTabbedPane.java b/javax/swing/JTabbedPane.java
index 915ec9325..218adade2 100644
--- a/javax/swing/JTabbedPane.java
+++ b/javax/swing/JTabbedPane.java
@@ -35,17 +35,16 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
 {
diff --git a/javax/swing/JTextField.java b/javax/swing/JTextField.java
index 806aa27df..edc3ea773 100644
--- a/javax/swing/JTextField.java
+++ b/javax/swing/JTextField.java
@@ -35,12 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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
 {
diff --git a/javax/swing/JToggleButton.java b/javax/swing/JToggleButton.java
index d0e90cb59..1f39a8a36 100644
--- a/javax/swing/JToggleButton.java
+++ b/javax/swing/JToggleButton.java
@@ -35,12 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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
 {
diff --git a/javax/swing/JToolTip.java b/javax/swing/JToolTip.java
index d245df99f..a853d5373 100644
--- a/javax/swing/JToolTip.java
+++ b/javax/swing/JToolTip.java
@@ -35,10 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-import java.awt.*;
+package javax.swing;
 
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
 
 public class JToolTip extends JComponent
 {
diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java
index f474c2f69..432612db8 100644
--- a/javax/swing/JTree.java
+++ b/javax/swing/JTree.java
@@ -35,11 +35,28 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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
 {
diff --git a/javax/swing/JWindow.java b/javax/swing/JWindow.java
index c74e33870..50d0c3168 100644
--- a/javax/swing/JWindow.java
+++ b/javax/swing/JWindow.java
@@ -35,11 +35,22 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-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
diff --git a/javax/swing/KeyStroke.java b/javax/swing/KeyStroke.java
index 7fe06995a..c3053aa28 100644
--- a/javax/swing/KeyStroke.java
+++ b/javax/swing/KeyStroke.java
@@ -37,9 +37,9 @@ exception statement from your version. */
 
 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
diff --git a/javax/swing/ListSelectionModel.java b/javax/swing/ListSelectionModel.java
index e4b985b93..f45684793 100644
--- a/javax/swing/ListSelectionModel.java
+++ b/javax/swing/ListSelectionModel.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
+package javax.swing;
 
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionListener;
 
 public interface ListSelectionModel
 {
diff --git a/javax/swing/LookAndFeel.java b/javax/swing/LookAndFeel.java
index cd9d201dc..b841a1780 100644
--- a/javax/swing/LookAndFeel.java
+++ b/javax/swing/LookAndFeel.java
@@ -35,9 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-import javax.swing.text.*;
+import java.awt.Component;
+import javax.swing.text.JTextComponent;
 
 public abstract class LookAndFeel
 {
diff --git a/javax/swing/RepaintManager.java b/javax/swing/RepaintManager.java
index cce32b5a0..55d62ae5f 100644
--- a/javax/swing/RepaintManager.java
+++ b/javax/swing/RepaintManager.java
@@ -35,11 +35,15 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/ScrollPaneLayout.java b/javax/swing/ScrollPaneLayout.java
index bd65471d0..d6cc479de 100644
--- a/javax/swing/ScrollPaneLayout.java
+++ b/javax/swing/ScrollPaneLayout.java
@@ -35,12 +35,15 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// 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
diff --git a/javax/swing/SizeRequirements.java b/javax/swing/SizeRequirements.java
index da6d1129d..eb641fbd1 100644
--- a/javax/swing/SizeRequirements.java
+++ b/javax/swing/SizeRequirements.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
-// Imports
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * SizeRequirements
diff --git a/javax/swing/SwingConstants.java b/javax/swing/SwingConstants.java
index dbdd71043..fb7c23b49 100644
--- a/javax/swing/SwingConstants.java
+++ b/javax/swing/SwingConstants.java
@@ -35,11 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
 
+package javax.swing;
 
-public  interface SwingConstants
+public interface SwingConstants
 {
     public static final int CENTER       = 0;
     public static final int TOP          = 1;
diff --git a/javax/swing/Timer.java b/javax/swing/Timer.java
index 1d5240521..085e2ab9a 100644
--- a/javax/swing/Timer.java
+++ b/javax/swing/Timer.java
@@ -35,11 +35,15 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
 
-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
 {
diff --git a/javax/swing/UIManager.java b/javax/swing/UIManager.java
index 8feaccf30..8c4f9cc4a 100644
--- a/javax/swing/UIManager.java
+++ b/javax/swing/UIManager.java
@@ -35,19 +35,18 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package javax.swing;
-
-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
 {