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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 571bc2a866301decd82fa8719da26f7e6ed25186..9a28410eabf4845c0bb7d8c931c8eb297c725a0d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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

diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index 2da988507e9a92d72834403027b1fe86044d763d..13ae133beeedcc24bb5ad7467c257e465bcb8b4c 100644 (file)
--- a/libjava/java/awt/Window.java
+++ b/libjava/java/awt/Window.java
@@ -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

diff --git a/libjava/java/awt/font/GraphicAttribute.java b/libjava/java/awt/font/GraphicAttribute.java
index 377b8da4ccc3e18e47d275426b2ef1a193db57b2..b4a92168b5c2d70208b8b86a1ab4cb798d1a4e9c 100644 (file)
--- a/libjava/java/awt/font/GraphicAttribute.java
+++ b/libjava/java/awt/font/GraphicAttribute.java
@@ -63,7 +63,7 @@ public abstract class GraphicAttribute
 
   public abstract float getAdvance ();
 
-  public int getAlignment ()
+  public final int getAlignment ()
   {
     return alignment;
   }

diff --git a/libjava/java/awt/font/ImageGraphicAttribute.java b/libjava/java/awt/font/ImageGraphicAttribute.java
index ca5b95fc633436f3a724709ab9daefe67dfe1f83..9f691078d80a757bd85448f403ce32bb0a4c7d0e 100644 (file)
--- a/libjava/java/awt/font/ImageGraphicAttribute.java
+++ b/libjava/java/awt/font/ImageGraphicAttribute.java
@@ -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;
   

diff --git a/libjava/java/awt/image/DataBufferByte.java b/libjava/java/awt/image/DataBufferByte.java
index fe2e83beda1ed8aa63eadc56cd54119cfed5f551..84df55106071dca3f1fdcabe2cf4a8ee77ad8879 100644 (file)
--- a/libjava/java/awt/image/DataBufferByte.java
+++ b/libjava/java/awt/image/DataBufferByte.java
@@ -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;

diff --git a/libjava/java/awt/image/DataBufferInt.java b/libjava/java/awt/image/DataBufferInt.java
index 1de1f5148972f0bcd00f632d9dc072f4442cb912..54308fefd02938a69ad9aa92ddbbc856287ea942 100644 (file)
--- a/libjava/java/awt/image/DataBufferInt.java
+++ b/libjava/java/awt/image/DataBufferInt.java
@@ -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;

diff --git a/libjava/java/awt/image/DataBufferUShort.java b/libjava/java/awt/image/DataBufferUShort.java
index a3743fb47496257f8d2213d427be12bc012cb2ba..e11b4ab10b266313e0e17436b79036d4f1dd2593 100644 (file)
--- a/libjava/java/awt/image/DataBufferUShort.java
+++ b/libjava/java/awt/image/DataBufferUShort.java
@@ -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;

diff --git a/libjava/java/awt/image/DirectColorModel.java b/libjava/java/awt/image/DirectColorModel.java
index b502bdf3bca879d42a392196df466b835b8b28c1..9444e831f8351d76cfb9f2e0104f4cc1f65e6094 100644 (file)
--- a/libjava/java/awt/image/DirectColorModel.java
+++ b/libjava/java/awt/image/DirectColorModel.java
@@ -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;

diff --git a/libjava/java/awt/image/PixelGrabber.java b/libjava/java/awt/image/PixelGrabber.java
index 24dd6d3fc490fab485d3fb51f336bae9e8a1c1e5..b94ed8fbe86a63051a18085afdacc6aca9074519 100644 (file)
--- a/libjava/java/awt/image/PixelGrabber.java
+++ b/libjava/java/awt/image/PixelGrabber.java
@@ -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();