Button.java, [...]: New versions from Classpath.

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.

From-SVN: r67506

libjava/ChangeLog

@@ -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

libjava/java/awt/Button.java

@@ -41,7 +41,6 @@ package java.awt;
 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;
 

libjava/java/awt/Checkbox.java

@@ -38,10 +38,9 @@ exception statement from your version. */
 
 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;
 
 /**

libjava/java/awt/CheckboxMenuItem.java

@@ -38,11 +38,10 @@ exception statement from your version. */
 
 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;
 
 /**

libjava/java/awt/Choice.java

@@ -38,13 +38,12 @@ exception statement from your version. */
 
 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.

libjava/java/awt/Container.java

@@ -41,7 +41,6 @@ import java.awt.event.AWTEventListener;
 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;

libjava/java/awt/Dialog.java

@@ -39,9 +39,6 @@ exception statement from your version. */
 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.

libjava/java/awt/EventQueue.java

@@ -37,9 +37,9 @@ exception statement from your version. */
 
 package java.awt;
 
-import java.awt.event.*;
+import java.awt.event.InvocationEvent;
-import java.util.EmptyStackException;
 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 @@ public class EventQueue
     // XXX For now, this ONLY does the current time.
     return System.currentTimeMillis();
   }
-} // class EventQueue
+}

libjava/java/awt/FileDialog.java

@@ -40,9 +40,6 @@ package java.awt;
 
 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;
 
 /**

libjava/java/awt/Frame.java

@@ -39,9 +39,6 @@ exception statement from your version. */
 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;
 

libjava/java/awt/Label.java

@@ -39,7 +39,6 @@ exception statement from your version. */
 package java.awt;
 
 import java.awt.peer.LabelPeer;
-import java.awt.peer.ComponentPeer;
 import javax.accessibility.Accessible;
 
 /**

libjava/java/awt/List.java

@@ -38,13 +38,11 @@ exception statement from your version. */
 
 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;

libjava/java/awt/Menu.java

@@ -39,11 +39,8 @@ exception statement from your version. */
 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.

libjava/java/awt/MenuItem.java

@@ -38,10 +38,9 @@ exception statement from your version. */
 
 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;
 

libjava/java/awt/Panel.java

@@ -38,10 +38,6 @@ exception statement from your version. */
 
 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;

libjava/java/awt/PopupMenu.java

@@ -38,10 +38,9 @@ exception statement from your version. */
 
 package java.awt;
 
-import java.awt.peer.PopupMenuPeer;
 import java.awt.peer.MenuPeer;
-import java.awt.peer.MenuItemPeer;
+import java.awt.peer.PopupMenuPeer;
-import java.awt.peer.MenuComponentPeer;
+
 /**
   * This class implement an AWT popup menu widget
   *

libjava/java/awt/Rectangle.java

@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package java.awt;
 
-import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 

libjava/java/awt/ScrollPane.java

@@ -39,9 +39,8 @@ exception statement from your version. */
 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 @@ removeNotify()
   * @param index The index at which to add the child, which is ignored
   * in this implementation.
   */
-public final void
+  protected final void addImpl (Component component, Object constraints,
-addImpl(Component component, Object constraints, int index)
+				int index)
 {
   Component[] list = getComponents();
   if ((list != null) && (list.length > 0))
@@ -465,7 +464,7 @@ paramString()
    *
    * @since 1.4
    */
-  public boolean eventTypeEnabled (int type)
+  protected boolean eventTypeEnabled (int type)
   {
     if (type == MouseEvent.MOUSE_WHEEL)
       return wheelScrollingEnabled;

libjava/java/awt/Scrollbar.java

@@ -38,10 +38,9 @@ exception statement from your version. */
 
 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;
 

libjava/java/awt/TextArea.java

@@ -38,9 +38,8 @@ exception statement from your version. */
 
 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.

libjava/java/awt/TextField.java

@@ -41,7 +41,6 @@ package java.awt;
 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;
 

libjava/java/awt/Window.java

@@ -43,7 +43,6 @@ import java.awt.event.WindowFocusListener;
 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 @@ public class Window extends Container
    *
    * @since 1.4
    */
-  public boolean isFocusableWindow ()
+  public final boolean isFocusableWindow ()
   {
     if (getFocusableWindowState () == false)
       return false;

libjava/java/awt/datatransfer/DataFlavor.java

@@ -49,7 +49,6 @@ import java.io.StringReader;
 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

libjava/java/awt/dnd/DragSource.java

@@ -49,9 +49,6 @@ import java.awt.datatransfer.FlavorMap;
 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;
 

libjava/java/awt/dnd/DragSourceContext.java

@@ -44,9 +44,6 @@ import java.awt.Image;
 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;
 

libjava/java/awt/event/HierarchyEvent.java

@@ -35,8 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package 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

libjava/java/awt/event/MouseWheelEvent.java

@@ -39,7 +39,6 @@ exception statement from your version. */
 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

libjava/java/awt/im/InputContext.java

@@ -46,7 +46,6 @@ import java.io.BufferedReader;
 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;

libjava/java/awt/image/BufferedImage.java

@@ -37,10 +37,15 @@ exception statement from your version. */
 
 package java.awt.image;
 
-import java.awt.*;
+import java.awt.Graphics;
-import java.awt.color.*;
+import java.awt.Graphics2D;
-import java.util.*;
+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;
 
 /**

libjava/java/awt/image/ComponentColorModel.java

@@ -34,10 +34,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package 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

libjava/java/awt/image/Raster.java

@@ -34,9 +34,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.awt.image;
 
-import java.awt.*;
+import java.awt.Point;
+import java.awt.Rectangle;
 
 /**
  * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>

libjava/java/awt/image/WritableRaster.java

@@ -34,9 +34,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package 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 class WritableRaster extends Raster
 
   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,

libjava/java/awt/peer/ComponentPeer.java

@@ -38,9 +38,22 @@ exception statement from your version. */
 
 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
 {

libjava/java/awt/print/PageFormat.java

@@ -183,8 +183,7 @@ getImageableWidth()
   *
   * @return The imageable height of the paper.
   */
-public double
+public double getImageableHeight()
-getImageableHeigth()
 {
   return(paper.getImageableHeight());
 }

libjava/java/awt/print/PrinterJob.java

@@ -98,8 +98,7 @@ getCopies();
   *
   * @param copies The number of copies to be printed.
   */
-public abstract void
+public abstract void setCopies (int copies);
-setCopies();
 
 /*************************************************************************/