From 2e22d9b885c204ce26b88733df88d9d22598734b Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Thu, 15 Feb 2001 04:36:34 +0000 Subject: [PATCH] DirectRasterGraphics.java (clone): Hoist to public. * gnu/awt/j2d/DirectRasterGraphics.java (clone): Hoist to public. * gnu/awt/j2d/IntegerGraphicsState.java (setClip): Call Rectangle.clone(), not Object.clone(). From-SVN: r39706 --- libjava/ChangeLog | 4 ++++ libjava/gnu/awt/j2d/DirectRasterGraphics.java | 2 ++ libjava/gnu/awt/j2d/IntegerGraphicsState.java | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0f289343440..1d8b086da5e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -4,6 +4,10 @@ Object.clone(). * java/util/Collections.java (ReverseComparator): New static class. (reverseOrder): Return static instance of ReverseComparator. + + * gnu/awt/j2d/DirectRasterGraphics.java (clone): Hoist to public. + * gnu/awt/j2d/IntegerGraphicsState.java (setClip): Call + Rectangle.clone(), not Object.clone(). 2001-02-14 Bryce McKinlay diff --git a/libjava/gnu/awt/j2d/DirectRasterGraphics.java b/libjava/gnu/awt/j2d/DirectRasterGraphics.java index 6bbdbd1d23e..8d25b88d018 100644 --- a/libjava/gnu/awt/j2d/DirectRasterGraphics.java +++ b/libjava/gnu/awt/j2d/DirectRasterGraphics.java @@ -79,4 +79,6 @@ public interface DirectRasterGraphics extends Cloneable * Detach previously mapped pixel data from a raster object. */ public void unmapRaster(MappedRaster mappedRaster); + + public Object clone(); } diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java index 923720e06ae..90a1a4d2ab5 100644 --- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java +++ b/libjava/gnu/awt/j2d/IntegerGraphicsState.java @@ -69,7 +69,6 @@ public class IntegerGraphicsState extends AbstractGraphicsState super.dispose(); } - // -------- Graphics methods: public void setColor(Color color) @@ -101,7 +100,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState { if (clip instanceof Rectangle) { - Rectangle clipRect = (Rectangle) clip.clone(); + Rectangle clipRect = (Rectangle) ((Rectangle) clip).clone(); clipRect.x += tx; clipRect.y += ty; -- 2.30.2