This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

FYI: Patch: java.awt merge

From: Michael Koch <konqueror at gmx dot de>
To: java-patches at gcc dot gnu dot org
Date: Fri, 27 Jun 2003 22:56:38 +0200
Subject: FYI: Patch: java.awt merge

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

Hi list,


I commited the attached patch to trunk to merge java.awt with 
classpath again.


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

iD8DBQE+/K+GWSOgCCdjSDsRAlgQAKCiHryp0J6Xx/KaTpNk079z88/D3QCfYpHw
ANEp6eeRopHQFgZk2scMuAo=
=D1OL
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2006
diff -u -b -B -r1.2006 ChangeLog
--- ChangeLog	27 Jun 2003 16:11:26 -0000	1.2006
+++ ChangeLog	27 Jun 2003 20:50:17 -0000
@@ -1,5 +1,17 @@
 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
 	(getGuarantor): Removed wrong @deprecated tag.
 	(getPrincipal): Likewise.
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.23
diff -u -b -B -r1.23 Window.java
--- java/awt/Window.java	24 Jun 2003 10:50:20 -0000	1.23
+++ java/awt/Window.java	27 Jun 2003 20:50:17 -0000
@@ -46,6 +46,8 @@
 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 @@
  * @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 @@
   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
@@ -585,7 +590,7 @@
    */
   public void applyResourceBundle(ResourceBundle rb)
   {
-    // FIXME
+    throw new Error ("Not implemented");
   }
 
   /**
@@ -600,12 +605,12 @@
       applyResourceBundle(rb);    
   }
 
-  /*
   public AccessibleContext getAccessibleContext()
   {
     // FIXME
+    //return null;
+    throw new Error ("Not implemented");
   }
-  */
 
   /** 
    * Get graphics configuration.  The implementation for Window will
Index: java/awt/font/GraphicAttribute.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/font/GraphicAttribute.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 GraphicAttribute.java
--- java/awt/font/GraphicAttribute.java	17 Feb 2003 15:26:30 -0000	1.1
+++ java/awt/font/GraphicAttribute.java	27 Jun 2003 20:50:21 -0000
@@ -63,7 +63,7 @@
 
   public abstract float getAdvance ();
 
-  public int getAlignment ()
+  public final int getAlignment ()
   {
     return alignment;
   }
Index: java/awt/font/ImageGraphicAttribute.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/font/ImageGraphicAttribute.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ImageGraphicAttribute.java
--- java/awt/font/ImageGraphicAttribute.java	17 Feb 2003 15:26:30 -0000	1.1
+++ java/awt/font/ImageGraphicAttribute.java	27 Jun 2003 20:50:21 -0000
@@ -45,7 +45,7 @@
 /**
  * @author Michael Koch
  */
-public class ImageGraphicAttribute extends GraphicAttribute
+public final class ImageGraphicAttribute extends GraphicAttribute
 {
   private Image image;
   
Index: java/awt/image/DataBufferByte.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/DataBufferByte.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DataBufferByte.java
--- java/awt/image/DataBufferByte.java	22 Jan 2002 22:40:10 -0000	1.4
+++ java/awt/image/DataBufferByte.java	27 Jun 2003 20:50:21 -0000
@@ -49,7 +49,7 @@
 /**
  * @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;
Index: java/awt/image/DataBufferInt.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/DataBufferInt.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DataBufferInt.java
--- java/awt/image/DataBufferInt.java	22 Jan 2002 22:40:10 -0000	1.4
+++ java/awt/image/DataBufferInt.java	27 Jun 2003 20:50:21 -0000
@@ -49,7 +49,7 @@
 /**
  * @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;
Index: java/awt/image/DataBufferUShort.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/DataBufferUShort.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DataBufferUShort.java
--- java/awt/image/DataBufferUShort.java	22 Jan 2002 22:40:10 -0000	1.4
+++ java/awt/image/DataBufferUShort.java	27 Jun 2003 20:50:21 -0000
@@ -49,7 +49,7 @@
 /**
  * @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;
Index: java/awt/image/DirectColorModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/DirectColorModel.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DirectColorModel.java
--- java/awt/image/DirectColorModel.java	22 Jan 2002 22:40:10 -0000	1.4
+++ java/awt/image/DirectColorModel.java	27 Jun 2003 20:50:21 -0000
@@ -376,7 +376,7 @@
     return Buffers.getData(buffer);
   }
     
-  public ColorModel coerceData(WritableRaster raster,
+  public final ColorModel coerceData (WritableRaster raster,
 			       boolean isAlphaPremultiplied)
   {
     if (this.isAlphaPremultiplied == isAlphaPremultiplied)
Index: java/awt/image/PixelGrabber.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/PixelGrabber.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 PixelGrabber.java
--- java/awt/image/PixelGrabber.java	9 Aug 2002 04:26:16 -0000	1.3
+++ java/awt/image/PixelGrabber.java	27 Jun 2003 20:50:21 -0000
@@ -336,7 +336,11 @@
     }
 
     /**
-       @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()
     {

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]