From 848ad1d5b17a69b163abc0986cd33f6c64b921f1 Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 5 May 2004 09:16:18 +0000 Subject: [PATCH] 2004-05-05 Michael Koch * javax/swing/AbstractButton.java, javax/swing/ActionMap.java, javax/swing/DefaultButtonModel.java, javax/swing/DefaultListModel.java, javax/swing/ImageIcon.java, javax/swing/JComboBox.java, javax/swing/JComponent.java, javax/swing/JFrame.java, javax/swing/JInternalFrame.java, javax/swing/JMenuBar.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JProgressBar.java, javax/swing/JRootPane.java, javax/swing/JScrollBar.java, javax/swing/JScrollPane.java, javax/swing/JSeparator.java, javax/swing/JSlider.java, javax/swing/JTabbedPane.java, javax/swing/JTable.java, javax/swing/JTextField.java, javax/swing/JToolBar.java, javax/swing/JToolTip.java, javax/swing/JTree.java, javax/swing/JViewport.java, javax/swing/JWindow.java, javax/swing/KeyStroke.java, javax/swing/LookAndFeel.java, javax/swing/SwingUtilities.java, javax/swing/Timer.java, javax/swing/ToolTipManager.java, javax/swing/UIDefaults.java, javax/swing/border/TitledBorder.java, javax/swing/filechooser/FileSystemView.java, javax/swing/plaf/basic/BasicButtonListener.java, javax/swing/plaf/basic/BasicButtonUI.java, javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, javax/swing/plaf/basic/BasicGraphicsUtils.java, javax/swing/plaf/basic/BasicLabelUI.java, javax/swing/plaf/basic/BasicMenuItemUI.java, javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, javax/swing/plaf/basic/BasicRootPaneUI.java, javax/swing/plaf/basic/BasicScrollBarUI.java, javax/swing/plaf/basic/BasicScrollPaneUI.java, javax/swing/plaf/basic/BasicSliderUI.java, javax/swing/plaf/basic/BasicTabbedPaneUI.java, javax/swing/plaf/basic/BasicToggleButtonUI.java, javax/swing/table/JTableHeader.java, javax/swing/text/AbstractDocument.java, javax/swing/text/DefaultCaret.java, javax/swing/text/StyledEditorKit.java, javax/swing/tree/DefaultTreeCellEditor.java: Cleaned up imports. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81517 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 56 ++++++++++++++++++++++ libjava/javax/swing/AbstractButton.java | 6 +-- libjava/javax/swing/ActionMap.java | 1 - libjava/javax/swing/DefaultButtonModel.java | 4 +- libjava/javax/swing/DefaultListModel.java | 3 +- libjava/javax/swing/ImageIcon.java | 7 +-- libjava/javax/swing/JComboBox.java | 5 +- libjava/javax/swing/JComponent.java | 9 ++-- libjava/javax/swing/JFrame.java | 2 +- libjava/javax/swing/JInternalFrame.java | 5 +- libjava/javax/swing/JMenuBar.java | 6 +-- libjava/javax/swing/JMenuItem.java | 5 +- libjava/javax/swing/JOptionPane.java | 4 +- libjava/javax/swing/JProgressBar.java | 4 +- libjava/javax/swing/JRootPane.java | 6 +-- libjava/javax/swing/JScrollBar.java | 4 +- libjava/javax/swing/JScrollPane.java | 5 +- libjava/javax/swing/JSeparator.java | 2 - libjava/javax/swing/JSlider.java | 7 +-- libjava/javax/swing/JTabbedPane.java | 4 +- libjava/javax/swing/JTable.java | 12 ++--- libjava/javax/swing/JTextField.java | 5 +- libjava/javax/swing/JToolBar.java | 4 +- libjava/javax/swing/JToolTip.java | 3 +- libjava/javax/swing/JTree.java | 17 +------ libjava/javax/swing/JViewport.java | 7 +-- libjava/javax/swing/JWindow.java | 4 +- libjava/javax/swing/KeyStroke.java | 3 +- libjava/javax/swing/LookAndFeel.java | 3 +- libjava/javax/swing/SwingUtilities.java | 6 +-- libjava/javax/swing/Timer.java | 4 +- libjava/javax/swing/ToolTipManager.java | 1 - libjava/javax/swing/UIDefaults.java | 11 ++--- libjava/javax/swing/border/TitledBorder.java | 4 +- .../javax/swing/filechooser/FileSystemView.java | 3 +- .../swing/plaf/basic/BasicButtonListener.java | 5 +- libjava/javax/swing/plaf/basic/BasicButtonUI.java | 11 +---- .../swing/plaf/basic/BasicCheckBoxMenuItemUI.java | 2 - .../javax/swing/plaf/basic/BasicGraphicsUtils.java | 2 - libjava/javax/swing/plaf/basic/BasicLabelUI.java | 2 +- .../javax/swing/plaf/basic/BasicMenuItemUI.java | 15 ------ .../plaf/basic/BasicRadioButtonMenuItemUI.java | 8 ++-- .../javax/swing/plaf/basic/BasicRootPaneUI.java | 8 ++-- .../javax/swing/plaf/basic/BasicScrollBarUI.java | 3 +- .../javax/swing/plaf/basic/BasicScrollPaneUI.java | 2 +- libjava/javax/swing/plaf/basic/BasicSliderUI.java | 7 +-- .../javax/swing/plaf/basic/BasicTabbedPaneUI.java | 9 +--- .../swing/plaf/basic/BasicToggleButtonUI.java | 4 -- libjava/javax/swing/table/JTableHeader.java | 21 +------- libjava/javax/swing/text/AbstractDocument.java | 2 +- libjava/javax/swing/text/DefaultCaret.java | 6 +-- libjava/javax/swing/text/StyledEditorKit.java | 5 +- .../javax/swing/tree/DefaultTreeCellEditor.java | 4 +- 53 files changed, 131 insertions(+), 217 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a7dc41..212fb2f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,61 @@ 2004-05-05 Michael Koch + * javax/swing/AbstractButton.java, + javax/swing/ActionMap.java, + javax/swing/DefaultButtonModel.java, + javax/swing/DefaultListModel.java, + javax/swing/ImageIcon.java, + javax/swing/JComboBox.java, + javax/swing/JComponent.java, + javax/swing/JFrame.java, + javax/swing/JInternalFrame.java, + javax/swing/JMenuBar.java, + javax/swing/JMenuItem.java, + javax/swing/JOptionPane.java, + javax/swing/JProgressBar.java, + javax/swing/JRootPane.java, + javax/swing/JScrollBar.java, + javax/swing/JScrollPane.java, + javax/swing/JSeparator.java, + javax/swing/JSlider.java, + javax/swing/JTabbedPane.java, + javax/swing/JTable.java, + javax/swing/JTextField.java, + javax/swing/JToolBar.java, + javax/swing/JToolTip.java, + javax/swing/JTree.java, + javax/swing/JViewport.java, + javax/swing/JWindow.java, + javax/swing/KeyStroke.java, + javax/swing/LookAndFeel.java, + javax/swing/SwingUtilities.java, + javax/swing/Timer.java, + javax/swing/ToolTipManager.java, + javax/swing/UIDefaults.java, + javax/swing/border/TitledBorder.java, + javax/swing/filechooser/FileSystemView.java, + javax/swing/plaf/basic/BasicButtonListener.java, + javax/swing/plaf/basic/BasicButtonUI.java, + javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, + javax/swing/plaf/basic/BasicGraphicsUtils.java, + javax/swing/plaf/basic/BasicLabelUI.java, + javax/swing/plaf/basic/BasicMenuItemUI.java, + javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, + javax/swing/plaf/basic/BasicRootPaneUI.java, + javax/swing/plaf/basic/BasicScrollBarUI.java, + javax/swing/plaf/basic/BasicScrollPaneUI.java, + javax/swing/plaf/basic/BasicSliderUI.java, + javax/swing/plaf/basic/BasicTabbedPaneUI.java, + javax/swing/plaf/basic/BasicToggleButtonUI.java, + javax/swing/table/JTableHeader.java, + javax/swing/text/AbstractDocument.java, + javax/swing/text/DefaultCaret.java, + javax/swing/text/StyledEditorKit.java, + javax/swing/tree/DefaultTreeCellEditor.java: + Cleaned up imports. + +2004-05-05 Michael Koch + * java/util/prefs/AbstractPreferences.java (AbstractPreferences): Added parenthesis for clarity. Closes classpath bug #7940. diff --git a/libjava/javax/swing/AbstractButton.java b/libjava/javax/swing/AbstractButton.java index de0be63..26ec727 100644 --- a/libjava/javax/swing/AbstractButton.java +++ b/libjava/javax/swing/AbstractButton.java @@ -37,8 +37,6 @@ exception statement from your version. */ package javax.swing; -import java.awt.AWTEvent; -import java.awt.AWTEventMulticaster; import java.awt.Graphics; import java.awt.Image; import java.awt.Insets; @@ -51,12 +49,10 @@ 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.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.Serializable; -import java.util.Vector; import java.util.EventListener; + import javax.accessibility.AccessibleAction; import javax.accessibility.AccessibleIcon; import javax.accessibility.AccessibleRelationSet; diff --git a/libjava/javax/swing/ActionMap.java b/libjava/javax/swing/ActionMap.java index 940d1df..ce6086c 100644 --- a/libjava/javax/swing/ActionMap.java +++ b/libjava/javax/swing/ActionMap.java @@ -42,7 +42,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; diff --git a/libjava/javax/swing/DefaultButtonModel.java b/libjava/javax/swing/DefaultButtonModel.java index edffc39..7683e85 100644 --- a/libjava/javax/swing/DefaultButtonModel.java +++ b/libjava/javax/swing/DefaultButtonModel.java @@ -37,15 +37,13 @@ exception statement from your version. */ package javax.swing; -import java.awt.AWTEvent; -import java.awt.AWTEventMulticaster; 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; diff --git a/libjava/javax/swing/DefaultListModel.java b/libjava/javax/swing/DefaultListModel.java index 23f135b..0017ec2 100644 --- a/libjava/javax/swing/DefaultListModel.java +++ b/libjava/javax/swing/DefaultListModel.java @@ -1,5 +1,5 @@ /* DefaultListModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,7 +38,6 @@ exception statement from your version. */ package javax.swing; import java.util.Enumeration; -import java.util.NoSuchElementException; import java.util.Vector; /** diff --git a/libjava/javax/swing/ImageIcon.java b/libjava/javax/swing/ImageIcon.java index e68d453..da271a5 100644 --- a/libjava/javax/swing/ImageIcon.java +++ b/libjava/javax/swing/ImageIcon.java @@ -1,5 +1,5 @@ /* ImageIcon.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,12 +41,7 @@ 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/libjava/javax/swing/JComboBox.java b/libjava/javax/swing/JComboBox.java index b3c5ccf..acdbdc0 100644 --- a/libjava/javax/swing/JComboBox.java +++ b/libjava/javax/swing/JComboBox.java @@ -48,13 +48,12 @@ import java.beans.PropertyChangeListener; import java.io.IOException; import java.io.ObjectOutputStream; import java.util.Vector; + import javax.accessibility.Accessible; -import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleSelection; -import javax.swing.event.MenuEvent; -import javax.swing.event.MenuListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.event.PopupMenuListener; diff --git a/libjava/javax/swing/JComponent.java b/libjava/javax/swing/JComponent.java index 633ce66..7b2261f 100644 --- a/libjava/javax/swing/JComponent.java +++ b/libjava/javax/swing/JComponent.java @@ -38,7 +38,6 @@ exception statement from your version. */ package javax.swing; -import java.awt.AWTEvent; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -55,7 +54,6 @@ 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.image.ImageObserver; import java.awt.peer.LightweightPeer; @@ -65,17 +63,16 @@ import java.beans.VetoableChangeListener; import java.io.Serializable; import java.util.EventListener; import java.util.Hashtable; -import java.util.Vector; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleExtendedComponent; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleStateSet; +import javax.swing.border.Border; import javax.swing.event.AncestorListener; import javax.swing.event.EventListenerList; -import javax.swing.border.Border; -import javax.swing.plaf.ComponentUI; import javax.swing.event.SwingPropertyChangeSupport; +import javax.swing.plaf.ComponentUI; /** * Every component in swing inherits from this class (JLabel, JButton, etc). diff --git a/libjava/javax/swing/JFrame.java b/libjava/javax/swing/JFrame.java index 89d109f..1062c96 100644 --- a/libjava/javax/swing/JFrame.java +++ b/libjava/javax/swing/JFrame.java @@ -45,10 +45,10 @@ 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; /** diff --git a/libjava/javax/swing/JInternalFrame.java b/libjava/javax/swing/JInternalFrame.java index 034050b..f005c91 100644 --- a/libjava/javax/swing/JInternalFrame.java +++ b/libjava/javax/swing/JInternalFrame.java @@ -1,5 +1,5 @@ /* JInternalFrame.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,9 +38,6 @@ exception statement from your version. */ package javax.swing; -import java.awt.Component; -import java.awt.Container; -import javax.accessibility.Accessible; public class JInternalFrame extends JComponent /*implements Accessible, WindowConstants, RootPaneContainer*/ diff --git a/libjava/javax/swing/JMenuBar.java b/libjava/javax/swing/JMenuBar.java index 24440db..fec19e6 100644 --- a/libjava/javax/swing/JMenuBar.java +++ b/libjava/javax/swing/JMenuBar.java @@ -1,5 +1,5 @@ /* JMenuBar.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,10 +38,6 @@ 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 { diff --git a/libjava/javax/swing/JMenuItem.java b/libjava/javax/swing/JMenuItem.java index 68e8bfe..db06bc6 100644 --- a/libjava/javax/swing/JMenuItem.java +++ b/libjava/javax/swing/JMenuItem.java @@ -1,5 +1,5 @@ /* JMenuItem.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,15 +41,14 @@ package javax.swing; import java.awt.Component; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; 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.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.MenuDragMouseEvent; diff --git a/libjava/javax/swing/JOptionPane.java b/libjava/javax/swing/JOptionPane.java index 2992d24..7df8ebd 100644 --- a/libjava/javax/swing/JOptionPane.java +++ b/libjava/javax/swing/JOptionPane.java @@ -1,5 +1,5 @@ /* JOptionPane.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,7 +42,7 @@ 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.swing.plaf.OptionPaneUI; diff --git a/libjava/javax/swing/JProgressBar.java b/libjava/javax/swing/JProgressBar.java index 6ee2933..79c5102 100644 --- a/libjava/javax/swing/JProgressBar.java +++ b/libjava/javax/swing/JProgressBar.java @@ -38,8 +38,7 @@ exception statement from your version. */ package javax.swing; import java.awt.Graphics; -import java.io.IOException; -import java.io.ObjectOutputStream; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; @@ -47,7 +46,6 @@ import javax.accessibility.AccessibleStateSet; import javax.accessibility.AccessibleValue; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.EventListenerList; import javax.swing.plaf.ProgressBarUI; diff --git a/libjava/javax/swing/JRootPane.java b/libjava/javax/swing/JRootPane.java index e7ec0bf..4d869d4 100644 --- a/libjava/javax/swing/JRootPane.java +++ b/libjava/javax/swing/JRootPane.java @@ -1,5 +1,5 @@ /* JRootPane.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,10 +43,6 @@ 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/libjava/javax/swing/JScrollBar.java b/libjava/javax/swing/JScrollBar.java index ee7e3eb..5636cf3 100644 --- a/libjava/javax/swing/JScrollBar.java +++ b/libjava/javax/swing/JScrollBar.java @@ -41,16 +41,14 @@ import java.awt.Adjustable; import java.awt.Dimension; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleStateSet; import javax.accessibility.AccessibleValue; -import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.EventListenerList; -import javax.swing.plaf.ProgressBarUI; import javax.swing.plaf.ScrollBarUI; diff --git a/libjava/javax/swing/JScrollPane.java b/libjava/javax/swing/JScrollPane.java index f31da04..b5c0da0 100644 --- a/libjava/javax/swing/JScrollPane.java +++ b/libjava/javax/swing/JScrollPane.java @@ -40,17 +40,16 @@ package javax.swing; import java.awt.Component; import java.awt.ComponentOrientation; -import java.awt.LayoutManager; import java.awt.Insets; +import java.awt.LayoutManager; import java.awt.Point; import java.awt.Rectangle; -import javax.swing.border.Border; import javax.accessibility.Accessible; +import javax.swing.border.Border; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.plaf.ScrollPaneUI; -import javax.swing.plaf.UIResource; /** * diff --git a/libjava/javax/swing/JSeparator.java b/libjava/javax/swing/JSeparator.java index 224280b..be0d205 100644 --- a/libjava/javax/swing/JSeparator.java +++ b/libjava/javax/swing/JSeparator.java @@ -37,8 +37,6 @@ exception statement from your version. */ package javax.swing; -import java.io.IOException; -import java.io.ObjectOutputStream; import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; diff --git a/libjava/javax/swing/JSlider.java b/libjava/javax/swing/JSlider.java index 2b861b6..24b0a49 100644 --- a/libjava/javax/swing/JSlider.java +++ b/libjava/javax/swing/JSlider.java @@ -37,16 +37,14 @@ exception statement from your version. */ package javax.swing; -import java.awt.ComponentOrientation; -import java.awt.MenuContainer; import java.awt.Dimension; +import java.awt.MenuContainer; import java.awt.image.ImageObserver; -import java.io.IOException; -import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Dictionary; import java.util.Enumeration; import java.util.Hashtable; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; @@ -54,7 +52,6 @@ import javax.accessibility.AccessibleStateSet; import javax.accessibility.AccessibleValue; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.EventListenerList; import javax.swing.plaf.SliderUI; diff --git a/libjava/javax/swing/JTabbedPane.java b/libjava/javax/swing/JTabbedPane.java index 3c75461..e0ca953 100644 --- a/libjava/javax/swing/JTabbedPane.java +++ b/libjava/javax/swing/JTabbedPane.java @@ -44,15 +44,13 @@ import java.awt.Rectangle; import java.awt.event.MouseEvent; import java.io.Serializable; import java.util.Vector; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleSelection; -import javax.accessibility.AccessibleStateSet; -import javax.accessibility.AccessibleValue; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.EventListenerList; import javax.swing.plaf.TabbedPaneUI; import javax.swing.plaf.UIResource; diff --git a/libjava/javax/swing/JTable.java b/libjava/javax/swing/JTable.java index 55c6043..496ae99 100644 --- a/libjava/javax/swing/JTable.java +++ b/libjava/javax/swing/JTable.java @@ -1,5 +1,5 @@ /* JTable.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,25 +38,21 @@ exception statement from your version. */ package javax.swing; -import java.awt.Color; -import java.awt.Component; import java.awt.Dimension; import java.awt.Rectangle; -import java.util.Hashtable; import java.util.Vector; + import javax.accessibility.Accessible; -import javax.swing.event.ChangeEvent; import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableColumnModelEvent; import javax.swing.event.TableColumnModelListener; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableModel; -import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumnModel; +import javax.swing.table.TableModel; public class JTable extends JComponent implements TableModelListener, Scrollable, TableColumnModelListener, diff --git a/libjava/javax/swing/JTextField.java b/libjava/javax/swing/JTextField.java index edc3ea7..95fceaf 100644 --- a/libjava/javax/swing/JTextField.java +++ b/libjava/javax/swing/JTextField.java @@ -1,5 +1,5 @@ /* JTextField.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,8 @@ package javax.swing; 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/libjava/javax/swing/JToolBar.java b/libjava/javax/swing/JToolBar.java index 8dce3c1..ebc4692 100644 --- a/libjava/javax/swing/JToolBar.java +++ b/libjava/javax/swing/JToolBar.java @@ -37,14 +37,14 @@ exception statement from your version. */ package javax.swing; -import java.awt.Dimension; import java.awt.Component; -import java.awt.Container; +import java.awt.Dimension; 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; diff --git a/libjava/javax/swing/JToolTip.java b/libjava/javax/swing/JToolTip.java index 54e09cf..083bbad 100644 --- a/libjava/javax/swing/JToolTip.java +++ b/libjava/javax/swing/JToolTip.java @@ -1,5 +1,5 @@ /* JToolTip.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,6 @@ exception statement from your version. */ package javax.swing; import javax.accessibility.Accessible; -import javax.accessibility.AccessibleContext; public class JToolTip extends JComponent implements Accessible { diff --git a/libjava/javax/swing/JTree.java b/libjava/javax/swing/JTree.java index bdf519b..ca86679 100644 --- a/libjava/javax/swing/JTree.java +++ b/libjava/javax/swing/JTree.java @@ -1,5 +1,5 @@ /* JTree.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,23 +40,10 @@ package javax.swing; 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/libjava/javax/swing/JViewport.java b/libjava/javax/swing/JViewport.java index 66a9865..756d5ed 100644 --- a/libjava/javax/swing/JViewport.java +++ b/libjava/javax/swing/JViewport.java @@ -1,5 +1,5 @@ /* JViewport.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,15 +39,12 @@ exception statement from your version. */ package javax.swing; import java.awt.Component; -import java.awt.Container; import java.awt.Dimension; import java.awt.Graphics; -import java.awt.Image; import java.awt.Insets; import java.awt.Point; import java.awt.Rectangle; -import java.awt.image.ImageObserver; -import javax.accessibility.Accessible; + import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.plaf.ViewportUI; diff --git a/libjava/javax/swing/JWindow.java b/libjava/javax/swing/JWindow.java index 5edf5b2..11760e9 100644 --- a/libjava/javax/swing/JWindow.java +++ b/libjava/javax/swing/JWindow.java @@ -1,5 +1,5 @@ /* JWindow.java -- - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,11 +44,11 @@ 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; diff --git a/libjava/javax/swing/KeyStroke.java b/libjava/javax/swing/KeyStroke.java index c3053aa..743d306 100644 --- a/libjava/javax/swing/KeyStroke.java +++ b/libjava/javax/swing/KeyStroke.java @@ -1,5 +1,5 @@ /* KeyStroke.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,6 @@ exception statement from your version. */ package javax.swing; -import java.awt.AWTKeyStroke; import java.awt.event.KeyEvent; import java.io.Serializable; diff --git a/libjava/javax/swing/LookAndFeel.java b/libjava/javax/swing/LookAndFeel.java index b841a17..173d2fa 100644 --- a/libjava/javax/swing/LookAndFeel.java +++ b/libjava/javax/swing/LookAndFeel.java @@ -1,5 +1,5 @@ /* LookAndFeel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,7 +38,6 @@ exception statement from your version. */ package javax.swing; -import java.awt.Component; import javax.swing.text.JTextComponent; public abstract class LookAndFeel diff --git a/libjava/javax/swing/SwingUtilities.java b/libjava/javax/swing/SwingUtilities.java index 36fe017..6595fa3 100644 --- a/libjava/javax/swing/SwingUtilities.java +++ b/libjava/javax/swing/SwingUtilities.java @@ -1,5 +1,5 @@ /* SwingUtilities.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,6 @@ import java.applet.Applet; import java.awt.Component; import java.awt.ComponentOrientation; import java.awt.Container; -import java.awt.EventQueue; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; @@ -51,11 +50,8 @@ import java.awt.Rectangle; import java.awt.Shape; import java.awt.Toolkit; import java.awt.Window; -import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.lang.reflect.InvocationTargetException; -import javax.accessibility.Accessible; -import javax.accessibility.AccessibleStateSet; /** diff --git a/libjava/javax/swing/Timer.java b/libjava/javax/swing/Timer.java index adb695a..fd88351 100644 --- a/libjava/javax/swing/Timer.java +++ b/libjava/javax/swing/Timer.java @@ -1,5 +1,5 @@ /* Timer.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,7 +42,7 @@ 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 implements Serializable diff --git a/libjava/javax/swing/ToolTipManager.java b/libjava/javax/swing/ToolTipManager.java index ba86f13..762d5d3 100644 --- a/libjava/javax/swing/ToolTipManager.java +++ b/libjava/javax/swing/ToolTipManager.java @@ -37,7 +37,6 @@ exception statement from your version. */ package javax.swing; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; diff --git a/libjava/javax/swing/UIDefaults.java b/libjava/javax/swing/UIDefaults.java index da23a54..8141399 100644 --- a/libjava/javax/swing/UIDefaults.java +++ b/libjava/javax/swing/UIDefaults.java @@ -1,5 +1,5 @@ /* UIDefaults.java -- database for all settings and interface bindings. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,17 +44,16 @@ import java.awt.Insets; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; -import java.lang.reflect.Constructor; +import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; import java.util.LinkedList; +import java.util.ListIterator; import java.util.Locale; -import java.util.Set; -import java.util.HashSet; import java.util.MissingResourceException; import java.util.ResourceBundle; +import java.util.Set; + import javax.swing.border.Border; import javax.swing.plaf.ComponentUI; diff --git a/libjava/javax/swing/border/TitledBorder.java b/libjava/javax/swing/border/TitledBorder.java index 3b6a791..8b9fe2a 100644 --- a/libjava/javax/swing/border/TitledBorder.java +++ b/libjava/javax/swing/border/TitledBorder.java @@ -1,5 +1,5 @@ /* TitledBorder.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,8 +45,8 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Insets; -import java.awt.Rectangle; import java.awt.Shape; + import javax.swing.UIManager; diff --git a/libjava/javax/swing/filechooser/FileSystemView.java b/libjava/javax/swing/filechooser/FileSystemView.java index 7591497..f224349 100644 --- a/libjava/javax/swing/filechooser/FileSystemView.java +++ b/libjava/javax/swing/filechooser/FileSystemView.java @@ -1,5 +1,5 @@ /* FileSystemView.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,7 +40,6 @@ package javax.swing.filechooser; import java.io.File; import java.io.IOException; -import javax.swing.Icon; /** * FileSystemView diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/javax/swing/plaf/basic/BasicButtonListener.java index 98b4c8b..4dafc7e 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonListener.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.java @@ -45,13 +45,12 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; + import javax.swing.AbstractButton; import javax.swing.ButtonModel; -import javax.swing.UIDefaults; -import javax.swing.UIManager; +import javax.swing.JComponent; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.JComponent; public class BasicButtonListener implements MouseListener, MouseMotionListener, FocusListener, diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java index 5dbd17e..663050e 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.java @@ -44,15 +44,9 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Stroke; -import java.awt.Insets; import java.awt.Rectangle; -import java.awt.event.FocusListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.InputEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; +import java.awt.Stroke; + import javax.swing.AbstractButton; import javax.swing.ButtonModel; import javax.swing.Icon; @@ -60,7 +54,6 @@ import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.UIDefaults; import javax.swing.UIManager; -import javax.swing.event.MouseInputListener; import javax.swing.plaf.ButtonUI; import javax.swing.plaf.ComponentUI; diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java index 752b144..84c8e39 100644 --- a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java @@ -39,8 +39,6 @@ package javax.swing.plaf.basic; import java.awt.event.MouseEvent; -import javax.swing.AbstractButton; -import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JMenuItem; import javax.swing.MenuElement; diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java index 1f2f744..0645a37 100644 --- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java +++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java @@ -45,11 +45,9 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Insets; import java.awt.Rectangle; - import java.awt.font.FontRenderContext; import java.awt.font.LineMetrics; import java.awt.font.TextLayout; - import java.awt.geom.Rectangle2D; import javax.swing.AbstractButton; diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/javax/swing/plaf/basic/BasicLabelUI.java index 219c6fa..669c706 100644 --- a/libjava/javax/swing/plaf/basic/BasicLabelUI.java +++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.java @@ -46,10 +46,10 @@ import java.awt.Insets; import java.awt.Rectangle; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; + import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JLabel; -import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.UIDefaults; import javax.swing.UIManager; diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java index fd21728..886ca9d 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java @@ -37,43 +37,28 @@ exception statement from your version. */ package javax.swing.plaf.basic; -import java.awt.AWTKeyStroke; -import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; import java.awt.Rectangle; -import java.awt.Stroke; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; - import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import javax.swing.AbstractButton; import javax.swing.ButtonModel; import javax.swing.Icon; import javax.swing.JComponent; -import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenuItem; -import javax.swing.JRadioButtonMenuItem; import javax.swing.KeyStroke; import javax.swing.MenuElement; import javax.swing.MenuSelectionManager; import javax.swing.SwingUtilities; import javax.swing.UIDefaults; import javax.swing.UIManager; -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; diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java index 93d070e..9a9f2e8 100644 --- a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java @@ -38,15 +38,13 @@ exception statement from your version. */ package javax.swing.plaf.basic; import java.awt.event.MouseEvent; -import javax.swing.AbstractButton; -import javax.swing.Icon; + import javax.swing.JComponent; import javax.swing.JMenuItem; -import javax.swing.UIDefaults; -import javax.swing.UIManager; import javax.swing.MenuElement; import javax.swing.MenuSelectionManager; - +import javax.swing.UIDefaults; +import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java index 70829d1..e647216 100644 --- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java @@ -1,5 +1,5 @@ /* BasicPanelUI.java - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,9 +38,9 @@ exception statement from your version. */ package javax.swing.plaf.basic; -import javax.swing.*; -import javax.swing.plaf.*; -import java.awt.*; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.RootPaneUI; public class BasicRootPaneUI extends RootPaneUI diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java index f0f56d3..d6b31a2 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java @@ -41,8 +41,6 @@ import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Insets; import java.awt.LayoutManager; @@ -56,6 +54,7 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; + import javax.swing.BoundedRangeModel; import javax.swing.Icon; import javax.swing.JButton; diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java index 4f60fb4..2148a92 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java @@ -40,8 +40,8 @@ package javax.swing.plaf.basic; import java.awt.Dimension; import java.awt.Graphics; + import javax.swing.JComponent; -import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.ScrollPaneLayout; import javax.swing.plaf.ComponentUI; diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.java b/libjava/javax/swing/plaf/basic/BasicSliderUI.java index 2ee481e..05e3bb3 100644 --- a/libjava/javax/swing/plaf/basic/BasicSliderUI.java +++ b/libjava/javax/swing/plaf/basic/BasicSliderUI.java @@ -40,7 +40,6 @@ package javax.swing.plaf.basic; import java.awt.Color; import java.awt.Component; import java.awt.ComponentOrientation; -import java.awt.Container; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Insets; @@ -54,22 +53,20 @@ import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Dictionary; import java.util.Enumeration; -import javax.swing.JButton; + +import javax.swing.BoundedRangeModel; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JSlider; -import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.Timer; import javax.swing.UIDefaults; import javax.swing.UIManager; -import javax.swing.BoundedRangeModel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.MouseInputAdapter; diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java index 563a8fe..4dcec82 100644 --- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -47,10 +47,7 @@ import java.awt.Graphics; import java.awt.Insets; import java.awt.LayoutManager; import java.awt.Point; -import java.awt.Polygon; import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; @@ -59,15 +56,13 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.lang.Exception; + import javax.swing.Icon; -import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.JViewport; import javax.swing.KeyStroke; -import javax.swing.SingleSelectionModel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.UIDefaults; @@ -78,8 +73,6 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.PanelUI; import javax.swing.plaf.TabbedPaneUI; import javax.swing.plaf.UIResource; -import javax.swing.plaf.ViewportUI; -import javax.swing.plaf.basic.BasicGraphicsUtils; import javax.swing.text.View; diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java index c6b3bdb..a319b0b 100644 --- a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java @@ -38,10 +38,6 @@ exception statement from your version. */ package javax.swing.plaf.basic; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Rectangle; -import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.plaf.ComponentUI; diff --git a/libjava/javax/swing/table/JTableHeader.java b/libjava/javax/swing/table/JTableHeader.java index d747664..6b48601 100644 --- a/libjava/javax/swing/table/JTableHeader.java +++ b/libjava/javax/swing/table/JTableHeader.java @@ -1,5 +1,5 @@ /* JTableHeader.java - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,27 +38,8 @@ exception statement from your version. */ package javax.swing.table; -import java.awt.Color; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.FocusListener; -import java.util.Locale; -import javax.accessibility.Accessible; -import javax.accessibility.AccessibleComponent; -import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleStateSet; import javax.swing.JComponent; import javax.swing.JTable; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.TableColumnModelEvent; -import javax.swing.event.TableColumnModelListener; -import javax.swing.plaf.TableHeaderUI; public class JTableHeader extends JComponent { diff --git a/libjava/javax/swing/text/AbstractDocument.java b/libjava/javax/swing/text/AbstractDocument.java index 027b99d..6408b22 100644 --- a/libjava/javax/swing/text/AbstractDocument.java +++ b/libjava/javax/swing/text/AbstractDocument.java @@ -41,9 +41,9 @@ 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; diff --git a/libjava/javax/swing/text/DefaultCaret.java b/libjava/javax/swing/text/DefaultCaret.java index 7fdc3fc..1c4607fc 100644 --- a/libjava/javax/swing/text/DefaultCaret.java +++ b/libjava/javax/swing/text/DefaultCaret.java @@ -41,16 +41,12 @@ 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/StyledEditorKit.java b/libjava/javax/swing/text/StyledEditorKit.java index 8ec9066..f237247 100644 --- a/libjava/javax/swing/text/StyledEditorKit.java +++ b/libjava/javax/swing/text/StyledEditorKit.java @@ -41,11 +41,8 @@ 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; diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/javax/swing/tree/DefaultTreeCellEditor.java index 6d922a4..bebdc6a 100644 --- a/libjava/javax/swing/tree/DefaultTreeCellEditor.java +++ b/libjava/javax/swing/tree/DefaultTreeCellEditor.java @@ -1,5 +1,5 @@ /* DefaultTreeCellEditor.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,12 +50,12 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.EventObject; + import javax.swing.Icon; import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.border.Border; import javax.swing.event.CellEditorListener; -import javax.swing.event.EventListenerList; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -- 2.7.4