From 37f3981f8062d2c331a143e90cbacbf021661c49 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 11 Jun 2003 10:37:48 +0000 Subject: [PATCH] Frame.java, [...]: New versions from classpath. 2003-06-11 Michael Koch * 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. From-SVN: r67754 --- libjava/ChangeLog | 9 ++++++ libjava/java/awt/Frame.java | 2 +- libjava/java/awt/Graphics.java | 40 -------------------------- libjava/java/awt/Menu.java | 15 ---------- libjava/java/awt/Robot.java | 5 ++++ libjava/java/awt/image/ColorModel.java | 4 +-- 6 files changed, 17 insertions(+), 58 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 997cf1ecffc..388dd00e2f4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2003-06-11 Michael Koch + + * 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 * java/io/PrintStream.java: diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java index d162df76d18..82fed1656ae 100644 --- a/libjava/java/awt/Frame.java +++ b/libjava/java/awt/Frame.java @@ -515,7 +515,7 @@ getFrames() */ public void setMaximizedBounds (Rectangle maximizedBounds) { - throw new Error ("not implemented"); + this.maximizedBounds = maximizedBounds; } /** diff --git a/libjava/java/awt/Graphics.java b/libjava/java/awt/Graphics.java index 1b4581b64f0..c225b521a04 100644 --- a/libjava/java/awt/Graphics.java +++ b/libjava/java/awt/Graphics.java @@ -440,24 +440,6 @@ fill3DRect(int x, int y, int width, int height, boolean raised) /*************************************************************************/ -/** - * 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 true if the rectangle appears raised, - * false 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. * @@ -615,28 +597,6 @@ drawChars(char data[], int offset, int length, int x, int y) 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) { diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java index 40253c493b0..52244b9a1c4 100644 --- a/libjava/java/awt/Menu.java +++ b/libjava/java/awt/Menu.java @@ -187,21 +187,6 @@ public int countItems () /*************************************************************************/ -/** - * Returns the number of items in this menu. - * - * @return The number of items in this menu. - * - * @deprecated This method is deprecated in favor of getItemCount(). - */ -public int -count() -{ - return(items.size()); -} - -/*************************************************************************/ - /** * Returns the item at the specified index. * diff --git a/libjava/java/awt/Robot.java b/libjava/java/awt/Robot.java index cc0ab15c6e9..f633fc0b354 100644 --- a/libjava/java/awt/Robot.java +++ b/libjava/java/awt/Robot.java @@ -40,9 +40,13 @@ package java.awt; 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 class Robot public Robot(GraphicsDevice screen) throws AWTException { this(); + this.screen = screen; } public void mouseMove(int x, int y) diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java index f798ee2c861..9976985ab52 100644 --- a/libjava/java/awt/image/ColorModel.java +++ b/libjava/java/awt/image/ColorModel.java @@ -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 @@ public abstract class ColorModel implements Transparency { 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, -- 2.30.2