aboutsummaryrefslogtreecommitdiff
path: root/libjava/gnu/java
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@redhat.com>2003-12-01 15:28:22 +0000
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>2003-12-01 15:28:22 +0000
commitec22cdf1405e694fb9b1c9557e6ef20baa7f7e01 (patch)
tree53e474c9d243bac09d5515a8964831099978c9dc /libjava/gnu/java
parenta1ff4c64785af6d603ed708841fdda887771e727 (diff)
downloadgcc-ec22cdf1405e694fb9b1c9557e6ef20baa7f7e01.zip
gcc-ec22cdf1405e694fb9b1c9557e6ef20baa7f7e01.tar.gz
gcc-ec22cdf1405e694fb9b1c9557e6ef20baa7f7e01.tar.bz2
GtkImage.java (setDimensions, [...]): Check that io is not null before calling io.imageUpdate.
2003-12-01 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkImage.java (setDimensions, setProperties): Check that io is not null before calling io.imageUpdate. * java/awt/image/ImageConsumer.java (setPixels, imageComplete): Update javadocs. * java/awt/image/PixelGrabber.java: Fix implementation and update javadocs. From-SVN: r74103
Diffstat (limited to 'libjava/gnu/java')
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkImage.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImage.java b/libjava/gnu/java/awt/peer/gtk/GtkImage.java
index 5f8d223..fa81b91 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkImage.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkImage.java
@@ -1,5 +1,5 @@
/* GtkImage.java
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -168,13 +168,15 @@ public class GtkImage extends Image implements ImageConsumer
for (int i = 0; i < widthObservers.size (); i++)
{
ImageObserver io = (ImageObserver) widthObservers.elementAt (i);
- io.imageUpdate (this, ImageObserver.WIDTH, -1, -1, width, height);
+ if (io != null)
+ io.imageUpdate (this, ImageObserver.WIDTH, -1, -1, width, height);
}
for (int i = 0; i < heightObservers.size (); i++)
{
ImageObserver io = (ImageObserver) heightObservers.elementAt (i);
- io.imageUpdate (this, ImageObserver.HEIGHT, -1, -1, width, height);
+ if (io != null)
+ io.imageUpdate (this, ImageObserver.HEIGHT, -1, -1, width, height);
}
if (observer != null)
@@ -192,7 +194,8 @@ public class GtkImage extends Image implements ImageConsumer
for (int i = 0; i < propertyObservers.size (); i++)
{
ImageObserver io = (ImageObserver) propertyObservers.elementAt (i);
- io.imageUpdate (this, ImageObserver.PROPERTIES, -1, -1, width, height);
+ if (io != null)
+ io.imageUpdate (this, ImageObserver.PROPERTIES, -1, -1, width, height);
}
}