This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[GUI] Patch: javax.swing - reorganization of imports
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 7 Jun 2004 16:03:29 +0200
- Subject: [GUI] Patch: javax.swing - reorganization of imports
--Boundary-00=_+WHxADfRvI7yABS
Content-Type: text/plain;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi list,
I commited the attached patch to java-gui-branch to re-organize import
statements and do other little stuff.
Michael
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java: Reorganized imports.
* javax/swing/ActionMap.java: Likewise.
* javax/swing/DefaultButtonModel.java: Likewise.
* javax/swing/DefaultListModel.java: Likewise.
* javax/swing/ImageIcon.java: Likewise.
(serialVersionUID): New member variable.
* javax/swing/JComboBox.java: Reorganized imports.
* javax/swing/JComponent.java: Likewise.
(ui): Made protected.
(listenerList): Made protected.
(TOOL_TIP_TEXT_KEY): New constant.
(scrollRectToVisible): Removed redundant null check.
* javax/swing/JFrame.java: Reorganized imports.
* javax/swing/JInternalFrame.java: Reorganized imports.
* javax/swing/JProgressBar.java: Likewise.
* javax/swing/JRootPane.java: Likewise.
* javax/swing/JScrollBar.java: Likewise.
* javax/swing/JSeparator.java: Likewise.
* javax/swing/JSlider.java: Likewise.
* javax/swing/JTabbedPane.java: Likewise.
* javax/swing/JTextField.java: Likewise.
* javax/swing/JToolBar.java: Likewise.
* javax/swing/JTree.java: Likewise.
* javax/swing/JViewport.java: Likewise.
* javax/swing/JWindow.java: Likewise.
* javax/swing/KeyStroke.java: Likewise.
* javax/swing/LookAndFeel.java: Likewise.
* javax/swing/MenuSelectionManager.java: Likewise.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/Timer.java: Likewise.
* javax/swing/DefaultBoundedRangeModel.java: Fixed javadoc.
* javax/swing/JList.java
(HORIZONTAL_WRAP): Made final, fixed value.
(VERTICAL): Likewise.
(VERTICAL_WRAP): Likewise.
--
Homepage: http://www.worldforge.org/
--Boundary-00=_+WHxADfRvI7yABS
Content-Type: text/x-diff;
charset="iso-8859-15";
name="swing.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="swing.diff"
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.5.2.2
diff -u -b -B -r1.5.2.2 AbstractButton.java
--- javax/swing/AbstractButton.java 7 Jun 2004 12:41:07 -0000 1.5.2.2
+++ javax/swing/AbstractButton.java 7 Jun 2004 13:55:46 -0000
@@ -37,8 +37,6 @@
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.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;
@@ -151,8 +147,8 @@
*
* </ul>
*
- * @author Ronald Veldema (rveldema&064;cs.vu.nl)
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Ronald Veldema (rveldema@cs.vu.nl)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public abstract class AbstractButton extends JComponent
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ActionMap.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ActionMap.java
--- javax/swing/ActionMap.java 9 Jan 2004 10:18:47 -0000 1.3
+++ javax/swing/ActionMap.java 7 Jun 2004 13:55:46 -0000
@@ -42,7 +42,6 @@
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;
Index: javax/swing/DefaultBoundedRangeModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultBoundedRangeModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DefaultBoundedRangeModel.java
--- javax/swing/DefaultBoundedRangeModel.java 7 Jan 2004 14:42:03 -0000 1.5
+++ javax/swing/DefaultBoundedRangeModel.java 7 Jun 2004 13:55:46 -0000
@@ -203,7 +203,7 @@
* Changes the current value of this bounded range model. In a
* scroll bar visualization of a {@link BoundedRangeModel}, the
* <code>value</code> is displayed as the position of the thumb;
- * changing the <code>value</code> of a scroll bar’s model
+ * changing the <code>value</code> of a scroll bar's model
* thus moves the thumb to a different position.
*/
public void setValue(int value)
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java 12 Feb 2004 00:17:23 -0000 1.5
+++ javax/swing/DefaultButtonModel.java 7 Jun 2004 13:55:47 -0000
@@ -37,15 +37,13 @@
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;
@@ -73,7 +71,7 @@
*
* In all other respects this class is just a container of boolean flags.
*
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class DefaultButtonModel implements ButtonModel, Serializable
{
Index: javax/swing/DefaultListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListModel.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 DefaultListModel.java
--- javax/swing/DefaultListModel.java 26 Feb 2004 00:34:02 -0000 1.3.2.1
+++ javax/swing/DefaultListModel.java 7 Jun 2004 13:55:47 -0000
@@ -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 @@
package javax.swing;
import java.util.Enumeration;
-import java.util.NoSuchElementException;
import java.util.Vector;
/**
@@ -48,7 +47,7 @@
* java.util.Vector}.
*
* @author Andrew Selkirk
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class DefaultListModel extends AbstractListModel
Index: javax/swing/ImageIcon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ImageIcon.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 ImageIcon.java
--- javax/swing/ImageIcon.java 2 Apr 2004 20:00:52 -0000 1.2.18.1
+++ javax/swing/ImageIcon.java 7 Jun 2004 13:55:47 -0000
@@ -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.
@@ -45,11 +45,11 @@
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
+public class ImageIcon implements Icon, Serializable
{
+ private static final long serialVersionUID = 532615968316031794L;
+
Image image;
String file, descr;
Component observer;
Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComboBox.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JComboBox.java
--- javax/swing/JComboBox.java 27 Jan 2004 18:55:11 -0000 1.5
+++ javax/swing/JComboBox.java 7 Jun 2004 13:55:47 -0000
@@ -48,13 +48,12 @@
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;
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.7.2.7
diff -u -b -B -r1.7.2.7 JComponent.java
--- javax/swing/JComponent.java 7 Jun 2004 12:41:08 -0000 1.7.2.7
+++ javax/swing/JComponent.java 7 Jun 2004 13:55:47 -0000
@@ -37,7 +37,6 @@
package javax.swing;
-import java.awt.AWTEvent;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -54,7 +53,6 @@
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.geom.Rectangle2D;
import java.awt.image.ImageObserver;
@@ -69,7 +67,6 @@
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;
@@ -278,7 +275,7 @@
* @see #getUI
* @see #updateUI
*/
- ComponentUI ui;
+ protected ComponentUI ui;
/**
* A hint to the focus system that this component should or should not
@@ -310,7 +307,7 @@
* handled by this listener list. PropertyChangeEvents are handled in
* {@link #changeSupport}.
*/
- EventListenerList listenerList = new EventListenerList();
+ protected EventListenerList listenerList = new EventListenerList();
/**
* Support for {@link PropertyChangeEvent} events. This is constructed
@@ -348,6 +345,7 @@
*/
private static Locale defaultLocale;
+ public static final String TOOL_TIP_TEXT_KEY = "ToolTipText";
/**
* Constant used to indicate that no condition has been assigned to a
@@ -1629,7 +1627,7 @@
public void scrollRectToVisible(Rectangle r)
{
Component p = getParent();
- if (p != null && p instanceof JComponent)
+ if (p instanceof JComponent)
((JComponent) p).scrollRectToVisible(r);
}
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFrame.java,v
retrieving revision 1.4.2.2
diff -u -b -B -r1.4.2.2 JFrame.java
--- javax/swing/JFrame.java 7 Jun 2004 12:41:08 -0000 1.4.2.2
+++ javax/swing/JFrame.java 7 Jun 2004 13:55:47 -0000
@@ -45,7 +45,6 @@
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;
Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JInternalFrame.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JInternalFrame.java
--- javax/swing/JInternalFrame.java 19 Jun 2003 16:30:09 -0000 1.2
+++ javax/swing/JInternalFrame.java 7 Jun 2004 13:55:47 -0000
@@ -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 @@
package javax.swing;
-import java.awt.Component;
-import java.awt.Container;
-import javax.accessibility.Accessible;
public class JInternalFrame extends JComponent
/*implements Accessible, WindowConstants, RootPaneContainer*/
@@ -58,4 +55,4 @@
public static final String IS_CLOSED_PROPERTY = "closed";
public static final String IS_MAXIMUM_PROPERTY = "maximum";
public static final String IS_ICON_PROPERTY = "icon";
-} // class JInternalFrame
+}
Index: javax/swing/JList.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JList.java,v
retrieving revision 1.4.2.4
diff -u -b -B -r1.4.2.4 JList.java
--- javax/swing/JList.java 21 May 2004 23:34:12 -0000 1.4.2.4
+++ javax/swing/JList.java 7 Jun 2004 13:55:48 -0000
@@ -100,7 +100,7 @@
* <tr><td>visibleRowCount </td><td>list </td><td>no </td></tr>
* </table>
*
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class JList extends JComponent implements Accessible, Scrollable
@@ -109,23 +109,23 @@
/**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in multiple columns "newspaper style",
- * filling horizontally first, then vertically.
+ * that cells are laid out in a single vertical column. This is the default.
*/
- public static int HORIZONTAL_WRAP = 1;
+ public static final int VERTICAL = 0;
/**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in a single vertical column. This is the default.
+ * that cells are laid out in multiple columns "newspaper style", filling
+ * vertically first, then horizontally.
*/
- public static int VERTICAL = 2;
+ public static final int VERTICAL_WRAP = 1;
/**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in multiple columns "newspaper style", filling
- * vertically first, then horizontally.
+ * that cells are laid out in multiple columns "newspaper style",
+ * filling horizontally first, then vertically.
*/
- public static int VERTICAL_WRAP = 3;
+ public static final int HORIZONTAL_WRAP = 2;
/** Fired in a PropertyChangeEvent when the "cellRenderer" property changes. */
public static final String CELL_RENDERER_PROPERTY_CHANGED = "cellRenderer";
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.3.8.5
diff -u -b -B -r1.3.8.5 JProgressBar.java
--- javax/swing/JProgressBar.java 7 Jun 2004 12:41:11 -0000 1.3.8.5
+++ javax/swing/JProgressBar.java 7 Jun 2004 13:55:48 -0000
@@ -38,8 +38,7 @@
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.AccessibleValue;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
import javax.swing.plaf.ProgressBarUI;
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRootPane.java,v
retrieving revision 1.4.2.2
diff -u -b -B -r1.4.2.2 JRootPane.java
--- javax/swing/JRootPane.java 21 May 2004 23:34:13 -0000 1.4.2.2
+++ javax/swing/JRootPane.java 7 Jun 2004 13:55:48 -0000
@@ -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.
@@ -45,9 +45,9 @@
import java.awt.LayoutManager;
import java.awt.LayoutManager2;
import java.io.Serializable;
+
+import javax.accessibility.AccessibleRole;
import javax.swing.plaf.RootPaneUI;
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleComponent;
/**
* This class is where JComponents are added to.
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollBar.java,v
retrieving revision 1.2.18.4
diff -u -b -B -r1.2.18.4 JScrollBar.java
--- javax/swing/JScrollBar.java 7 Jun 2004 12:41:11 -0000 1.2.18.4
+++ javax/swing/JScrollBar.java 7 Jun 2004 13:55:49 -0000
@@ -46,11 +47,8 @@
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;
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.3.8.3
diff -u -b -B -r1.3.8.3 JSeparator.java
--- javax/swing/JSeparator.java 7 Jun 2004 12:41:11 -0000 1.3.8.3
+++ javax/swing/JSeparator.java 7 Jun 2004 13:55:49 -0000
@@ -37,8 +37,6 @@
package javax.swing;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSlider.java,v
retrieving revision 1.3.18.8
diff -u -b -B -r1.3.18.8 JSlider.java
--- javax/swing/JSlider.java 7 Jun 2004 12:41:11 -0000 1.3.18.8
+++ javax/swing/JSlider.java 7 Jun 2004 13:55:49 -0000
@@ -37,12 +37,9 @@
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;
@@ -54,7 +52,6 @@
import javax.accessibility.AccessibleValue;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
import javax.swing.plaf.SliderUI;
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTabbedPane.java,v
retrieving revision 1.3.2.2
diff -u -b -B -r1.3.2.2 JTabbedPane.java
--- javax/swing/JTabbedPane.java 7 Jun 2004 12:41:11 -0000 1.3.2.2
+++ javax/swing/JTabbedPane.java 7 Jun 2004 13:55:49 -0000
@@ -48,11 +49,8 @@
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;
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTextField.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JTextField.java
--- javax/swing/JTextField.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/JTextField.java 7 Jun 2004 13:55:49 -0000
@@ -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,9 @@
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
{
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JToolBar.java
--- javax/swing/JToolBar.java 10 Jan 2004 21:07:43 -0000 1.3
+++ javax/swing/JToolBar.java 7 Jun 2004 13:55:49 -0000
@@ -37,9 +37,8 @@
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;
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTree.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 JTree.java
--- javax/swing/JTree.java 7 Jun 2004 12:41:11 -0000 1.3.2.1
+++ javax/swing/JTree.java 7 Jun 2004 13:55:49 -0000
@@ -40,23 +40,10 @@
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
{
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JViewport.java,v
retrieving revision 1.3.2.3
diff -u -b -B -r1.3.2.3 JViewport.java
--- javax/swing/JViewport.java 21 May 2004 23:34:13 -0000 1.3.2.3
+++ javax/swing/JViewport.java 7 Jun 2004 13:55:49 -0000
@@ -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,14 +39,12 @@
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;
Index: javax/swing/JWindow.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JWindow.java,v
retrieving revision 1.3.18.3
diff -u -b -B -r1.3.18.3 JWindow.java
--- javax/swing/JWindow.java 7 Jun 2004 12:41:11 -0000 1.3.18.3
+++ javax/swing/JWindow.java 7 Jun 2004 13:55:49 -0000
@@ -44,7 +44,6 @@
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;
Index: javax/swing/KeyStroke.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/KeyStroke.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 KeyStroke.java
--- javax/swing/KeyStroke.java 11 Jun 2003 13:20:39 -0000 1.3
+++ javax/swing/KeyStroke.java 7 Jun 2004 13:55:49 -0000
@@ -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 @@
package javax.swing;
-import java.awt.AWTKeyStroke;
import java.awt.event.KeyEvent;
import java.io.Serializable;
Index: javax/swing/LookAndFeel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/LookAndFeel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LookAndFeel.java
--- javax/swing/LookAndFeel.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/LookAndFeel.java 7 Jun 2004 13:55:49 -0000
@@ -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 @@
package javax.swing;
-import java.awt.Component;
import javax.swing.text.JTextComponent;
public abstract class LookAndFeel
Index: javax/swing/MenuSelectionManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/MenuSelectionManager.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 MenuSelectionManager.java
--- javax/swing/MenuSelectionManager.java 21 Apr 2004 19:44:48 -0000 1.2.18.1
+++ javax/swing/MenuSelectionManager.java 7 Jun 2004 13:55:49 -0000
@@ -43,6 +43,7 @@
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
+import java.util.ArrayList;
import java.util.Vector;
import javax.swing.JMenu;
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingUtilities.java,v
retrieving revision 1.6.2.3
diff -u -b -B -r1.6.2.3 SwingUtilities.java
--- javax/swing/SwingUtilities.java 3 May 2004 19:10:59 -0000 1.6.2.3
+++ javax/swing/SwingUtilities.java 7 Jun 2004 13:55:50 -0000
@@ -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.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.Frame;
@@ -52,11 +51,8 @@
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;
/**
@@ -64,7 +60,7 @@
* useful when drawing swing components, dispatching events, or calculating
* regions which need painting.
*
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class SwingUtilities implements SwingConstants
{
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Timer.java,v
retrieving revision 1.3.18.2
diff -u -b -B -r1.3.18.2 Timer.java
--- javax/swing/Timer.java 7 Jun 2004 12:41:11 -0000 1.3.18.2
+++ javax/swing/Timer.java 7 Jun 2004 13:55:50 -0000
@@ -42,7 +42,7 @@
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
--Boundary-00=_+WHxADfRvI7yABS
Content-Type: Text/Plain;
charset="iso-8859-15"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to java-gui-branch to re-organize import=20
statements and do other little stuff.
Michael
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java: Reorganized imports.
* javax/swing/ActionMap.java: Likewise.
* javax/swing/DefaultButtonModel.java: Likewise.
* javax/swing/DefaultListModel.java: Likewise.
* javax/swing/ImageIcon.java: Likewise.
(serialVersionUID): New member variable.
* javax/swing/JComboBox.java: Reorganized imports.
* javax/swing/JComponent.java: Likewise.
(ui): Made protected.
(listenerList): Made protected.
(TOOL_TIP_TEXT_KEY): New constant.
(scrollRectToVisible): Removed redundant null check.
* javax/swing/JFrame.java: Reorganized imports.
* javax/swing/JInternalFrame.java: Reorganized imports.
* javax/swing/JProgressBar.java: Likewise.
* javax/swing/JRootPane.java: Likewise.
* javax/swing/JScrollBar.java: Likewise.
* javax/swing/JSeparator.java: Likewise.
* javax/swing/JSlider.java: Likewise.
* javax/swing/JTabbedPane.java: Likewise.
* javax/swing/JTextField.java: Likewise.
* javax/swing/JToolBar.java: Likewise.
* javax/swing/JTree.java: Likewise.
* javax/swing/JViewport.java: Likewise.
* javax/swing/JWindow.java: Likewise.
* javax/swing/KeyStroke.java: Likewise.
* javax/swing/LookAndFeel.java: Likewise.
* javax/swing/MenuSelectionManager.java: Likewise.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/Timer.java: Likewise.
* javax/swing/DefaultBoundedRangeModel.java: Fixed javadoc.
* javax/swing/JList.java
(HORIZONTAL_WRAP): Made final, fixed value.
(VERTICAL): Likewise.
(VERTICAL_WRAP): Likewise.
=2D --=20
Homepage: http://www.worldforge.org/
=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAxHXCWSOgCCdjSDsRAmnWAJsFlm5VwNOnK/NCKSItAUdw3tmdVACeNGtj
CSRz6ODXWzTrzZFryYmzvBI=3D
=3DKeNn
=2D----END PGP SIGNATURE-----
--Boundary-00=_+WHxADfRvI7yABS
Content-Type: text/x-diff;
charset="iso-8859-15";
name="swing.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="swing.diff"
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.5.2.2
diff -u -b -B -r1.5.2.2 AbstractButton.java
--- javax/swing/AbstractButton.java 7 Jun 2004 12:41:07 -0000 1.5.2.2
+++ javax/swing/AbstractButton.java 7 Jun 2004 13:55:46 -0000
@@ -37,8 +37,6 @@
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.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;
@@ -151,8 +147,8 @@
*
* </ul>
*
- * @author Ronald Veldema (rveldema&064;cs.vu.nl)
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Ronald Veldema (rveldema@cs.vu.nl)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public abstract class AbstractButton extends JComponent
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ActionMap.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ActionMap.java
--- javax/swing/ActionMap.java 9 Jan 2004 10:18:47 -0000 1.3
+++ javax/swing/ActionMap.java 7 Jun 2004 13:55:46 -0000
@@ -42,7 +42,6 @@
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;
Index: javax/swing/DefaultBoundedRangeModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultBoundedRangeModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DefaultBoundedRangeModel.java
--- javax/swing/DefaultBoundedRangeModel.java 7 Jan 2004 14:42:03 -0000 1.5
+++ javax/swing/DefaultBoundedRangeModel.java 7 Jun 2004 13:55:46 -0000
@@ -203,7 +203,7 @@
* Changes the current value of this bounded range model. In a
* scroll bar visualization of a {@link BoundedRangeModel}, the
* <code>value</code> is displayed as the position of the thumb;
- * changing the <code>value</code> of a scroll bar’s model
+ * changing the <code>value</code> of a scroll bar's model
* thus moves the thumb to a different position.
*/
public void setValue(int value)
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java 12 Feb 2004 00:17:23 -0000 1.5
+++ javax/swing/DefaultButtonModel.java 7 Jun 2004 13:55:47 -0000
@@ -37,15 +37,13 @@
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;
@@ -73,7 +71,7 @@
*
* In all other respects this class is just a container of boolean flags.
*
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class DefaultButtonModel implements ButtonModel, Serializable
{
Index: javax/swing/DefaultListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListModel.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 DefaultListModel.java
--- javax/swing/DefaultListModel.java 26 Feb 2004 00:34:02 -0000 1.3.2.1
+++ javax/swing/DefaultListModel.java 7 Jun 2004 13:55:47 -0000
@@ -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 @@
package javax.swing;
import java.util.Enumeration;
-import java.util.NoSuchElementException;
import java.util.Vector;
/**
@@ -48,7 +47,7 @@
* java.util.Vector}.
*
* @author Andrew Selkirk
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class DefaultListModel extends AbstractListModel
Index: javax/swing/ImageIcon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ImageIcon.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 ImageIcon.java
--- javax/swing/ImageIcon.java 2 Apr 2004 20:00:52 -0000 1.2.18.1
+++ javax/swing/ImageIcon.java 7 Jun 2004 13:55:47 -0000
@@ -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.
@@ -45,11 +45,11 @@
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
+public class ImageIcon implements Icon, Serializable
{
+ private static final long serialVersionUID = 532615968316031794L;
+
Image image;
String file, descr;
Component observer;
Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComboBox.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JComboBox.java
--- javax/swing/JComboBox.java 27 Jan 2004 18:55:11 -0000 1.5
+++ javax/swing/JComboBox.java 7 Jun 2004 13:55:47 -0000
@@ -48,13 +48,12 @@
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;
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.7.2.7
diff -u -b -B -r1.7.2.7 JComponent.java
--- javax/swing/JComponent.java 7 Jun 2004 12:41:08 -0000 1.7.2.7
+++ javax/swing/JComponent.java 7 Jun 2004 13:55:47 -0000
@@ -37,7 +37,6 @@
package javax.swing;
-import java.awt.AWTEvent;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -54,7 +53,6 @@
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.geom.Rectangle2D;
import java.awt.image.ImageObserver;
@@ -69,7 +67,6 @@
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;
@@ -278,7 +275,7 @@
* @see #getUI
* @see #updateUI
*/
- ComponentUI ui;
+ protected ComponentUI ui;
/**
* A hint to the focus system that this component should or should not
@@ -310,7 +307,7 @@
* handled by this listener list. PropertyChangeEvents are handled in
* {@link #changeSupport}.
*/
- EventListenerList listenerList = new EventListenerList();
+ protected EventListenerList listenerList = new EventListenerList();
/**
* Support for {@link PropertyChangeEvent} events. This is constructed
@@ -348,6 +345,7 @@
*/
private static Locale defaultLocale;
+ public static final String TOOL_TIP_TEXT_KEY = "ToolTipText";
/**
* Constant used to indicate that no condition has been assigned to a
@@ -1629,7 +1627,7 @@
public void scrollRectToVisible(Rectangle r)
{
Component p = getParent();
- if (p != null && p instanceof JComponent)
+ if (p instanceof JComponent)
((JComponent) p).scrollRectToVisible(r);
}
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFrame.java,v
retrieving revision 1.4.2.2
diff -u -b -B -r1.4.2.2 JFrame.java
--- javax/swing/JFrame.java 7 Jun 2004 12:41:08 -0000 1.4.2.2
+++ javax/swing/JFrame.java 7 Jun 2004 13:55:47 -0000
@@ -45,7 +45,6 @@
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;
Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JInternalFrame.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JInternalFrame.java
--- javax/swing/JInternalFrame.java 19 Jun 2003 16:30:09 -0000 1.2
+++ javax/swing/JInternalFrame.java 7 Jun 2004 13:55:47 -0000
@@ -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 @@
package javax.swing;
-import java.awt.Component;
-import java.awt.Container;
-import javax.accessibility.Accessible;
public class JInternalFrame extends JComponent
/*implements Accessible, WindowConstants, RootPaneContainer*/
@@ -58,4 +55,4 @@
public static final String IS_CLOSED_PROPERTY = "closed";
public static final String IS_MAXIMUM_PROPERTY = "maximum";
public static final String IS_ICON_PROPERTY = "icon";
-} // class JInternalFrame
+}
Index: javax/swing/JList.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JList.java,v
retrieving revision 1.4.2.4
diff -u -b -B -r1.4.2.4 JList.java
--- javax/swing/JList.java 21 May 2004 23:34:12 -0000 1.4.2.4
+++ javax/swing/JList.java 7 Jun 2004 13:55:48 -0000
@@ -100,7 +100,7 @@
* <tr><td>visibleRowCount </td><td>list </td><td>no </td></tr>
* </table>
*
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class JList extends JComponent implements Accessible, Scrollable
@@ -109,23 +109,23 @@
/**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in multiple columns "newspaper style",
- * filling horizontally first, then vertically.
+ * that cells are laid out in a single vertical column. This is the default.
*/
- public static int HORIZONTAL_WRAP = 1;
+ public static final int VERTICAL = 0;
/**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in a single vertical column. This is the default.
+ * that cells are laid out in multiple columns "newspaper style", filling
+ * vertically first, then horizontally.
*/
- public static int VERTICAL = 2;
+ public static final int VERTICAL_WRAP = 1;
/**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in multiple columns "newspaper style", filling
- * vertically first, then horizontally.
+ * that cells are laid out in multiple columns "newspaper style",
+ * filling horizontally first, then vertically.
*/
- public static int VERTICAL_WRAP = 3;
+ public static final int HORIZONTAL_WRAP = 2;
/** Fired in a PropertyChangeEvent when the "cellRenderer" property changes. */
public static final String CELL_RENDERER_PROPERTY_CHANGED = "cellRenderer";
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.3.8.5
diff -u -b -B -r1.3.8.5 JProgressBar.java
--- javax/swing/JProgressBar.java 7 Jun 2004 12:41:11 -0000 1.3.8.5
+++ javax/swing/JProgressBar.java 7 Jun 2004 13:55:48 -0000
@@ -38,8 +38,7 @@
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.AccessibleValue;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
import javax.swing.plaf.ProgressBarUI;
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRootPane.java,v
retrieving revision 1.4.2.2
diff -u -b -B -r1.4.2.2 JRootPane.java
--- javax/swing/JRootPane.java 21 May 2004 23:34:13 -0000 1.4.2.2
+++ javax/swing/JRootPane.java 7 Jun 2004 13:55:48 -0000
@@ -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.
@@ -45,9 +45,9 @@
import java.awt.LayoutManager;
import java.awt.LayoutManager2;
import java.io.Serializable;
+
+import javax.accessibility.AccessibleRole;
import javax.swing.plaf.RootPaneUI;
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleComponent;
/**
* This class is where JComponents are added to.
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollBar.java,v
retrieving revision 1.2.18.4
diff -u -b -B -r1.2.18.4 JScrollBar.java
--- javax/swing/JScrollBar.java 7 Jun 2004 12:41:11 -0000 1.2.18.4
+++ javax/swing/JScrollBar.java 7 Jun 2004 13:55:49 -0000
@@ -46,11 +47,8 @@
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;
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.3.8.3
diff -u -b -B -r1.3.8.3 JSeparator.java
--- javax/swing/JSeparator.java 7 Jun 2004 12:41:11 -0000 1.3.8.3
+++ javax/swing/JSeparator.java 7 Jun 2004 13:55:49 -0000
@@ -37,8 +37,6 @@
package javax.swing;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSlider.java,v
retrieving revision 1.3.18.8
diff -u -b -B -r1.3.18.8 JSlider.java
--- javax/swing/JSlider.java 7 Jun 2004 12:41:11 -0000 1.3.18.8
+++ javax/swing/JSlider.java 7 Jun 2004 13:55:49 -0000
@@ -37,12 +37,9 @@
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;
@@ -54,7 +52,6 @@
import javax.accessibility.AccessibleValue;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
import javax.swing.plaf.SliderUI;
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTabbedPane.java,v
retrieving revision 1.3.2.2
diff -u -b -B -r1.3.2.2 JTabbedPane.java
--- javax/swing/JTabbedPane.java 7 Jun 2004 12:41:11 -0000 1.3.2.2
+++ javax/swing/JTabbedPane.java 7 Jun 2004 13:55:49 -0000
@@ -48,11 +49,8 @@
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;
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTextField.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JTextField.java
--- javax/swing/JTextField.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/JTextField.java 7 Jun 2004 13:55:49 -0000
@@ -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,9 @@
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
{
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JToolBar.java
--- javax/swing/JToolBar.java 10 Jan 2004 21:07:43 -0000 1.3
+++ javax/swing/JToolBar.java 7 Jun 2004 13:55:49 -0000
@@ -37,9 +37,8 @@
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;
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTree.java,v
retrieving revision 1.3.2.1
diff -u -b -B -r1.3.2.1 JTree.java
--- javax/swing/JTree.java 7 Jun 2004 12:41:11 -0000 1.3.2.1
+++ javax/swing/JTree.java 7 Jun 2004 13:55:49 -0000
@@ -40,23 +40,10 @@
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
{
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JViewport.java,v
retrieving revision 1.3.2.3
diff -u -b -B -r1.3.2.3 JViewport.java
--- javax/swing/JViewport.java 21 May 2004 23:34:13 -0000 1.3.2.3
+++ javax/swing/JViewport.java 7 Jun 2004 13:55:49 -0000
@@ -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,14 +39,12 @@
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;
Index: javax/swing/JWindow.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JWindow.java,v
retrieving revision 1.3.18.3
diff -u -b -B -r1.3.18.3 JWindow.java
--- javax/swing/JWindow.java 7 Jun 2004 12:41:11 -0000 1.3.18.3
+++ javax/swing/JWindow.java 7 Jun 2004 13:55:49 -0000
@@ -44,7 +44,6 @@
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;
Index: javax/swing/KeyStroke.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/KeyStroke.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 KeyStroke.java
--- javax/swing/KeyStroke.java 11 Jun 2003 13:20:39 -0000 1.3
+++ javax/swing/KeyStroke.java 7 Jun 2004 13:55:49 -0000
@@ -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 @@
package javax.swing;
-import java.awt.AWTKeyStroke;
import java.awt.event.KeyEvent;
import java.io.Serializable;
Index: javax/swing/LookAndFeel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/LookAndFeel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LookAndFeel.java
--- javax/swing/LookAndFeel.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/LookAndFeel.java 7 Jun 2004 13:55:49 -0000
@@ -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 @@
package javax.swing;
-import java.awt.Component;
import javax.swing.text.JTextComponent;
public abstract class LookAndFeel
Index: javax/swing/MenuSelectionManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/MenuSelectionManager.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 MenuSelectionManager.java
--- javax/swing/MenuSelectionManager.java 21 Apr 2004 19:44:48 -0000 1.2.18.1
+++ javax/swing/MenuSelectionManager.java 7 Jun 2004 13:55:49 -0000
@@ -43,6 +43,7 @@
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
+import java.util.ArrayList;
import java.util.Vector;
import javax.swing.JMenu;
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingUtilities.java,v
retrieving revision 1.6.2.3
diff -u -b -B -r1.6.2.3 SwingUtilities.java
--- javax/swing/SwingUtilities.java 3 May 2004 19:10:59 -0000 1.6.2.3
+++ javax/swing/SwingUtilities.java 7 Jun 2004 13:55:50 -0000
@@ -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.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.Frame;
@@ -52,11 +51,8 @@
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;
/**
@@ -64,7 +60,7 @@
* useful when drawing swing components, dispatching events, or calculating
* regions which need painting.
*
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
*/
public class SwingUtilities implements SwingConstants
{
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Timer.java,v
retrieving revision 1.3.18.2
diff -u -b -B -r1.3.18.2 Timer.java
--- javax/swing/Timer.java 7 Jun 2004 12:41:11 -0000 1.3.18.2
+++ javax/swing/Timer.java 7 Jun 2004 13:55:50 -0000
@@ -42,7 +42,7 @@
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
--Boundary-00=_+WHxADfRvI7yABS--
----
-------