Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JRadioButtonMenuItem.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JRadioButtonMenuItem.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;
 
 /**
  * JRadioButtonMenuItem
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JSeparator.java
--- javax/swing/JSeparator.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JSeparator.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JSeparator.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.SeparatorUI;
 
 /**
  * JSeparator
Index: javax/swing/JSplitPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSplitPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JSplitPane.java
--- javax/swing/JSplitPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JSplitPane.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JSplitPane.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.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+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.plaf.SplitPaneUI;
 
 /**
  * JSplitPane
Index: javax/swing/JTextPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTextPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTextPane.java
--- javax/swing/JTextPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JTextPane.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JTextPane.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,16 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.text.*;
+import java.awt.Component;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.Style;
+import javax.swing.text.StyledDocument;
+import javax.swing.text.StyledEditorKit;
 
 /**
  * JTextPane
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JToolBar.java
--- javax/swing/JToolBar.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JToolBar.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JToolBar.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,19 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.beans.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.awt.Dimension;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.beans.PropertyChangeListener;
+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.swing.plaf.ToolBarUI;
 
 /**
  * JToolBar
Index: javax/swing/ListCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ListCellRenderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ListCellRenderer.java
--- javax/swing/ListCellRenderer.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/ListCellRenderer.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ListCellRenderer.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,7 @@
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
 
 public interface ListCellRenderer
 {
Index: javax/swing/ListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ListModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ListModel.java
--- javax/swing/ListModel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ListModel.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ListModel.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,7 @@
 
 package javax.swing;
 
-import javax.swing.event.*;
+import javax.swing.event.ListDataListener;
 
 public interface ListModel
 {    
Index: javax/swing/MenuElement.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/MenuElement.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 MenuElement.java
--- javax/swing/MenuElement.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/MenuElement.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* MenuElement.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,9 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
 
 /**
  * MenuElement
Index: javax/swing/OverlayLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/OverlayLayout.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 OverlayLayout.java
--- javax/swing/OverlayLayout.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/OverlayLayout.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* OverlayLayout.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.awt.*;
-import java.io.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager2;
+import java.io.Serializable;
 
 /**
  * OverlayLayout
Index: javax/swing/ProgressMonitor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ProgressMonitor.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ProgressMonitor.java
--- javax/swing/ProgressMonitor.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ProgressMonitor.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ProgressMonitor.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 java.awt.*;
+import java.awt.Component;
 
 /**
  * ProgressMonitor
Index: javax/swing/ProgressMonitorInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ProgressMonitorInputStream.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ProgressMonitorInputStream.java
--- javax/swing/ProgressMonitorInputStream.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ProgressMonitorInputStream.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ProgressMonitorInputStream.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;
 
-// Imports
-import java.awt.*;
-import java.io.*;
+import java.awt.Component;
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 
 /**
  * ProgressMonitorInputStream
Index: javax/swing/Renderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Renderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Renderer.java
--- javax/swing/Renderer.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/Renderer.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* Renderer.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 java.awt.*;
+import java.awt.Component;
 
 /**
  * Renderer
Index: javax/swing/RootPaneContainer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/RootPaneContainer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 RootPaneContainer.java
--- javax/swing/RootPaneContainer.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/RootPaneContainer.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* RootPaneContainer.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,8 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Container;
+import java.awt.Component;
 
 /**
  * RootPaneContainer
Index: javax/swing/Scrollable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Scrollable.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Scrollable.java
--- javax/swing/Scrollable.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/Scrollable.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* Scrollable.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.Dimension;
+import java.awt.Rectangle;
 
 public interface Scrollable
 {
Index: javax/swing/SingleSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SingleSelectionModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 SingleSelectionModel.java
--- javax/swing/SingleSelectionModel.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/SingleSelectionModel.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* SingleSelectionModel.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;
 
 /**
  * SingleSelectionModel
Index: javax/swing/ToolTipManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ToolTipManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ToolTipManager.java
--- javax/swing/ToolTipManager.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ToolTipManager.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ToolTipManager.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,12 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 
 /**
  * ToolTipManager
Index: javax/swing/ViewportLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ViewportLayout.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ViewportLayout.java
--- javax/swing/ViewportLayout.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/ViewportLayout.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ViewportLayout.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.awt.*;
-import java.io.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.io.Serializable;
 
 /**
  * ViewportLayout
Index: javax/swing/event/DocumentEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/DocumentEvent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DocumentEvent.java
--- javax/swing/event/DocumentEvent.java	12 Oct 2003 13:25:59 -0000	1.2
+++ javax/swing/event/DocumentEvent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* DocumentEvent.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,8 @@
 
 package javax.swing.event;
 
-// Imports
-import javax.swing.text.*;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
 
 /**
  * DocumentEvent public interface
Index: javax/swing/event/SwingPropertyChangeSupport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/SwingPropertyChangeSupport.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 SwingPropertyChangeSupport.java
--- javax/swing/event/SwingPropertyChangeSupport.java	11 Jun 2003 13:20:40 -0000	1.2
+++ javax/swing/event/SwingPropertyChangeSupport.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* SwingPropertyChangeSupport.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,14 @@
 
 package javax.swing.event;
 
-// Imports
-import java.beans.*;
-import java.io.*;
-import java.util.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.EventListener;
+import java.util.Hashtable;
 
 /**
  * SwingPropertyChangeSupport
Index: javax/swing/event/TreeSelectionEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/TreeSelectionEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeSelectionEvent.java
--- javax/swing/event/TreeSelectionEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/TreeSelectionEvent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* TreeSelectionEvent.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.event;
 
-// Imports
-import java.util.*;
-import javax.swing.tree.*;
+import java.util.EventObject;
+import javax.swing.tree.TreePath;
 
 /**
  * TreeSelectionEvent
Index: javax/swing/event/UndoableEditEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/UndoableEditEvent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 UndoableEditEvent.java
--- javax/swing/event/UndoableEditEvent.java	11 Jun 2003 13:20:40 -0000	1.2
+++ javax/swing/event/UndoableEditEvent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* UndoableEditEvent.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.event;
 
-// Imports
-import java.util.*;
-import javax.swing.undo.*;
+import java.util.EventObject;
+import javax.swing.undo.UndoableEdit;
 
 /**
  * UndoableEditEvent
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java	12 Oct 2003 13:33:32 -0000	1.2
+++ javax/swing/text/AbstractDocument.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* AbstractDocument.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,17 @@
 
 package javax.swing.text;
 
-import javax.swing.event.*;
-import javax.swing.undo.*;
-import java.util.*;
-import javax.swing.tree.*;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.event.UndoableEditListener;
+import javax.swing.tree.TreeNode;
+import javax.swing.undo.UndoableEdit;
 
 public abstract class AbstractDocument implements Document
 {
Index: javax/swing/text/AttributeSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/AttributeSet.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AttributeSet.java
--- javax/swing/text/AttributeSet.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/AttributeSet.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* AttributeSet.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.text;
 
-import java.util.*;
-
+import java.util.Enumeration;
 
 public interface AttributeSet
 { 
Index: javax/swing/text/Caret.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Caret.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Caret.java
--- javax/swing/text/Caret.java	21 Mar 2003 09:18:31 -0000	1.3
+++ javax/swing/text/Caret.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Caret.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,9 @@
 
 package javax.swing.text;
 
-import java.awt.*;
-import javax.swing.event.*;
+import java.awt.Graphics;
+import java.awt.Point;
+import javax.swing.event.ChangeListener;
 
 public interface Caret
 {
Index: javax/swing/text/ComponentView.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/ComponentView.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ComponentView.java
--- javax/swing/text/ComponentView.java	24 Mar 2003 14:05:02 -0000	1.2
+++ javax/swing/text/ComponentView.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* ComponentView.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.text;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Shape;
 
 public class ComponentView extends View
 {
Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultCaret.java
--- javax/swing/text/DefaultCaret.java	2 Mar 2003 19:45:52 -0000	1.2
+++ javax/swing/text/DefaultCaret.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* DefaultCaret.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,20 @@
 
 package javax.swing.text;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
 
 
 public class DefaultCaret extends Rectangle implements Caret, FocusListener, MouseListener, MouseMotionListener
Index: javax/swing/text/DefaultEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/DefaultEditorKit.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 DefaultEditorKit.java
--- javax/swing/text/DefaultEditorKit.java	29 Apr 2003 12:34:49 -0000	1.3
+++ javax/swing/text/DefaultEditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* DefaultEditorKit.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,12 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
 
 public class DefaultEditorKit extends EditorKit
 {
Index: javax/swing/text/Document.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Document.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Document.java
--- javax/swing/text/Document.java	12 Oct 2003 13:33:32 -0000	1.3
+++ javax/swing/text/Document.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Document.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,8 @@
 
 package javax.swing.text;
 
-
-import javax.swing.event.*;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.UndoableEditListener;
 
 public interface Document
 { 
Index: javax/swing/text/EditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/EditorKit.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 EditorKit.java
--- javax/swing/text/EditorKit.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/EditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* EditorKit.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,12 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
 
 public abstract class EditorKit implements Cloneable
 {
Index: javax/swing/text/GapContent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/GapContent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 GapContent.java
--- javax/swing/text/GapContent.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/GapContent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* GapContent.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,8 +40,7 @@
 // too lazy to make a real gapcontent.
 // lets just use a stringbuffer instead.
 
-import javax.swing.undo.*;
-
+import javax.swing.undo.UndoableEdit;
 
 public class GapContent implements AbstractDocument.Content
 {
Index: javax/swing/text/Keymap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Keymap.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Keymap.java
--- javax/swing/text/Keymap.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/Keymap.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Keymap.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.text;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
 
 public interface Keymap
 {
Index: javax/swing/text/MutableAttributeSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/MutableAttributeSet.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 MutableAttributeSet.java
--- javax/swing/text/MutableAttributeSet.java	12 Oct 2003 13:33:32 -0000	1.2
+++ javax/swing/text/MutableAttributeSet.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* MutableAttributeSet.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.text;
 
-// Imports
-import java.util.*;
+import java.util.Enumeration;
 
 /**
  * MutableAttributeSet
Index: javax/swing/text/PlainEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/PlainEditorKit.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 PlainEditorKit.java
--- javax/swing/text/PlainEditorKit.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/PlainEditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* PlainEditorKit.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,12 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
 
 public class PlainEditorKit extends EditorKit
 {
Index: javax/swing/text/Segment.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Segment.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Segment.java
--- javax/swing/text/Segment.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/Segment.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Segment.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -36,9 +36,6 @@
 exception statement from your version. */
 
 package javax.swing.text;
-
-import java.util.*;
-
 
 public class Segment implements Cloneable, CharacterIterator
 {
Index: javax/swing/text/Style.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Style.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Style.java
--- javax/swing/text/Style.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/Style.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Style.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,7 @@
 
 package javax.swing.text;
 
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 public interface Style
 {
Index: javax/swing/text/StyledDocument.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/StyledDocument.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 StyledDocument.java
--- javax/swing/text/StyledDocument.java	12 Oct 2003 13:33:32 -0000	1.2
+++ javax/swing/text/StyledDocument.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* StyledDcoument.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,8 @@
 
 package javax.swing.text;
 
-// Imports
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Font;
 
 /**
  * StyledDocument
Index: javax/swing/text/StyledEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/StyledEditorKit.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 StyledEditorKit.java
--- javax/swing/text/StyledEditorKit.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/text/StyledEditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* StyledEditorKit.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,19 @@
 
 package javax.swing.text;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Serializable;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
 
 /**
  * StyledEditorKit
Index: javax/swing/text/TextAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/TextAction.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TextAction.java
--- javax/swing/text/TextAction.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/TextAction.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* TextAction.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,9 @@
 
 package javax.swing.text;
 
-// Imports
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
 
 /**
  * TextAction
Index: javax/swing/text/View.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/View.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 View.java
--- javax/swing/text/View.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/View.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* View.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.text;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
+import java.awt.Graphics;
+import java.awt.Shape;
+import java.util.Vector;
+import javax.swing.SwingConstants;
 
 public abstract class View implements SwingConstants
 {