Window.java, [...]: New versions from classpath.

2003-06-27  Michael Koch  <konqueror@gmx.de>

	* java/awt/Window.java,
	java/awt/font/GraphicAttribute.java,
	java/awt/font/ImageGraphicAttribute.java,
	java/awt/image/DataBufferByte.java,
	java/awt/image/DataBufferInt.java,
	java/awt/image/DataBufferUShort.java,
	java/awt/image/DirectColorModel.java,
	java/awt/image/PixelGrabber.java:
	New versions from classpath.

From-SVN: r68605
This commit is contained in:
Michael Koch 2003-06-27 20:53:01 +00:00 committed by Michael Koch
parent fa9ea25574
commit 2f161fa8c1
9 changed files with 35 additions and 14 deletions

View File

@ -1,3 +1,15 @@
2003-06-27 Michael Koch <konqueror@gmx.de>
* java/awt/Window.java,
java/awt/font/GraphicAttribute.java,
java/awt/font/ImageGraphicAttribute.java,
java/awt/image/DataBufferByte.java,
java/awt/image/DataBufferInt.java,
java/awt/image/DataBufferUShort.java,
java/awt/image/DirectColorModel.java,
java/awt/image/PixelGrabber.java:
New versions from classpath.
2003-06-27 Michael Koch <konqueror@gmx.de>
* java/security/Certificate.java

View File

@ -46,6 +46,8 @@ import java.awt.peer.WindowPeer;
import java.util.EventListener;
import java.util.Locale;
import java.util.ResourceBundle;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
/**
* This class represents a top-level window with no decorations.
@ -53,8 +55,10 @@ import java.util.ResourceBundle;
* @author Aaron M. Renn <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
*/
public class Window extends Container
public class Window extends Container implements Accessible
{
private static final long serialVersionUID = 4497834738069338734L;
// Serialized fields, from Sun's serialization spec.
private String warningString = null;
private int windowSerializedDataVersion = 0; // FIXME
@ -69,6 +73,7 @@ public class Window extends Container
private transient WindowFocusListener windowFocusListener;
private transient WindowStateListener windowStateListener;
private transient GraphicsConfiguration graphicsConfiguration;
private transient AccessibleContext accessibleContext;
/**
* This (package access) constructor is used by subclasses that want
@ -87,7 +92,7 @@ public class Window extends Container
this();
graphicsConfiguration = gc;
}
/**
* Initializes a new instance of <code>Window</code> with the specified
* parent. The window will initially be invisible.
@ -585,7 +590,7 @@ public class Window extends Container
*/
public void applyResourceBundle(ResourceBundle rb)
{
// FIXME
throw new Error ("Not implemented");
}
/**
@ -600,12 +605,12 @@ public class Window extends Container
applyResourceBundle(rb);
}
/*
public AccessibleContext getAccessibleContext()
{
// FIXME
//return null;
throw new Error ("Not implemented");
}
*/
/**
* Get graphics configuration. The implementation for Window will

View File

@ -63,7 +63,7 @@ public abstract class GraphicAttribute
public abstract float getAdvance ();
public int getAlignment ()
public final int getAlignment ()
{
return alignment;
}

View File

@ -45,7 +45,7 @@ import java.awt.geom.Rectangle2D;
/**
* @author Michael Koch
*/
public class ImageGraphicAttribute extends GraphicAttribute
public final class ImageGraphicAttribute extends GraphicAttribute
{
private Image image;

View File

@ -49,7 +49,7 @@ package java.awt.image;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
public class DataBufferByte extends DataBuffer
public final class DataBufferByte extends DataBuffer
{
private byte[] data;
private byte[][] bankData;

View File

@ -49,7 +49,7 @@ package java.awt.image;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
public class DataBufferInt extends DataBuffer
public final class DataBufferInt extends DataBuffer
{
private int[] data;
private int[][] bankData;

View File

@ -49,7 +49,7 @@ package java.awt.image;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
public class DataBufferUShort extends DataBuffer
public final class DataBufferUShort extends DataBuffer
{
private short[] data;
private short[][] bankData;

View File

@ -376,8 +376,8 @@ public class DirectColorModel extends PackedColorModel
return Buffers.getData(buffer);
}
public ColorModel coerceData(WritableRaster raster,
boolean isAlphaPremultiplied)
public final ColorModel coerceData (WritableRaster raster,
boolean isAlphaPremultiplied)
{
if (this.isAlphaPremultiplied == isAlphaPremultiplied)
return this;

View File

@ -336,8 +336,12 @@ public class PixelGrabber implements ImageConsumer
}
/**
@deprecated by getStatus
*/
Get the status of the pixel grabbing representing by ImageObserver flags
@return the status
@specnote This method is not deprecated but getStatus is preferred to use
*/
public synchronized int status()
{
return getStatus();