2004-01-10 Michael Koch <konqueror@gmx.de>

	* javax/swing/JRadioButtonMenuItem.java,
	javax/swing/JSeparator.java,
	javax/swing/JSplitPane.java,
	javax/swing/JTextPane.java,
	javax/swing/JToolBar.java,
	javax/swing/ListCellRenderer.java,
	javax/swing/ListModel.java,
	javax/swing/MenuElement.java,
	javax/swing/OverlayLayout.java,
	javax/swing/ProgressMonitor.java,
	javax/swing/ProgressMonitorInputStream.java,
	javax/swing/Renderer.java,
	javax/swing/RootPaneContainer.java,
	javax/swing/Scrollable.java,
	javax/swing/SingleSelectionModel.java,
	javax/swing/ToolTipManager.java,
	javax/swing/ViewportLayout.java,
	javax/swing/event/DocumentEvent.java,
	javax/swing/event/SwingPropertyChangeSupport.java,
	javax/swing/event/TreeSelectionEvent.java,
	javax/swing/event/UndoableEditEvent.java,
	javax/swing/text/AbstractDocument.java,
	javax/swing/text/AttributeSet.java,
	javax/swing/text/Caret.java,
	javax/swing/text/ComponentView.java,
	javax/swing/text/DefaultCaret.java,
	javax/swing/text/DefaultEditorKit.java,
	javax/swing/text/Document.java,
	javax/swing/text/EditorKit.java,
	javax/swing/text/GapContent.java,
	javax/swing/text/Keymap.java,
	javax/swing/text/MutableAttributeSet.java,
	javax/swing/text/PlainEditorKit.java,
	javax/swing/text/Segment.java,
	javax/swing/text/Style.java,
	javax/swing/text/StyledDocument.java,
	javax/swing/text/StyledEditorKit.java,
	javax/swing/text/TextAction.java,
	javax/swing/text/View.java: Fixed import statements.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75651 138bc75d-0d04-0410-961f-82ee72b054a4

40 files changed, 250 insertions, 144 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ae053f72de7..15d72fda988 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,45 @@
+2004-01-10  Michael Koch  <konqueror@gmx.de>
+
+	* javax/swing/JRadioButtonMenuItem.java,
+	javax/swing/JSeparator.java,
+	javax/swing/JSplitPane.java,
+	javax/swing/JTextPane.java,
+	javax/swing/JToolBar.java,
+	javax/swing/ListCellRenderer.java,
+	javax/swing/ListModel.java,
+	javax/swing/MenuElement.java,
+	javax/swing/OverlayLayout.java,
+	javax/swing/ProgressMonitor.java,
+	javax/swing/ProgressMonitorInputStream.java,
+	javax/swing/Renderer.java,
+	javax/swing/RootPaneContainer.java,
+	javax/swing/Scrollable.java,
+	javax/swing/SingleSelectionModel.java,
+	javax/swing/ToolTipManager.java,
+	javax/swing/ViewportLayout.java,
+	javax/swing/event/DocumentEvent.java,
+	javax/swing/event/SwingPropertyChangeSupport.java,
+	javax/swing/event/TreeSelectionEvent.java,
+	javax/swing/event/UndoableEditEvent.java,
+	javax/swing/text/AbstractDocument.java,
+	javax/swing/text/AttributeSet.java,
+	javax/swing/text/Caret.java,
+	javax/swing/text/ComponentView.java,
+	javax/swing/text/DefaultCaret.java,
+	javax/swing/text/DefaultEditorKit.java,
+	javax/swing/text/Document.java,
+	javax/swing/text/EditorKit.java,
+	javax/swing/text/GapContent.java,
+	javax/swing/text/Keymap.java,
+	javax/swing/text/MutableAttributeSet.java,
+	javax/swing/text/PlainEditorKit.java,
+	javax/swing/text/Segment.java,
+	javax/swing/text/Style.java,
+	javax/swing/text/StyledDocument.java,
+	javax/swing/text/StyledEditorKit.java,
+	javax/swing/text/TextAction.java,
+	javax/swing/text/View.java: Fixed import statements.
+
 2004-01-08  Graydon Hoare  <graydon@redhat.com>
 
 	* javax/swing/JLayeredPane.java: Rewrite to accomodate
diff --git a/libjava/javax/swing/JRadioButtonMenuItem.java b/libjava/javax/swing/JRadioButtonMenuItem.java
index d619bfdd051..e8623ba7542 100644
--- a/libjava/javax/swing/JRadioButtonMenuItem.java
+++ b/libjava/javax/swing/JRadioButtonMenuItem.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/JSeparator.java b/libjava/javax/swing/JSeparator.java
index a0a010aa304..a38d1a50a5e 100644
--- a/libjava/javax/swing/JSeparator.java
+++ b/libjava/javax/swing/JSeparator.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/JSplitPane.java b/libjava/javax/swing/JSplitPane.java
index f47ef7595d1..9a9be6cf833 100644
--- a/libjava/javax/swing/JSplitPane.java
+++ b/libjava/javax/swing/JSplitPane.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/JTextPane.java b/libjava/javax/swing/JTextPane.java
index 80e5a0e91c1..d1bd473de2d 100644
--- a/libjava/javax/swing/JTextPane.java
+++ b/libjava/javax/swing/JTextPane.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/JToolBar.java b/libjava/javax/swing/JToolBar.java
index a92157efbf2..8dce3c14b02 100644
--- a/libjava/javax/swing/JToolBar.java
+++ b/libjava/javax/swing/JToolBar.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/ListCellRenderer.java b/libjava/javax/swing/ListCellRenderer.java
index 36bc964e5c1..34c250cb9aa 100644
--- a/libjava/javax/swing/ListCellRenderer.java
+++ b/libjava/javax/swing/ListCellRenderer.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
 
 public interface ListCellRenderer
 {
diff --git a/libjava/javax/swing/ListModel.java b/libjava/javax/swing/ListModel.java
index 02710272c86..ef92d744198 100644
--- a/libjava/javax/swing/ListModel.java
+++ b/libjava/javax/swing/ListModel.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-import javax.swing.event.*;
+import javax.swing.event.ListDataListener;
 
 public interface ListModel
 {    
diff --git a/libjava/javax/swing/MenuElement.java b/libjava/javax/swing/MenuElement.java
index 3f198a7e9a4..60ae1afa62b 100644
--- a/libjava/javax/swing/MenuElement.java
+++ b/libjava/javax/swing/MenuElement.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/OverlayLayout.java b/libjava/javax/swing/OverlayLayout.java
index 4698e10bf45..1e1d4aeff0d 100644
--- a/libjava/javax/swing/OverlayLayout.java
+++ b/libjava/javax/swing/OverlayLayout.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/ProgressMonitor.java b/libjava/javax/swing/ProgressMonitor.java
index c3e01b5c018..aec483c3ee8 100644
--- a/libjava/javax/swing/ProgressMonitor.java
+++ b/libjava/javax/swing/ProgressMonitor.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Component;
 
 /**
  * ProgressMonitor
diff --git a/libjava/javax/swing/ProgressMonitorInputStream.java b/libjava/javax/swing/ProgressMonitorInputStream.java
index 46a36f5bb97..48802c3f895 100644
--- a/libjava/javax/swing/ProgressMonitorInputStream.java
+++ b/libjava/javax/swing/ProgressMonitorInputStream.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/Renderer.java b/libjava/javax/swing/Renderer.java
index 4cf5d5e042d..1f1a3005223 100644
--- a/libjava/javax/swing/Renderer.java
+++ b/libjava/javax/swing/Renderer.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Component;
 
 /**
  * Renderer
diff --git a/libjava/javax/swing/RootPaneContainer.java b/libjava/javax/swing/RootPaneContainer.java
index 0bc37c9f4ea..c571eb8c9b4 100644
--- a/libjava/javax/swing/RootPaneContainer.java
+++ b/libjava/javax/swing/RootPaneContainer.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Container;
+import java.awt.Component;
 
 /**
  * RootPaneContainer
diff --git a/libjava/javax/swing/Scrollable.java b/libjava/javax/swing/Scrollable.java
index 2f226f8528c..a69e3471221 100644
--- a/libjava/javax/swing/Scrollable.java
+++ b/libjava/javax/swing/Scrollable.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Rectangle;
 
 public interface Scrollable
 {
diff --git a/libjava/javax/swing/SingleSelectionModel.java b/libjava/javax/swing/SingleSelectionModel.java
index b3dc1f7835d..c2683921fac 100644
--- a/libjava/javax/swing/SingleSelectionModel.java
+++ b/libjava/javax/swing/SingleSelectionModel.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 /**
  * SingleSelectionModel
diff --git a/libjava/javax/swing/ToolTipManager.java b/libjava/javax/swing/ToolTipManager.java
index ffd5e4f1f5a..ba86f13cd4b 100644
--- a/libjava/javax/swing/ToolTipManager.java
+++ b/libjava/javax/swing/ToolTipManager.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/ViewportLayout.java b/libjava/javax/swing/ViewportLayout.java
index f735fe6207d..c984321495b 100644
--- a/libjava/javax/swing/ViewportLayout.java
+++ b/libjava/javax/swing/ViewportLayout.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/event/DocumentEvent.java b/libjava/javax/swing/event/DocumentEvent.java
index e86f3e4133b..a442a4a7770 100644
--- a/libjava/javax/swing/event/DocumentEvent.java
+++ b/libjava/javax/swing/event/DocumentEvent.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.event;
 
-// Imports
-import javax.swing.text.*;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
 
 /**
  * DocumentEvent public interface
diff --git a/libjava/javax/swing/event/SwingPropertyChangeSupport.java b/libjava/javax/swing/event/SwingPropertyChangeSupport.java
index 9092158df32..1f08cbfec9c 100644
--- a/libjava/javax/swing/event/SwingPropertyChangeSupport.java
+++ b/libjava/javax/swing/event/SwingPropertyChangeSupport.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/event/TreeSelectionEvent.java b/libjava/javax/swing/event/TreeSelectionEvent.java
index f53730fd645..238d2fc5f0f 100644
--- a/libjava/javax/swing/event/TreeSelectionEvent.java
+++ b/libjava/javax/swing/event/TreeSelectionEvent.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.event;
 
-// Imports
-import java.util.*;
-import javax.swing.tree.*;
+import java.util.EventObject;
+import javax.swing.tree.TreePath;
 
 /**
  * TreeSelectionEvent
diff --git a/libjava/javax/swing/event/UndoableEditEvent.java b/libjava/javax/swing/event/UndoableEditEvent.java
index 7fb7a9e3abb..be55e9b4555 100644
--- a/libjava/javax/swing/event/UndoableEditEvent.java
+++ b/libjava/javax/swing/event/UndoableEditEvent.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.event;
 
-// Imports
-import java.util.*;
-import javax.swing.undo.*;
+import java.util.EventObject;
+import javax.swing.undo.UndoableEdit;
 
 /**
  * UndoableEditEvent
diff --git a/libjava/javax/swing/text/AbstractDocument.java b/libjava/javax/swing/text/AbstractDocument.java
index 50a92ff85bf..027b99d5cb5 100644
--- a/libjava/javax/swing/text/AbstractDocument.java
+++ b/libjava/javax/swing/text/AbstractDocument.java
@@ -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 @@ exception statement from your version. */
 
 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
 {
diff --git a/libjava/javax/swing/text/AttributeSet.java b/libjava/javax/swing/text/AttributeSet.java
index 2ed3fc37d80..5c08a04f013 100644
--- a/libjava/javax/swing/text/AttributeSet.java
+++ b/libjava/javax/swing/text/AttributeSet.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import java.util.*;
-
+import java.util.Enumeration;
 
 public interface AttributeSet
 { 
diff --git a/libjava/javax/swing/text/Caret.java b/libjava/javax/swing/text/Caret.java
index f78f24edf1d..7393a753e2c 100644
--- a/libjava/javax/swing/text/Caret.java
+++ b/libjava/javax/swing/text/Caret.java
@@ -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 @@ exception statement from your version. */
 
 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
 {
diff --git a/libjava/javax/swing/text/ComponentView.java b/libjava/javax/swing/text/ComponentView.java
index 77a222cdb08..bd509b8dbcb 100644
--- a/libjava/javax/swing/text/ComponentView.java
+++ b/libjava/javax/swing/text/ComponentView.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Shape;
 
 public class ComponentView extends View
 {
diff --git a/libjava/javax/swing/text/DefaultCaret.java b/libjava/javax/swing/text/DefaultCaret.java
index 7fa94a4615a..7fdc3fcc541 100644
--- a/libjava/javax/swing/text/DefaultCaret.java
+++ b/libjava/javax/swing/text/DefaultCaret.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/text/DefaultEditorKit.java b/libjava/javax/swing/text/DefaultEditorKit.java
index c7daa71ac20..037ca9166f9 100644
--- a/libjava/javax/swing/text/DefaultEditorKit.java
+++ b/libjava/javax/swing/text/DefaultEditorKit.java
@@ -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 @@ exception statement from your version. */
 
 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
 {
diff --git a/libjava/javax/swing/text/Document.java b/libjava/javax/swing/text/Document.java
index 97ee9f39906..351b0aa6066 100644
--- a/libjava/javax/swing/text/Document.java
+++ b/libjava/javax/swing/text/Document.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-
-import javax.swing.event.*;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.UndoableEditListener;
 
 public interface Document
 { 
diff --git a/libjava/javax/swing/text/EditorKit.java b/libjava/javax/swing/text/EditorKit.java
index b52298c441c..acc21c114c1 100644
--- a/libjava/javax/swing/text/EditorKit.java
+++ b/libjava/javax/swing/text/EditorKit.java
@@ -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 @@ exception statement from your version. */
 
 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
 {
diff --git a/libjava/javax/swing/text/GapContent.java b/libjava/javax/swing/text/GapContent.java
index d6986974be2..50165437716 100644
--- a/libjava/javax/swing/text/GapContent.java
+++ b/libjava/javax/swing/text/GapContent.java
@@ -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 @@ package javax.swing.text;
 // 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
 {
diff --git a/libjava/javax/swing/text/Keymap.java b/libjava/javax/swing/text/Keymap.java
index 1d947123baf..8c1dd8bccc5 100644
--- a/libjava/javax/swing/text/Keymap.java
+++ b/libjava/javax/swing/text/Keymap.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
 
 public interface Keymap
 {
diff --git a/libjava/javax/swing/text/MutableAttributeSet.java b/libjava/javax/swing/text/MutableAttributeSet.java
index fdd4bbedca1..6bc18df1cbc 100644
--- a/libjava/javax/swing/text/MutableAttributeSet.java
+++ b/libjava/javax/swing/text/MutableAttributeSet.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-// Imports
-import java.util.*;
+import java.util.Enumeration;
 
 /**
  * MutableAttributeSet
diff --git a/libjava/javax/swing/text/PlainEditorKit.java b/libjava/javax/swing/text/PlainEditorKit.java
index fbeb91f0888..1c8c5de8b96 100644
--- a/libjava/javax/swing/text/PlainEditorKit.java
+++ b/libjava/javax/swing/text/PlainEditorKit.java
@@ -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 @@ exception statement from your version. */
 
 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
 {
diff --git a/libjava/javax/swing/text/Segment.java b/libjava/javax/swing/text/Segment.java
index 9d96c05ff24..8934b453210 100644
--- a/libjava/javax/swing/text/Segment.java
+++ b/libjava/javax/swing/text/Segment.java
@@ -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.
 
@@ -37,9 +37,6 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import java.util.*;
-
-
 public class Segment implements Cloneable, CharacterIterator
 {
     char[] array;
diff --git a/libjava/javax/swing/text/Style.java b/libjava/javax/swing/text/Style.java
index 99c4e329ab5..f6c8723b03a 100644
--- a/libjava/javax/swing/text/Style.java
+++ b/libjava/javax/swing/text/Style.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 public interface Style
 {
diff --git a/libjava/javax/swing/text/StyledDocument.java b/libjava/javax/swing/text/StyledDocument.java
index 852dde75fba..26b10ca22fa 100644
--- a/libjava/javax/swing/text/StyledDocument.java
+++ b/libjava/javax/swing/text/StyledDocument.java
@@ -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 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-// Imports
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Font;
 
 /**
  * StyledDocument
diff --git a/libjava/javax/swing/text/StyledEditorKit.java b/libjava/javax/swing/text/StyledEditorKit.java
index 16af630456a..8ec90662191 100644
--- a/libjava/javax/swing/text/StyledEditorKit.java
+++ b/libjava/javax/swing/text/StyledEditorKit.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/text/TextAction.java b/libjava/javax/swing/text/TextAction.java
index 5af1ce03445..55c04c1cd44 100644
--- a/libjava/javax/swing/text/TextAction.java
+++ b/libjava/javax/swing/text/TextAction.java
@@ -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 @@ exception statement from your version. */
 
 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
diff --git a/libjava/javax/swing/text/View.java b/libjava/javax/swing/text/View.java
index b09ed7ebeba..46d2b35e9c3 100644
--- a/libjava/javax/swing/text/View.java
+++ b/libjava/javax/swing/text/View.java
@@ -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 @@ exception statement from your version. */
 
 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
 {