aboutsummaryrefslogtreecommitdiff
path: root/libjava/gnu/java
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2005-04-19 05:20:12 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2005-04-19 05:20:12 +0000
commit747a54e2e6fe4ac316d2eef74c48448d862cf9f5 (patch)
tree5bf3a7fd7b79ae251d31f0c6f157b5da2c08e6b0 /libjava/gnu/java
parent9c3ff9fc828113aaeb1efb2d69217c64eca6cdd2 (diff)
downloadgcc-747a54e2e6fe4ac316d2eef74c48448d862cf9f5.zip
gcc-747a54e2e6fe4ac316d2eef74c48448d862cf9f5.tar.gz
gcc-747a54e2e6fe4ac316d2eef74c48448d862cf9f5.tar.bz2
2005-04-19 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/peer/gtk/GdkGraphics.java (getClipBounds): Handle clip being null. (setClip): Likewise. * java/beans/beancontext/BeanContextSupport.java (add): Implemented. (addAll): Likewise. (clear): Likewise. (removeAll): Likewise. (retainAll): Likewise. 2005-04-19 Michael Koch <konqueror@gmx.de> * java/beans/beancontext/BeanContextServicesSupport.java (BeanContextServicesSupport): Reimplemented. (addBeanContextServicesListener): Implemented. (initialize): Likewise. (removeBeanContextServicesListener): Likewise. * java/beans/beancontext/BeanContextSupport.java (add): Likewise. (addBeanContextMembershipListener): Likewise. (getLocale): Likewise. (initialize): Likewise. (iterator): Likewise. (remove): Likewise. (toArray): Likewise. From-SVN: r98375
Diffstat (limited to 'libjava/gnu/java')
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GdkGraphics.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java
index 7361b29..c5978ba 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java
+++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java
@@ -404,7 +404,10 @@ public class GdkGraphics extends Graphics
public Rectangle getClipBounds ()
{
- return new Rectangle (clip.x, clip.y, clip.width, clip.height);
+ if (clip == null)
+ return null;
+ else
+ return clip.getBounds();
}
public Color getColor ()
@@ -445,7 +448,8 @@ public class GdkGraphics extends Graphics
public void setClip (Shape clip)
{
- setClip (clip.getBounds ());
+ if (clip != null)
+ setClip(clip.getBounds());
}
private native void setFGColor(int red, int green, int blue);