This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: javax.swing.plaf
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Cc: commit-classpath at gnu dot org
- Date: Sat, 10 Jan 2004 23:02:32 +0100
- Subject: FYI: Patch: javax.swing.plaf
Hi lists,
I will commit the attached patch to libgcj and classpath to fix the import
statements in javax.swing.plaf
Michael
2004-01-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java,
javax/swing/plaf/basic/BasicCheckBoxUI.java,
javax/swing/plaf/basic/BasicListUI.java,
javax/swing/plaf/basic/BasicOptionPaneUI.java,
javax/swing/plaf/basic/BasicPanelUI.java,
javax/swing/plaf/basic/BasicRadioButtonUI.java,
javax/swing/plaf/basic/BasicScrollPaneUI.java,
javax/swing/plaf/basic/BasicToggleButtonUI.java,
javax/swing/plaf/basic/BasicViewportUI.java:
Fixed import statements.
Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicButtonUI.java
--- javax/swing/plaf/basic/BasicButtonUI.java 19 Jun 2003 10:48:46 -0000 1.3
+++ javax/swing/plaf/basic/BasicButtonUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicButtonUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +38,18 @@
package javax.swing.plaf.basic;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import javax.swing.AbstractButton;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ButtonUI;
+import javax.swing.plaf.ComponentUI;
public class BasicButtonUI extends ButtonUI
{
Index: javax/swing/plaf/basic/BasicCheckBoxUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicCheckBoxUI.java
--- javax/swing/plaf/basic/BasicCheckBoxUI.java 19 Jun 2003 10:48:46 -0000 1.3
+++ javax/swing/plaf/basic/BasicCheckBoxUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicCheckBoxUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +38,13 @@
package javax.swing.plaf.basic;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Component;
+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;
public class BasicCheckBoxUI extends BasicRadioButtonUI
{
Index: javax/swing/plaf/basic/BasicListUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicListUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicListUI.java
--- javax/swing/plaf/basic/BasicListUI.java 25 Jun 2003 04:34:20 -0000 1.3
+++ javax/swing/plaf/basic/BasicListUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicListUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +38,17 @@
package javax.swing.plaf.basic;
-import javax.swing.plaf.*;
-import javax.swing.*;
-import java.awt.*;
-
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Rectangle;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ListUI;
public class BasicListUI extends ListUI
{
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java 25 Jun 2003 04:34:20 -0000 1.5
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicOptionPaneUI.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,17 @@
package javax.swing.plaf.basic;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.OptionPaneUI;
public class BasicOptionPaneUI extends OptionPaneUI
{
Index: javax/swing/plaf/basic/BasicPanelUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicPanelUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicPanelUI.java
--- javax/swing/plaf/basic/BasicPanelUI.java 10 May 2003 08:14:36 -0000 1.2
+++ javax/swing/plaf/basic/BasicPanelUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicPanelUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +38,9 @@
package javax.swing.plaf.basic;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.PanelUI;
public class BasicPanelUI extends PanelUI
{
Index: javax/swing/plaf/basic/BasicRadioButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicRadioButtonUI.java
--- javax/swing/plaf/basic/BasicRadioButtonUI.java 19 Jun 2003 10:48:46 -0000 1.3
+++ javax/swing/plaf/basic/BasicRadioButtonUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicRadioButtonUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +38,13 @@
package javax.swing.plaf.basic;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Color;
+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;
public class BasicRadioButtonUI extends BasicToggleButtonUI
{
Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicScrollPaneUI.java
--- javax/swing/plaf/basic/BasicScrollPaneUI.java 10 May 2003 08:14:36 -0000 1.2
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicScrollPaneUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,12 +38,12 @@
package javax.swing.plaf.basic;
-
-import javax.swing.plaf.*;
-import javax.swing.*;
-import java.awt.*;
-
-
+import java.awt.Dimension;
+import java.awt.Graphics;
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ScrollPaneUI;
public class BasicScrollPaneUI extends ScrollPaneUI
{
Index: javax/swing/plaf/basic/BasicToggleButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicToggleButtonUI.java
--- javax/swing/plaf/basic/BasicToggleButtonUI.java 19 Jun 2003 10:48:46 -0000 1.3
+++ javax/swing/plaf/basic/BasicToggleButtonUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicToggleButtonUI.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +38,12 @@
package javax.swing.plaf.basic;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+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;
public class BasicToggleButtonUI extends BasicButtonUI
{
Index: javax/swing/plaf/basic/BasicViewportUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicViewportUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicViewportUI.java
--- javax/swing/plaf/basic/BasicViewportUI.java 10 May 2003 08:14:36 -0000 1.2
+++ javax/swing/plaf/basic/BasicViewportUI.java 10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
/* BasicViewportUI.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,11 @@
package javax.swing.plaf.basic;
-import javax.swing.plaf.*;
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ViewportUI;
public class BasicViewportUI extends ViewportUI
{