This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[GUI] Patch: javax.swing - imports reworked
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 9 Jun 2004 10:42:15 +0200
- Subject: [GUI] Patch: javax.swing - imports reworked
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to rework import statements in
javax.swing.
Michael
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/border/TitledBorder.java,
javax/swing/filechooser/FileSystemView.java,
javax/swing/plaf/basic/BasicButtonListener.java,
javax/swing/plaf/basic/BasicGraphicsUtils.java,
javax/swing/plaf/basic/BasicLabelUI.java,
javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.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:
Reworked import statements.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAxs1qWSOgCCdjSDsRAm3+AJ9KngcQ0AHRFECpbzWukLZNFLCeLACeOw/e
HoAp634svA35ZA0l4Up3kYg=
=sZtL
-----END PGP SIGNATURE-----
Index: javax/swing/border/TitledBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/TitledBorder.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 TitledBorder.java
--- javax/swing/border/TitledBorder.java 19 Jun 2003 10:48:45 -0000 1.4
+++ javax/swing/border/TitledBorder.java 9 Jun 2004 08:39:06 -0000
@@ -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.FontMetrics;
import java.awt.Graphics;
import java.awt.Insets;
-import java.awt.Rectangle;
import java.awt.Shape;
+
import javax.swing.UIManager;
Index: javax/swing/filechooser/FileSystemView.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/filechooser/FileSystemView.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 FileSystemView.java
--- javax/swing/filechooser/FileSystemView.java 11 Jun 2003 13:20:40 -0000 1.2
+++ javax/swing/filechooser/FileSystemView.java 9 Jun 2004 08:39:06 -0000
@@ -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 @@
import java.io.File;
import java.io.IOException;
-import javax.swing.Icon;
/**
* FileSystemView
Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicButtonListener.java,v
retrieving revision 1.1.2.1
diff -u -b -B -r1.1.2.1 BasicButtonListener.java
--- javax/swing/plaf/basic/BasicButtonListener.java 12 Mar 2004 16:03:17 -0000 1.1.2.1
+++ javax/swing/plaf/basic/BasicButtonListener.java 9 Jun 2004 08:39:06 -0000
@@ -45,13 +45,12 @@
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,
Index: javax/swing/plaf/basic/BasicGraphicsUtils.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java,v
retrieving revision 1.7.2.1
diff -u -b -B -r1.7.2.1 BasicGraphicsUtils.java
Index: javax/swing/plaf/basic/BasicLabelUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicLabelUI.java,v
retrieving revision 1.4.16.4
diff -u -b -B -r1.4.16.4 BasicLabelUI.java
--- javax/swing/plaf/basic/BasicLabelUI.java 21 May 2004 23:34:15 -0000 1.4.16.4
+++ javax/swing/plaf/basic/BasicLabelUI.java 9 Jun 2004 08:39:06 -0000
@@ -49,7 +50,6 @@
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;
Index: javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,v
retrieving revision 1.1.2.3
diff -u -b -B -r1.1.2.3 BasicRadioButtonMenuItemUI.java
--- javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 26 Apr 2004 20:19:13 -0000 1.1.2.3
+++ javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 9 Jun 2004 08:39:06 -0000
@@ -38,8 +38,7 @@
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;
@@ -51,9 +50,6 @@
/**
* DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision: 1.1.2.3 $
*/
public class BasicRadioButtonMenuItemUI extends BasicMenuItemUI
{
Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.1.2.5
diff -u -b -B -r1.1.2.5 BasicScrollBarUI.java
--- javax/swing/plaf/basic/BasicScrollBarUI.java 21 May 2004 23:34:15 -0000 1.1.2.5
+++ javax/swing/plaf/basic/BasicScrollBarUI.java 9 Jun 2004 08:39:07 -0000
@@ -41,8 +41,6 @@
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;
Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.3.8.1
diff -u -b -B -r1.3.8.1 BasicScrollPaneUI.java
--- javax/swing/plaf/basic/BasicScrollPaneUI.java 12 Mar 2004 16:03:17 -0000 1.3.8.1
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java 9 Jun 2004 08:39:07 -0000
@@ -40,8 +40,8 @@
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;
Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.1.2.8
diff -u -b -B -r1.1.2.8 BasicSliderUI.java
--- javax/swing/plaf/basic/BasicSliderUI.java 21 May 2004 23:34:15 -0000 1.1.2.8
+++ javax/swing/plaf/basic/BasicSliderUI.java 9 Jun 2004 08:39:08 -0000
@@ -40,7 +40,6 @@
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.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;
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.3.16.5
diff -u -b -B -r1.3.16.5 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java 21 May 2004 23:34:15 -0000 1.3.16.5
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java 9 Jun 2004 08:39:09 -0000
@@ -47,10 +47,7 @@
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.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.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;
Index: javax/swing/plaf/basic/BasicToggleButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicToggleButtonUI.java
--- javax/swing/plaf/basic/BasicToggleButtonUI.java 12 Feb 2004 00:17:24 -0000 1.5
+++ javax/swing/plaf/basic/BasicToggleButtonUI.java 9 Jun 2004 08:39:09 -0000
@@ -38,10 +38,6 @@
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;
Index: javax/swing/table/JTableHeader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/JTableHeader.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JTableHeader.java
--- javax/swing/table/JTableHeader.java 27 Jan 2004 17:33:38 -0000 1.2
+++ javax/swing/table/JTableHeader.java 9 Jun 2004 08:39:09 -0000
@@ -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 @@
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
{
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java 10 Jan 2004 21:07:44 -0000 1.3
+++ javax/swing/text/AbstractDocument.java 9 Jun 2004 08:39:09 -0000
@@ -41,9 +41,9 @@
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;
Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 DefaultCaret.java
--- javax/swing/text/DefaultCaret.java 10 Jan 2004 21:07:44 -0000 1.3
+++ javax/swing/text/DefaultCaret.java 9 Jun 2004 08:39:09 -0000
@@ -41,16 +41,12 @@
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
-import java.util.EventListener;
import java.util.Vector;
+
import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
public class DefaultCaret extends Rectangle implements Caret, FocusListener, MouseListener, MouseMotionListener
Index: javax/swing/text/StyledEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/StyledEditorKit.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 StyledEditorKit.java
--- javax/swing/text/StyledEditorKit.java 10 Jan 2004 21:07:44 -0000 1.3
+++ javax/swing/text/StyledEditorKit.java 9 Jun 2004 08:39:09 -0000
@@ -41,11 +41,8 @@
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;
Index: javax/swing/tree/DefaultTreeCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/tree/DefaultTreeCellEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultTreeCellEditor.java
--- javax/swing/tree/DefaultTreeCellEditor.java 11 Jun 2003 13:20:41 -0000 1.2
+++ javax/swing/tree/DefaultTreeCellEditor.java 9 Jun 2004 08:39:09 -0000
@@ -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.
@@ -55,7 +56,6 @@
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;