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]

Patch: bug fix for branch


I'm checking this in on the gcc 3.0 branch.
Without this libjava doesn't build.

2001-02-15  Bryce McKinlay  <bryce@albatross.co.nz>

	* gnu/awt/j2d/DirectRasterGraphics.java (clone): Hoist to public.
	* gnu/awt/j2d/IntegerGraphicsState.java (setClip): Call 
	Rectangle.clone(), not Object.clone().

2001-02-13  Tom Tromey  <tromey@redhat.com>

	* gnu/awt/j2d/AbstractGraphicsState.java (clone): Made public.

Tom

Index: gnu/awt/j2d/AbstractGraphicsState.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/j2d/AbstractGraphicsState.java,v
retrieving revision 1.1
diff -u -r1.1 AbstractGraphicsState.java
--- AbstractGraphicsState.java	2000/10/22 17:46:09	1.1
+++ AbstractGraphicsState.java	2001/02/15 18:11:59
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -125,4 +125,9 @@
   public abstract void scale(double scaleX, double scaleY);
   
   public abstract void shear(double shearX, double shearY);
+
+  public Object clone ()
+  {
+    return super.clone ();
+  }
 }
Index: gnu/awt/j2d/DirectRasterGraphics.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/j2d/DirectRasterGraphics.java,v
retrieving revision 1.1
diff -u -r1.1 DirectRasterGraphics.java
--- DirectRasterGraphics.java	2000/10/22 17:46:09	1.1
+++ DirectRasterGraphics.java	2001/02/15 18:11:59
@@ -79,4 +79,6 @@
    * Detach previously mapped pixel data from a raster object.
    */
   public void unmapRaster(MappedRaster mappedRaster);
+  
+  public Object clone();
 }
Index: gnu/awt/j2d/IntegerGraphicsState.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/j2d/IntegerGraphicsState.java,v
retrieving revision 1.1
diff -u -r1.1 IntegerGraphicsState.java
--- IntegerGraphicsState.java	2000/10/22 17:46:09	1.1
+++ IntegerGraphicsState.java	2001/02/15 18:11:59
@@ -69,7 +69,6 @@
     super.dispose();
   }
   
-
   // -------- Graphics methods:
   
   public void setColor(Color color)
@@ -101,7 +100,7 @@
   {
     if (clip instanceof Rectangle)
       {
-	Rectangle clipRect = (Rectangle) clip.clone();
+	Rectangle clipRect = (Rectangle) ((Rectangle) clip).clone();
 	clipRect.x += tx;
 	clipRect.y += ty;
 	


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