This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.awt merge
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 5 Jun 2003 22:02:37 +0200
- Subject: FYI: Patch: java.awt merge
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to merge java.awt with classpath again.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+36HgWSOgCCdjSDsRAoFdAJ9l8BoOodNP6tMB8xrBR6REmSm/7gCeOMqH
gjP552uzrY1A4nbSVPT53kU=
=18+F
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1914
diff -u -b -B -r1.1914 ChangeLog
--- ChangeLog 5 Jun 2003 17:57:30 -0000 1.1914
+++ ChangeLog 5 Jun 2003 19:55:56 -0000
@@ -1,3 +1,41 @@
+2003-06-05 Michael Koch <konqueror@gmx.de>
+
+ * java/awt/Button.java,
+ java/awt/Checkbox.java,
+ java/awt/CheckboxMenuItem.java,
+ java/awt/Choice.java,
+ java/awt/Container.java,
+ java/awt/Dialog.java,
+ java/awt/EventQueue.java,
+ java/awt/FileDialog.java,
+ java/awt/Frame.java,
+ java/awt/Label.java,
+ java/awt/List.java,
+ java/awt/Menu.java,
+ java/awt/MenuItem.java,
+ java/awt/Panel.java,
+ java/awt/PopupMenu.java,
+ java/awt/Rectangle.java,
+ java/awt/ScrollPane.java,
+ java/awt/Scrollbar.java,
+ java/awt/TextArea.java,
+ java/awt/TextField.java,
+ java/awt/Window.java,
+ java/awt/datatransfer/DataFlavor.java,
+ java/awt/dnd/DragSource.java,
+ java/awt/dnd/DragSourceContext.java,
+ java/awt/event/HierarchyEvent.java,
+ java/awt/event/MouseWheelEvent.java,
+ java/awt/im/InputContext.java,
+ java/awt/image/BufferedImage.java,
+ java/awt/image/ComponentColorModel.java,
+ java/awt/image/Raster.java,
+ java/awt/image/WritableRaster.java,
+ java/awt/peer/ComponentPeer.java,
+ java/awt/print/PageFormat.java,
+ java/awt/print/PrinterJob.java:
+ New versions from Classpath.
+
2003-06-05 Scott Gilbertson <scottg@mantatest.com>
* java/text/SimpleDateFormat.java (SimpleDateFormat): Added
Index: java/awt/Button.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Button.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 Button.java
--- java/awt/Button.java 2 Jan 2003 00:14:22 -0000 1.10
+++ java/awt/Button.java 5 Jun 2003 19:55:56 -0000
@@ -41,7 +41,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.peer.ButtonPeer;
-import java.awt.peer.ComponentPeer;
import java.lang.reflect.Array;
import java.util.EventListener;
Index: java/awt/Checkbox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Checkbox.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 Checkbox.java
--- java/awt/Checkbox.java 25 May 2003 11:24:27 -0000 1.8
+++ java/awt/Checkbox.java 5 Jun 2003 19:55:57 -0000
@@ -38,10 +38,9 @@
package java.awt;
-import java.awt.peer.CheckboxPeer;
-import java.awt.peer.ComponentPeer;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+import java.awt.peer.CheckboxPeer;
import java.io.Serializable;
/**
Index: java/awt/CheckboxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/CheckboxMenuItem.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 CheckboxMenuItem.java
--- java/awt/CheckboxMenuItem.java 15 Feb 2003 09:21:54 -0000 1.8
+++ java/awt/CheckboxMenuItem.java 5 Jun 2003 19:55:57 -0000
@@ -38,11 +38,10 @@
package java.awt;
-import java.awt.peer.CheckboxMenuItemPeer;
-import java.awt.peer.MenuItemPeer;
-import java.awt.peer.MenuComponentPeer;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+import java.awt.peer.CheckboxMenuItemPeer;
+import java.awt.peer.MenuItemPeer;
import java.util.EventListener;
/**
Index: java/awt/Choice.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Choice.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 Choice.java
--- java/awt/Choice.java 15 Feb 2003 09:21:54 -0000 1.10
+++ java/awt/Choice.java 5 Jun 2003 19:55:57 -0000
@@ -38,13 +38,12 @@
package java.awt;
-import java.awt.peer.ChoicePeer;
-import java.awt.peer.ComponentPeer;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+import java.awt.peer.ChoicePeer;
import java.io.Serializable;
-import java.util.Vector;
import java.util.EventListener;
+import java.util.Vector;
/**
* This class implements a drop down choice list.
Index: java/awt/Container.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Container.java,v
retrieving revision 1.22
diff -u -b -B -r1.22 Container.java
--- java/awt/Container.java 20 Apr 2003 23:21:06 -0000 1.22
+++ java/awt/Container.java 5 Jun 2003 19:56:01 -0000
@@ -41,7 +41,6 @@
import java.awt.event.ContainerEvent;
import java.awt.event.ContainerListener;
import java.awt.event.MouseEvent;
-import java.awt.peer.ComponentPeer;
import java.awt.peer.ContainerPeer;
import java.awt.peer.LightweightPeer;
import java.beans.PropertyChangeListener;
Index: java/awt/Dialog.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Dialog.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 Dialog.java
--- java/awt/Dialog.java 25 May 2003 11:24:27 -0000 1.8
+++ java/awt/Dialog.java 5 Jun 2003 19:56:01 -0000
@@ -39,9 +39,6 @@
package java.awt;
import java.awt.peer.DialogPeer;
-import java.awt.peer.WindowPeer;
-import java.awt.peer.ContainerPeer;
-import java.awt.peer.ComponentPeer;
/**
* A dialog box widget class.
Index: java/awt/EventQueue.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/EventQueue.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 EventQueue.java
--- java/awt/EventQueue.java 2 Mar 2003 14:01:40 -0000 1.9
+++ java/awt/EventQueue.java 5 Jun 2003 19:56:01 -0000
@@ -37,9 +37,9 @@
package java.awt;
-import java.awt.event.*;
-import java.util.EmptyStackException;
+import java.awt.event.InvocationEvent;
import java.lang.reflect.InvocationTargetException;
+import java.util.EmptyStackException;
/* Written using on-line Java 2 Platform Standard Edition v1.3 API
* Specification, as well as "The Java Class Libraries", 2nd edition
@@ -376,4 +376,4 @@
// XXX For now, this ONLY does the current time.
return System.currentTimeMillis();
}
-} // class EventQueue
+}
Index: java/awt/FileDialog.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/FileDialog.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 FileDialog.java
--- java/awt/FileDialog.java 2 Jan 2003 00:14:22 -0000 1.5
+++ java/awt/FileDialog.java 5 Jun 2003 19:56:01 -0000
@@ -40,9 +40,6 @@
import java.awt.peer.FileDialogPeer;
import java.awt.peer.DialogPeer;
-import java.awt.peer.WindowPeer;
-import java.awt.peer.ContainerPeer;
-import java.awt.peer.ComponentPeer;
import java.io.FilenameFilter;
/**
Index: java/awt/Frame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Frame.java,v
retrieving revision 1.14
diff -u -b -B -r1.14 Frame.java
--- java/awt/Frame.java 25 May 2003 11:24:27 -0000 1.14
+++ java/awt/Frame.java 5 Jun 2003 19:56:01 -0000
@@ -39,9 +39,6 @@
package java.awt;
import java.awt.peer.FramePeer;
-import java.awt.peer.WindowPeer;
-import java.awt.peer.ContainerPeer;
-import java.awt.peer.ComponentPeer;
import java.util.Enumeration;
import java.util.Vector;
Index: java/awt/Label.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Label.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 Label.java
--- java/awt/Label.java 13 Feb 2003 19:28:31 -0000 1.11
+++ java/awt/Label.java 5 Jun 2003 19:56:01 -0000
@@ -39,7 +39,6 @@
package java.awt;
import java.awt.peer.LabelPeer;
-import java.awt.peer.ComponentPeer;
import javax.accessibility.Accessible;
/**
Index: java/awt/List.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/List.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 List.java
--- java/awt/List.java 2 Mar 2003 19:24:49 -0000 1.13
+++ java/awt/List.java 5 Jun 2003 19:56:01 -0000
@@ -38,13 +38,11 @@
package java.awt;
-import java.io.Serializable;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.peer.ListPeer;
-import java.awt.peer.ComponentPeer;
import java.util.EventListener;
import java.util.Vector;
import javax.accessibility.Accessible;
Index: java/awt/Menu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Menu.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 Menu.java
--- java/awt/Menu.java 15 Feb 2003 09:21:55 -0000 1.11
+++ java/awt/Menu.java 5 Jun 2003 19:56:01 -0000
@@ -39,11 +39,8 @@
package java.awt;
import java.awt.peer.MenuPeer;
-import java.awt.peer.MenuItemPeer;
-import java.awt.peer.MenuComponentPeer;
import java.io.Serializable;
import java.util.Vector;
-import java.util.Enumeration;
/**
* This class represents a pull down or tear off menu in Java's AWT.
Index: java/awt/MenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/MenuItem.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 MenuItem.java
--- java/awt/MenuItem.java 9 Aug 2002 04:26:14 -0000 1.12
+++ java/awt/MenuItem.java 5 Jun 2003 19:56:01 -0000
@@ -38,10 +38,9 @@
package java.awt;
-import java.awt.peer.MenuItemPeer;
-import java.awt.peer.MenuComponentPeer;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.peer.MenuItemPeer;
import java.lang.reflect.Array;
import java.util.EventListener;
Index: java/awt/Panel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Panel.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 Panel.java
--- java/awt/Panel.java 9 Aug 2002 04:26:14 -0000 1.7
+++ java/awt/Panel.java 5 Jun 2003 19:56:01 -0000
@@ -38,10 +38,6 @@
package java.awt;
-import java.awt.peer.PanelPeer;
-import java.awt.peer.ContainerPeer;
-import java.awt.peer.ComponentPeer;
-import java.io.Serializable;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
Index: java/awt/PopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/PopupMenu.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 PopupMenu.java
--- java/awt/PopupMenu.java 13 Feb 2003 19:28:31 -0000 1.6
+++ java/awt/PopupMenu.java 5 Jun 2003 19:56:01 -0000
@@ -38,10 +38,9 @@
package java.awt;
-import java.awt.peer.PopupMenuPeer;
import java.awt.peer.MenuPeer;
-import java.awt.peer.MenuItemPeer;
-import java.awt.peer.MenuComponentPeer;
+import java.awt.peer.PopupMenuPeer;
+
/**
* This class implement an AWT popup menu widget
*
Index: java/awt/Rectangle.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Rectangle.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 Rectangle.java
--- java/awt/Rectangle.java 9 Aug 2002 04:26:14 -0000 1.10
+++ java/awt/Rectangle.java 5 Jun 2003 19:56:01 -0000
@@ -38,7 +38,6 @@
package java.awt;
-import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.io.Serializable;
Index: java/awt/ScrollPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/ScrollPane.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 ScrollPane.java
--- java/awt/ScrollPane.java 18 Mar 2003 18:16:54 -0000 1.12
+++ java/awt/ScrollPane.java 5 Jun 2003 19:56:01 -0000
@@ -39,9 +39,8 @@
package java.awt;
import java.awt.event.MouseEvent;
-import java.awt.peer.ScrollPanePeer;
-import java.awt.peer.ContainerPeer;
import java.awt.peer.ComponentPeer;
+import java.awt.peer.ScrollPanePeer;
import javax.accessibility.Accessible;
/**
@@ -367,8 +366,8 @@
* @param index The index at which to add the child, which is ignored
* in this implementation.
*/
-public final void
-addImpl(Component component, Object constraints, int index)
+ protected final void addImpl (Component component, Object constraints,
+ int index)
{
Component[] list = getComponents();
if ((list != null) && (list.length > 0))
@@ -465,7 +464,7 @@
*
* @since 1.4
*/
- public boolean eventTypeEnabled (int type)
+ protected boolean eventTypeEnabled (int type)
{
if (type == MouseEvent.MOUSE_WHEEL)
return wheelScrollingEnabled;
Index: java/awt/Scrollbar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Scrollbar.java,v
retrieving revision 1.14
diff -u -b -B -r1.14 Scrollbar.java
--- java/awt/Scrollbar.java 25 May 2003 11:24:27 -0000 1.14
+++ java/awt/Scrollbar.java 5 Jun 2003 19:56:01 -0000
@@ -38,10 +38,9 @@
package java.awt;
-import java.awt.peer.ScrollbarPeer;
-import java.awt.peer.ComponentPeer;
import java.awt.event.AdjustmentListener;
import java.awt.event.AdjustmentEvent;
+import java.awt.peer.ScrollbarPeer;
import java.util.EventListener;
import javax.accessibility.Accessible;
Index: java/awt/TextArea.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextArea.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 TextArea.java
--- java/awt/TextArea.java 19 Feb 2003 00:35:35 -0000 1.7
+++ java/awt/TextArea.java 5 Jun 2003 19:56:01 -0000
@@ -38,9 +38,8 @@
package java.awt;
-import java.awt.peer.TextAreaPeer;
-import java.awt.peer.TextComponentPeer;
import java.awt.peer.ComponentPeer;
+import java.awt.peer.TextAreaPeer;
/**
* This implements a multi-line text entry widget.
Index: java/awt/TextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextField.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 TextField.java
--- java/awt/TextField.java 19 Feb 2003 00:35:35 -0000 1.7
+++ java/awt/TextField.java 5 Jun 2003 19:56:01 -0000
@@ -41,7 +41,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.peer.TextFieldPeer;
-import java.awt.peer.TextComponentPeer;
import java.awt.peer.ComponentPeer;
import java.util.EventListener;
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.21
diff -u -b -B -r1.21 Window.java
--- java/awt/Window.java 25 May 2003 11:24:27 -0000 1.21
+++ java/awt/Window.java 5 Jun 2003 19:56:01 -0000
@@ -43,7 +43,6 @@
import java.awt.event.WindowListener;
import java.awt.event.WindowStateListener;
import java.awt.peer.WindowPeer;
-import java.awt.peer.ComponentPeer;
import java.util.EventListener;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -655,7 +654,7 @@
*
* @since 1.4
*/
- public boolean isFocusableWindow ()
+ public final boolean isFocusableWindow ()
{
if (getFocusableWindowState () == false)
return false;
Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 DataFlavor.java
--- java/awt/datatransfer/DataFlavor.java 17 Mar 2003 15:20:10 -0000 1.9
+++ java/awt/datatransfer/DataFlavor.java 5 Jun 2003 19:56:01 -0000
@@ -49,7 +49,6 @@
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
-import java.nio.charset.Charset;
/**
* This class represents a particular data format used for transferring
Index: java/awt/dnd/DragSource.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/dnd/DragSource.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 DragSource.java
--- java/awt/dnd/DragSource.java 2 Mar 2003 14:24:48 -0000 1.3
+++ java/awt/dnd/DragSource.java 5 Jun 2003 19:56:01 -0000
@@ -49,9 +49,6 @@
import java.awt.datatransfer.SystemFlavorMap;
import java.awt.datatransfer.Transferable;
import java.awt.dnd.peer.DragSourceContextPeer;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.EventListener;
Index: java/awt/dnd/DragSourceContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/dnd/DragSourceContext.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DragSourceContext.java
--- java/awt/dnd/DragSourceContext.java 2 Mar 2003 14:24:48 -0000 1.5
+++ java/awt/dnd/DragSourceContext.java 5 Jun 2003 19:56:01 -0000
@@ -44,9 +44,6 @@
import java.awt.Point;
import java.awt.datatransfer.Transferable;
import java.awt.dnd.peer.DragSourceContextPeer;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.TooManyListenersException;
Index: java/awt/event/HierarchyEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/event/HierarchyEvent.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 HierarchyEvent.java
--- java/awt/event/HierarchyEvent.java 9 Aug 2002 04:26:15 -0000 1.4
+++ java/awt/event/HierarchyEvent.java 5 Jun 2003 19:56:01 -0000
@@ -35,8 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.event;
-import java.awt.*;
+
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.Container;
/**
* This class represents an event generated for an ancestor component which
Index: java/awt/event/MouseWheelEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/event/MouseWheelEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 MouseWheelEvent.java
--- java/awt/event/MouseWheelEvent.java 9 Aug 2002 04:26:15 -0000 1.1
+++ java/awt/event/MouseWheelEvent.java 5 Jun 2003 19:56:01 -0000
@@ -39,7 +39,6 @@
package java.awt.event;
import java.awt.Component;
-import java.awt.Point;
/**
* This event is generated for a mouse wheel rotation. The wheel (the middle
Index: java/awt/im/InputContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/im/InputContext.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 InputContext.java
--- java/awt/im/InputContext.java 9 Aug 2002 04:26:16 -0000 1.1
+++ java/awt/im/InputContext.java 5 Jun 2003 19:56:01 -0000
@@ -46,7 +46,6 @@
import java.io.InputStreamReader;
import java.io.IOException;
import java.net.URL;
-import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
Index: java/awt/image/BufferedImage.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/BufferedImage.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 BufferedImage.java
--- java/awt/image/BufferedImage.java 10 Mar 2003 13:21:38 -0000 1.6
+++ java/awt/image/BufferedImage.java 5 Jun 2003 19:56:01 -0000
@@ -37,10 +37,15 @@
package java.awt.image;
-import java.awt.*;
-import java.awt.color.*;
-import java.util.*;
-
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Transparency;
+import java.awt.color.ColorSpace;
+import java.util.Hashtable;
+import java.util.Vector;
import gnu.java.awt.ComponentDataBlitOp;
/**
Index: java/awt/image/ComponentColorModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/ComponentColorModel.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 ComponentColorModel.java
--- java/awt/image/ComponentColorModel.java 22 Jan 2002 22:40:10 -0000 1.4
+++ java/awt/image/ComponentColorModel.java 5 Jun 2003 19:56:01 -0000
@@ -34,10 +34,11 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.image;
-import java.awt.color.*;
import java.awt.Point;
+import java.awt.color.ColorSpace;
import gnu.java.awt.Buffers;
public class ComponentColorModel extends ColorModel
Index: java/awt/image/Raster.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/Raster.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 Raster.java
--- java/awt/image/Raster.java 22 Jan 2002 22:40:10 -0000 1.4
+++ java/awt/image/Raster.java 5 Jun 2003 19:56:01 -0000
@@ -34,9 +34,11 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.image;
-import java.awt.*;
+import java.awt.Point;
+import java.awt.Rectangle;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
Index: java/awt/image/WritableRaster.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/WritableRaster.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 WritableRaster.java
--- java/awt/image/WritableRaster.java 22 Jan 2002 22:40:10 -0000 1.4
+++ java/awt/image/WritableRaster.java 5 Jun 2003 19:56:01 -0000
@@ -34,9 +34,11 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.image;
-import java.awt.*;
+import java.awt.Point;
+import java.awt.Rectangle;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
@@ -138,10 +140,10 @@
public void setRect(Raster srcRaster)
{
- setRect(srcRaster, 0, 0);
+ setRect(0, 0, srcRaster);
}
- public void setRect(Raster srcRaster, int dx, int dy)
+ public void setRect(int dx, int dy, Raster srcRaster)
{
Rectangle targetUnclipped = new Rectangle(srcRaster.getMinX()+dx,
srcRaster.getMinY()+dy,
Index: java/awt/peer/ComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ComponentPeer.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 ComponentPeer.java
--- java/awt/peer/ComponentPeer.java 1 Mar 2003 22:14:21 -0000 1.10
+++ java/awt/peer/ComponentPeer.java 5 Jun 2003 19:56:01 -0000
@@ -38,9 +38,22 @@
package java.awt.peer;
-import java.awt.*;
+import java.awt.AWTEvent;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Toolkit;
import java.awt.event.PaintEvent;
-import java.awt.image.*;
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.awt.image.VolatileImage;
public interface ComponentPeer
{
Index: java/awt/print/PageFormat.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/print/PageFormat.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 PageFormat.java
--- java/awt/print/PageFormat.java 9 Aug 2002 04:26:16 -0000 1.1
+++ java/awt/print/PageFormat.java 5 Jun 2003 19:56:01 -0000
@@ -183,8 +183,7 @@
*
* @return The imageable height of the paper.
*/
-public double
-getImageableHeigth()
+public double getImageableHeight()
{
return(paper.getImageableHeight());
}
Index: java/awt/print/PrinterJob.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/print/PrinterJob.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 PrinterJob.java
--- java/awt/print/PrinterJob.java 17 Feb 2003 15:26:30 -0000 1.2
+++ java/awt/print/PrinterJob.java 5 Jun 2003 19:56:01 -0000
@@ -98,8 +98,7 @@
*
* @param copies The number of copies to be printed.
*/
-public abstract void
-setCopies();
+public abstract void setCopies (int copies);
/*************************************************************************/