FYI: Patch: java.awt - classpath merging

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patch merge java.awt with classpath more.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+5wdpWSOgCCdjSDsRAjezAJ47xtG78GrgqezlpFYaujjdLTD1hQCgh4O0
YxLdf/7LTBCzy3SlVaUhV7k=
=9RIf
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1934
diff -u -b -B -r1.1934 ChangeLog
--- ChangeLog	10 Jun 2003 17:15:18 -0000	1.1934
+++ ChangeLog	11 Jun 2003 10:32:33 -0000
@@ -1,3 +1,12 @@
+2003-06-11  Michael Koch  <konqueror@gmx.de>
+
+	* java/awt/Frame.java,
+	java/awt/Graphics.java,
+	java/awt/Menu.java,
+	java/awt/Robot.java,
+	java/awt/image/ColorModel.java:
+	New versions from classpath.
+
 2003-06-10  Michael Koch  <konqueror@gmx.de>
 
 	* java/io/PrintStream.java:
Index: java/awt/Frame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Frame.java,v
retrieving revision 1.15
diff -u -b -B -r1.15 Frame.java
--- java/awt/Frame.java	5 Jun 2003 19:58:39 -0000	1.15
+++ java/awt/Frame.java	11 Jun 2003 10:32:34 -0000
@@ -515,7 +515,7 @@
    */
   public void setMaximizedBounds (Rectangle maximizedBounds)
   {
-    throw new Error ("not implemented");
+    this.maximizedBounds = maximizedBounds;
   }
 
   /**
Index: java/awt/Graphics.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Graphics.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 Graphics.java
--- java/awt/Graphics.java	13 Feb 2003 19:26:57 -0000	1.5
+++ java/awt/Graphics.java	11 Jun 2003 10:32:34 -0000
@@ -441,24 +441,6 @@
 /*************************************************************************/
 
 /**
-  * Draws the outline of the specified rectangle with a 3D effect
-  *
-  * @param x The X coordinate of the upper left corner of the draw rect.
-  * @param y The Y coordinate of the upper left corner of the draw rect.
-  * @param width The width of the draw rect.
-  * @param height The height of the draw rect.
-  * @param raised <code>true</code> if the rectangle appears raised,
-  * <code>false</code> if it should appear etched.
-  */
-public void
-drawRoundRect(int x, int y, int width, int height, boolean raised)
-{
-  // FIXME: ???
-}
-
-/*************************************************************************/
-
-/**
   * Draws an oval that just fits within the specified rectangle.
   *
   * @param x The X coordinate of the upper left corner of the rect.
@@ -614,28 +596,6 @@
 {
   drawString(new String(data, offset, length), x, y);
 }
-
-/*************************************************************************/
-
-/**
-  * Draws the specified bytes as text starting at the specified point.
-  *
-  * @param data The array of bytes to draw.
-  * @param offset The offset into the array to start drawing bytes from.
-  * @param length The number of bytes to draw.
-  * @param x The X coordinate of the point to draw at.
-  * @param y The Y coordinate of the point to draw at.
-  */
-public void
-drawChars(byte data[], int offset, int length, int x, int y)
-{
-  drawString(new String(data, offset, length), x, y);
-}
-
-/*
-public abstract void drawString(AttributedCharacterIterator iterator,
-	        		  int x, int y)
-*/
 
 public void
 drawBytes(byte[] data, int offset, int length, int x, int y)
Index: java/awt/Menu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Menu.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 Menu.java
--- java/awt/Menu.java	5 Jun 2003 19:58:39 -0000	1.12
+++ java/awt/Menu.java	11 Jun 2003 10:32:34 -0000
@@ -188,21 +188,6 @@
 /*************************************************************************/
 
 /**
-  * Returns the number of items in this menu.
-  *
-  * @return The number of items in this menu.
-  *
-  * @deprecated This method is deprecated in favor of <code>getItemCount()</code>.
-  */
-public int
-count()
-{
-  return(items.size());
-}
- 
-/*************************************************************************/
-
-/**
   * Returns the item at the specified index.
   *
   * @return The item at the specified index.
Index: java/awt/Robot.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Robot.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Robot.java
--- java/awt/Robot.java	24 Mar 2003 13:50:32 -0000	1.2
+++ java/awt/Robot.java	11 Jun 2003 10:32:34 -0000
@@ -40,9 +40,13 @@
 
 import java.awt.image.BufferedImage;
 
+/**
+ * @since 1.3
+ */
 /** STUB CLASS ONLY */
 public class Robot
 {
+  private GraphicsDevice screen;
   private boolean waitForIdle;
   private int autoDelay;
   
@@ -68,6 +72,7 @@
   public Robot(GraphicsDevice screen) throws AWTException
   {
     this();
+    this.screen = screen;
   }
 
   public void mouseMove(int x, int y)
Index: java/awt/image/ColorModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/ColorModel.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 ColorModel.java
--- java/awt/image/ColorModel.java	18 Feb 2003 00:57:26 -0000	1.10
+++ java/awt/image/ColorModel.java	11 Jun 2003 10:32:34 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2002  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2002, 2003  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -113,7 +113,7 @@
   {
     this(bits * 4, // total bits, sRGB, four channels
 	 nArray(bits, 4), // bits for each channel
-	 null, // FIXME: should be sRGB
+	 ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
 	 true, // has alpha
 	 false, // not premultiplied
 	 TRANSLUCENT,