From 2860518a07933c067e9970b509109e49833da80d Mon Sep 17 00:00:00 2001 From: Tom Fitzsimmons Date: Wed, 12 Nov 2003 22:03:49 +0000 Subject: [PATCH] GtkComponentPeer.java (prepareImage): Remove null check. 2003-11-12 Tom Fitzsimmons * gnu/java/awt/peer/gtk/GtkComponentPeer.java (prepareImage): Remove null check. * gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Likewise. * java/awt/Component.java (prepareImage): Likewise. From-SVN: r73513 --- libjava/ChangeLog | 5 +++++ libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java | 3 --- libjava/gnu/java/awt/peer/gtk/GtkToolkit.java | 3 --- libjava/java/awt/Component.java | 3 --- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bf70fb42a21..928beeee92d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2003-11-12 Tom Fitzsimmons + * gnu/java/awt/peer/gtk/GtkComponentPeer.java (prepareImage): Remove + null check. + * gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Likewise. + * java/awt/Component.java (prepareImage): Likewise. + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (setAlignment): Rename to nativeSetAlignment. diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index f4c143b0dfc..80feebdcabb 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -230,9 +230,6 @@ public class GtkComponentPeer extends GtkGenericPeer public boolean prepareImage (Image image, int width, int height, ImageObserver observer) { - if (image == null) - throw new NullPointerException (); - GtkImage i = (GtkImage) image; if (i.isLoaded ()) return true; diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java index 7f8ae2ecd03..0a09f1f1970 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -169,9 +169,6 @@ public class GtkToolkit extends Toolkit public boolean prepareImage (Image image, int width, int height, ImageObserver observer) { - if (image == null) - throw new NullPointerException (); - GtkImage i = (GtkImage) image; if (i.isLoaded ()) return true; diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java index 74b4daed2a0..9c93bd0a527 100644 --- a/libjava/java/awt/Component.java +++ b/libjava/java/awt/Component.java @@ -1962,9 +1962,6 @@ public abstract class Component */ public boolean prepareImage(Image image, ImageObserver observer) { - if (image == null) - throw new NullPointerException (); - return prepareImage(image, image.getWidth(observer), image.getHeight(observer), observer); } -- 2.30.2