From af0088587f92edb6fb004fc7ec5ce0a050ec4d16 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 9 Jan 2004 10:18:47 +0000 Subject: [PATCH] AbstractAction.java, [...]: Reworked imports. 2004-01-09 Michael Koch * javax/swing/AbstractAction.java, javax/swing/AbstractSet.java, javax/swing/Action.java, javax/swing/ActionMap.java, javax/swing/BoundedRangeModel.java, javax/swing/ButtonModel.java, javax/swing/CellEditor.java, javax/swing/CellRendererPane.java, javax/swing/ComboBoxEditor.java, javax/swing/DebugGraphics.java, javax/swing/DefaultCellEditor.java, javax/swing/DefaultCellRenderer.java, javax/swing/DefaultComboBoxModel.java, javax/swing/DefaultDesktopManager.java, javax/swing/DefaultFocusManager.java, javax/swing/DefaultListCellRenderer.java, javax/swing/Icon.java, javax/swing/JButton.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JDesktopPane.java, javax/swing/JEditorPane.java, javax/swing/JMenu.java, javax/swing/JPanel.java, javax/swing/JPasswordField.java, javax/swing/JPopupMenu.java, javax/swing/JProgressBar.java: Reworked imports. From-SVN: r75572 --- libjava/ChangeLog | 29 +++++++++++++++++++ libjava/javax/swing/AbstractAction.java | 14 +++++---- libjava/javax/swing/AbstractSet.java | 6 ++-- libjava/javax/swing/Action.java | 6 ++-- libjava/javax/swing/ActionMap.java | 16 +++++++--- libjava/javax/swing/BoundedRangeModel.java | 5 ++-- libjava/javax/swing/ButtonModel.java | 9 +++--- libjava/javax/swing/CellEditor.java | 7 ++--- libjava/javax/swing/CellRendererPane.java | 15 ++++++---- libjava/javax/swing/ComboBoxEditor.java | 7 ++--- libjava/javax/swing/DebugGraphics.java | 17 +++++++---- libjava/javax/swing/DefaultCellEditor.java | 18 +++++++----- libjava/javax/swing/DefaultCellRenderer.java | 7 ++--- libjava/javax/swing/DefaultComboBoxModel.java | 7 ++--- .../javax/swing/DefaultDesktopManager.java | 7 ++--- libjava/javax/swing/DefaultFocusManager.java | 10 +++---- .../javax/swing/DefaultListCellRenderer.java | 11 ++++--- libjava/javax/swing/Icon.java | 5 ++-- libjava/javax/swing/JButton.java | 9 +++--- libjava/javax/swing/JCheckBoxMenuItem.java | 10 ++++--- libjava/javax/swing/JDesktopPane.java | 12 ++++---- libjava/javax/swing/JMenu.java | 27 +++++++++++------ libjava/javax/swing/JPanel.java | 6 ++-- libjava/javax/swing/JPasswordField.java | 12 ++++---- libjava/javax/swing/JPopupMenu.java | 25 ++++++++++------ libjava/javax/swing/JProgressBar.java | 19 +++++++----- 26 files changed, 194 insertions(+), 122 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 67f280367a13..e37616adafa1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,32 @@ +2004-01-09 Michael Koch + + * javax/swing/AbstractAction.java, + javax/swing/AbstractSet.java, + javax/swing/Action.java, + javax/swing/ActionMap.java, + javax/swing/BoundedRangeModel.java, + javax/swing/ButtonModel.java, + javax/swing/CellEditor.java, + javax/swing/CellRendererPane.java, + javax/swing/ComboBoxEditor.java, + javax/swing/DebugGraphics.java, + javax/swing/DefaultCellEditor.java, + javax/swing/DefaultCellRenderer.java, + javax/swing/DefaultComboBoxModel.java, + javax/swing/DefaultDesktopManager.java, + javax/swing/DefaultFocusManager.java, + javax/swing/DefaultListCellRenderer.java, + javax/swing/Icon.java, + javax/swing/JButton.java, + javax/swing/JCheckBoxMenuItem.java, + javax/swing/JDesktopPane.java, + javax/swing/JEditorPane.java, + javax/swing/JMenu.java, + javax/swing/JPanel.java, + javax/swing/JPasswordField.java, + javax/swing/JPopupMenu.java, + javax/swing/JProgressBar.java: Reworked imports. + 2004-01-09 Michael Koch * java/awt/geom/PathIterator.java diff --git a/libjava/javax/swing/AbstractAction.java b/libjava/javax/swing/AbstractAction.java index 7ba652b926a2..4141dd30e06d 100644 --- a/libjava/javax/swing/AbstractAction.java +++ b/libjava/javax/swing/AbstractAction.java @@ -1,5 +1,5 @@ /* AbstractAction.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,11 +38,13 @@ exception statement from your version. */ package javax.swing; -import java.awt.event.*; -import java.beans.*; -import java.io.*; -import javax.swing.event.*; -import java.util.*; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.HashMap; +import javax.swing.event.SwingPropertyChangeSupport; /** * AbstractAction diff --git a/libjava/javax/swing/AbstractSet.java b/libjava/javax/swing/AbstractSet.java index d83bb8a3b96d..01bb58fd8832 100644 --- a/libjava/javax/swing/AbstractSet.java +++ b/libjava/javax/swing/AbstractSet.java @@ -1,5 +1,5 @@ /* AbstractSet.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,7 +37,9 @@ exception statement from your version. */ package javax.swing; -import java.util.*; +import java.util.AbstractCollection; +import java.util.Collection; +import java.util.Set; /** * Empty diff --git a/libjava/javax/swing/Action.java b/libjava/javax/swing/Action.java index d1650b2ddd5e..008ff7f06b35 100644 --- a/libjava/javax/swing/Action.java +++ b/libjava/javax/swing/Action.java @@ -1,5 +1,5 @@ /* Action.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,7 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; +import java.awt.event.ActionListener; import java.beans.PropertyChangeListener; /** diff --git a/libjava/javax/swing/ActionMap.java b/libjava/javax/swing/ActionMap.java index ea9e0aa362dd..940d1dfa13da 100644 --- a/libjava/javax/swing/ActionMap.java +++ b/libjava/javax/swing/ActionMap.java @@ -1,5 +1,5 @@ /* ActionMap.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,17 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * ActionMap diff --git a/libjava/javax/swing/BoundedRangeModel.java b/libjava/javax/swing/BoundedRangeModel.java index 76bbb2043772..907e7045dc15 100644 --- a/libjava/javax/swing/BoundedRangeModel.java +++ b/libjava/javax/swing/BoundedRangeModel.java @@ -1,5 +1,5 @@ /* BoundedRangeModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,8 +37,7 @@ exception statement from your version. */ package javax.swing; -// Imports -import javax.swing.event.*; +import javax.swing.event.ChangeListener; /** * BoundedRangeModel diff --git a/libjava/javax/swing/ButtonModel.java b/libjava/javax/swing/ButtonModel.java index ae0c721003b6..2876c75dd00f 100644 --- a/libjava/javax/swing/ButtonModel.java +++ b/libjava/javax/swing/ButtonModel.java @@ -1,5 +1,5 @@ /* ButtonModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,10 @@ exception statement from your version. */ package javax.swing; -import java.awt.*; -import java.awt.event.*; -import javax.swing.event.*; +import java.awt.ItemSelectable; +import java.awt.event.ActionListener; +import java.awt.event.ItemListener; +import javax.swing.event.ChangeListener; public interface ButtonModel extends ItemSelectable { diff --git a/libjava/javax/swing/CellEditor.java b/libjava/javax/swing/CellEditor.java index e1c3ecef1027..007ea234ec8a 100644 --- a/libjava/javax/swing/CellEditor.java +++ b/libjava/javax/swing/CellEditor.java @@ -1,5 +1,5 @@ /* CellEditor.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,8 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.util.*; -import javax.swing.event.*; +import java.util.EventObject; +import javax.swing.event.CellEditorListener; /** * CellEditor diff --git a/libjava/javax/swing/CellRendererPane.java b/libjava/javax/swing/CellRendererPane.java index c93b919c817f..e93e46446ef3 100644 --- a/libjava/javax/swing/CellRendererPane.java +++ b/libjava/javax/swing/CellRendererPane.java @@ -1,5 +1,5 @@ /* CellRendererPane.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,15 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.io.*; -import javax.accessibility.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Graphics; +import java.awt.Rectangle; +import java.io.IOException; +import java.io.ObjectOutputStream; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; /** * CellRendererPane diff --git a/libjava/javax/swing/ComboBoxEditor.java b/libjava/javax/swing/ComboBoxEditor.java index 080e615f5796..8559217b6b46 100644 --- a/libjava/javax/swing/ComboBoxEditor.java +++ b/libjava/javax/swing/ComboBoxEditor.java @@ -1,5 +1,5 @@ /* ComboBoxEditor.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,8 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; +import java.awt.Component; +import java.awt.event.ActionListener; /** * ComboBoxEditor diff --git a/libjava/javax/swing/DebugGraphics.java b/libjava/javax/swing/DebugGraphics.java index 9a4c6592d23d..a3c3d39daa81 100644 --- a/libjava/javax/swing/DebugGraphics.java +++ b/libjava/javax/swing/DebugGraphics.java @@ -1,5 +1,5 @@ /* DebugGraphics.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,11 +37,16 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.image.*; -import java.io.*; -import java.text.*; +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.image.ImageObserver; +import java.io.PrintStream; +import java.text.AttributedCharacterIterator; /** * DebugGraphics diff --git a/libjava/javax/swing/DefaultCellEditor.java b/libjava/javax/swing/DefaultCellEditor.java index 5e35701ff5e0..3c862bd5480f 100644 --- a/libjava/javax/swing/DefaultCellEditor.java +++ b/libjava/javax/swing/DefaultCellEditor.java @@ -1,5 +1,5 @@ /* DefaultCellEditor.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,13 +37,15 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.table.*; -import javax.swing.tree.*; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.io.Serializable; +import java.util.EventObject; +import javax.swing.table.TableCellEditor; +import javax.swing.tree.TreeCellEditor; /** * DefaultCellEditor diff --git a/libjava/javax/swing/DefaultCellRenderer.java b/libjava/javax/swing/DefaultCellRenderer.java index 2730314629a5..fca2f1d70c9a 100644 --- a/libjava/javax/swing/DefaultCellRenderer.java +++ b/libjava/javax/swing/DefaultCellRenderer.java @@ -1,5 +1,5 @@ /* DefaultCellRenderer.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,12 +37,11 @@ exception statement from your version. */ package javax.swing; -import java.awt.*; - - // this is what SUN basically told us to do so: // no icon though as that's not implemented yet.... +import java.awt.Component; + public class DefaultCellRenderer extends JLabel implements ListCellRenderer { public Component getListCellRendererComponent(JList list, diff --git a/libjava/javax/swing/DefaultComboBoxModel.java b/libjava/javax/swing/DefaultComboBoxModel.java index 5c8361a2deeb..55faf8fdf3b3 100644 --- a/libjava/javax/swing/DefaultComboBoxModel.java +++ b/libjava/javax/swing/DefaultComboBoxModel.java @@ -1,5 +1,5 @@ /* DefaultComboBoxModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,8 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Vector; /** * DefaultComboBoxModel diff --git a/libjava/javax/swing/DefaultDesktopManager.java b/libjava/javax/swing/DefaultDesktopManager.java index 132fb61920c7..f99abef54bb1 100644 --- a/libjava/javax/swing/DefaultDesktopManager.java +++ b/libjava/javax/swing/DefaultDesktopManager.java @@ -1,5 +1,5 @@ /* DefaultDesktopManager.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,8 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.io.*; +import java.awt.Rectangle; +import java.io.Serializable; /** * DefaultDesktopManager diff --git a/libjava/javax/swing/DefaultFocusManager.java b/libjava/javax/swing/DefaultFocusManager.java index c2c5d610c7ce..b2c8c6e9980a 100644 --- a/libjava/javax/swing/DefaultFocusManager.java +++ b/libjava/javax/swing/DefaultFocusManager.java @@ -1,5 +1,5 @@ /* DefaultFocusManager.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,10 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.util.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.event.KeyEvent; +import java.util.Stack; /** * DefaultFocusManager diff --git a/libjava/javax/swing/DefaultListCellRenderer.java b/libjava/javax/swing/DefaultListCellRenderer.java index 204c4ec23bf8..f3557719d509 100644 --- a/libjava/javax/swing/DefaultListCellRenderer.java +++ b/libjava/javax/swing/DefaultListCellRenderer.java @@ -1,5 +1,5 @@ /* DefaultListCellRenderer.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,11 +37,10 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.io.*; -import javax.swing.border.*; -import javax.swing.plaf.*; +import java.awt.Component; +import java.awt.Rectangle; +import java.io.Serializable; +import javax.swing.border.Border; /** * DefaultListCellRenderer diff --git a/libjava/javax/swing/Icon.java b/libjava/javax/swing/Icon.java index b4839c09ab7a..da2ba74efdaf 100644 --- a/libjava/javax/swing/Icon.java +++ b/libjava/javax/swing/Icon.java @@ -1,5 +1,5 @@ /* Icon.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,7 +37,8 @@ exception statement from your version. */ package javax.swing; -import java.awt.*; +import java.awt.Component; +import java.awt.Graphics; public interface Icon { diff --git a/libjava/javax/swing/JButton.java b/libjava/javax/swing/JButton.java index 9c43e6d0bb99..b3db389a70df 100644 --- a/libjava/javax/swing/JButton.java +++ b/libjava/javax/swing/JButton.java @@ -1,5 +1,5 @@ /* JButton.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,9 @@ exception statement from your version. */ package javax.swing; -import java.awt.*; -import java.awt.event.*; -import javax.swing.plaf.*; -import javax.accessibility.*; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.swing.plaf.ButtonUI; /** * An instance of JButton can be added to a panel, frame etc diff --git a/libjava/javax/swing/JCheckBoxMenuItem.java b/libjava/javax/swing/JCheckBoxMenuItem.java index 0b767785fa46..cce8ec1ae34b 100644 --- a/libjava/javax/swing/JCheckBoxMenuItem.java +++ b/libjava/javax/swing/JCheckBoxMenuItem.java @@ -1,5 +1,5 @@ /* JCheckBoxMenuItem.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,11 @@ 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; /** * JCheckBoxMenuItem diff --git a/libjava/javax/swing/JDesktopPane.java b/libjava/javax/swing/JDesktopPane.java index 4ad265c9bd94..d8301500fca8 100644 --- a/libjava/javax/swing/JDesktopPane.java +++ b/libjava/javax/swing/JDesktopPane.java @@ -1,5 +1,5 @@ /* JDesktopPane.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,12 @@ 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.DesktopPaneUI; /** * JDesktopPane diff --git a/libjava/javax/swing/JMenu.java b/libjava/javax/swing/JMenu.java index 961d8025e708..8a6004b41a08 100644 --- a/libjava/javax/swing/JMenu.java +++ b/libjava/javax/swing/JMenu.java @@ -1,5 +1,5 @@ /* JMenu.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,14 +37,23 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.beans.*; -import java.io.*; -import java.util.*; -import javax.accessibility.*; -import javax.swing.event.*; +import java.awt.Component; +import java.awt.Point; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Hashtable; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleSelection; +import javax.swing.event.MenuEvent; +import javax.swing.event.MenuListener; +import javax.swing.event.ChangeListener; /** * JMenu diff --git a/libjava/javax/swing/JPanel.java b/libjava/javax/swing/JPanel.java index 56cc1f09e26a..1916793ea500 100644 --- a/libjava/javax/swing/JPanel.java +++ b/libjava/javax/swing/JPanel.java @@ -1,5 +1,5 @@ /* JPanel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,14 +35,14 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - package javax.swing; import java.awt.FlowLayout; import java.awt.LayoutManager; -import javax.swing.plaf.PanelUI; import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; +import javax.swing.plaf.PanelUI; + /** * An instance of JPanel can be added to a panel, frame etc diff --git a/libjava/javax/swing/JPasswordField.java b/libjava/javax/swing/JPasswordField.java index 40fb921f280d..7e60004d7b13 100644 --- a/libjava/javax/swing/JPasswordField.java +++ b/libjava/javax/swing/JPasswordField.java @@ -1,5 +1,5 @@ /* JPasswordField.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,12 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.io.*; -import javax.accessibility.*; -import javax.swing.text.*; +import java.io.IOException; +import java.io.ObjectOutputStream; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; /** * JPasswordField diff --git a/libjava/javax/swing/JPopupMenu.java b/libjava/javax/swing/JPopupMenu.java index d5c6023205e5..1a7c7c680c2d 100644 --- a/libjava/javax/swing/JPopupMenu.java +++ b/libjava/javax/swing/JPopupMenu.java @@ -1,5 +1,5 @@ /* JPopupMenu.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,14 +37,21 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.beans.*; -import java.io.*; -import javax.accessibility.*; -import javax.swing.event.*; -import javax.swing.plaf.*; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Insets; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.swing.event.PopupMenuListener; +import javax.swing.plaf.PopupMenuUI; /** * JPopupMenu diff --git a/libjava/javax/swing/JProgressBar.java b/libjava/javax/swing/JProgressBar.java index 2c4d834a6dd3..3e65c3873faa 100644 --- a/libjava/javax/swing/JProgressBar.java +++ b/libjava/javax/swing/JProgressBar.java @@ -1,5 +1,5 @@ /* JProgressBar.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,12 +37,17 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.*; -import java.io.*; -import javax.accessibility.*; -import javax.swing.event.*; -import javax.swing.plaf.*; +import java.awt.Graphics; +import java.io.IOException; +import java.io.ObjectOutputStream; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleStateSet; +import javax.accessibility.AccessibleValue; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.plaf.ProgressBarUI; /** * JProgressBar -- 2.47.3