Commit 2f161fa8 by Michael Koch Committed by Michael Koch

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
parent fa9ea255
2003-06-27 Michael Koch <konqueror@gmx.de> 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 * java/security/Certificate.java
(getGuarantor): Removed wrong @deprecated tag. (getGuarantor): Removed wrong @deprecated tag.
(getPrincipal): Likewise. (getPrincipal): Likewise.
......
...@@ -46,6 +46,8 @@ import java.awt.peer.WindowPeer; ...@@ -46,6 +46,8 @@ import java.awt.peer.WindowPeer;
import java.util.EventListener; import java.util.EventListener;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
/** /**
* This class represents a top-level window with no decorations. * This class represents a top-level window with no decorations.
...@@ -53,8 +55,10 @@ import java.util.ResourceBundle; ...@@ -53,8 +55,10 @@ import java.util.ResourceBundle;
* @author Aaron M. Renn <arenn@urbanophile.com> * @author Aaron M. Renn <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.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. // Serialized fields, from Sun's serialization spec.
private String warningString = null; private String warningString = null;
private int windowSerializedDataVersion = 0; // FIXME private int windowSerializedDataVersion = 0; // FIXME
...@@ -69,6 +73,7 @@ public class Window extends Container ...@@ -69,6 +73,7 @@ public class Window extends Container
private transient WindowFocusListener windowFocusListener; private transient WindowFocusListener windowFocusListener;
private transient WindowStateListener windowStateListener; private transient WindowStateListener windowStateListener;
private transient GraphicsConfiguration graphicsConfiguration; private transient GraphicsConfiguration graphicsConfiguration;
private transient AccessibleContext accessibleContext;
/** /**
* This (package access) constructor is used by subclasses that want * This (package access) constructor is used by subclasses that want
...@@ -585,7 +590,7 @@ public class Window extends Container ...@@ -585,7 +590,7 @@ public class Window extends Container
*/ */
public void applyResourceBundle(ResourceBundle rb) public void applyResourceBundle(ResourceBundle rb)
{ {
// FIXME throw new Error ("Not implemented");
} }
/** /**
...@@ -600,12 +605,12 @@ public class Window extends Container ...@@ -600,12 +605,12 @@ public class Window extends Container
applyResourceBundle(rb); applyResourceBundle(rb);
} }
/*
public AccessibleContext getAccessibleContext() public AccessibleContext getAccessibleContext()
{ {
// FIXME // FIXME
//return null;
throw new Error ("Not implemented");
} }
*/
/** /**
* Get graphics configuration. The implementation for Window will * Get graphics configuration. The implementation for Window will
......
...@@ -63,7 +63,7 @@ public abstract class GraphicAttribute ...@@ -63,7 +63,7 @@ public abstract class GraphicAttribute
public abstract float getAdvance (); public abstract float getAdvance ();
public int getAlignment () public final int getAlignment ()
{ {
return alignment; return alignment;
} }
......
...@@ -45,7 +45,7 @@ import java.awt.geom.Rectangle2D; ...@@ -45,7 +45,7 @@ import java.awt.geom.Rectangle2D;
/** /**
* @author Michael Koch * @author Michael Koch
*/ */
public class ImageGraphicAttribute extends GraphicAttribute public final class ImageGraphicAttribute extends GraphicAttribute
{ {
private Image image; private Image image;
......
...@@ -49,7 +49,7 @@ package java.awt.image; ...@@ -49,7 +49,7 @@ package java.awt.image;
/** /**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no> * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/ */
public class DataBufferByte extends DataBuffer public final class DataBufferByte extends DataBuffer
{ {
private byte[] data; private byte[] data;
private byte[][] bankData; private byte[][] bankData;
......
...@@ -49,7 +49,7 @@ package java.awt.image; ...@@ -49,7 +49,7 @@ package java.awt.image;
/** /**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no> * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/ */
public class DataBufferInt extends DataBuffer public final class DataBufferInt extends DataBuffer
{ {
private int[] data; private int[] data;
private int[][] bankData; private int[][] bankData;
......
...@@ -49,7 +49,7 @@ package java.awt.image; ...@@ -49,7 +49,7 @@ package java.awt.image;
/** /**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no> * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/ */
public class DataBufferUShort extends DataBuffer public final class DataBufferUShort extends DataBuffer
{ {
private short[] data; private short[] data;
private short[][] bankData; private short[][] bankData;
......
...@@ -376,7 +376,7 @@ public class DirectColorModel extends PackedColorModel ...@@ -376,7 +376,7 @@ public class DirectColorModel extends PackedColorModel
return Buffers.getData(buffer); return Buffers.getData(buffer);
} }
public ColorModel coerceData(WritableRaster raster, public final ColorModel coerceData (WritableRaster raster,
boolean isAlphaPremultiplied) boolean isAlphaPremultiplied)
{ {
if (this.isAlphaPremultiplied == isAlphaPremultiplied) if (this.isAlphaPremultiplied == isAlphaPremultiplied)
......
...@@ -336,7 +336,11 @@ public class PixelGrabber implements ImageConsumer ...@@ -336,7 +336,11 @@ 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() public synchronized int status()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment