From 66a74d2a079df4c1945926eda5d482e88214a101 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 27 Jun 2004 12:10:12 +0000 Subject: [PATCH] [multiple changes] 2004-06-27 Mark Wielaard * java/awt/EventQueue.java (postEvent): Throw NullPointerException when argument is null. 2004-06-26 Mark Wielaard * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (ok_clicked): Use Ljava/lang/String; not Ljava.lang.String; in JNI GetMethodID call. (cancel_clicked): Likewise. From-SVN: r83731 --- libjava/ChangeLog | 12 ++++++++++++ libjava/java/awt/EventQueue.java | 3 +++ .../gnu_java_awt_peer_gtk_GtkFileDialogPeer.c | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cf9ae71ee3e..71ab0bfc1af 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2004-06-27 Mark Wielaard + + * java/awt/EventQueue.java (postEvent): Throw NullPointerException + when argument is null. + +2004-06-26 Mark Wielaard + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c + (ok_clicked): Use Ljava/lang/String; not Ljava.lang.String; in JNI + GetMethodID call. + (cancel_clicked): Likewise. + 2004-06-26 Andreas Tobler * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c diff --git a/libjava/java/awt/EventQueue.java b/libjava/java/awt/EventQueue.java index 5cdfa634265..1c794d43870 100644 --- a/libjava/java/awt/EventQueue.java +++ b/libjava/java/awt/EventQueue.java @@ -161,6 +161,9 @@ public class EventQueue */ public synchronized void postEvent(AWTEvent evt) { + if (evt == null) + throw new NullPointerException(); + if (next != null) { next.postEvent(evt); diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c index 92e2de33205..add9ef558ca 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c @@ -198,7 +198,7 @@ ok_clicked (GtkButton *button __attribute__((unused)), jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj); hideID = (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", "()V"); gtkSetFilenameID = (*gdk_env)->GetMethodID (gdk_env, cx, - "gtkSetFilename", "(Ljava.lang.String;)V"); + "gtkSetFilename", "(Ljava/lang/String;)V"); isIDSet = 1; } @@ -230,7 +230,7 @@ cancel_clicked (GtkButton *button __attribute__((unused)), jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj); hideID = (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", "()V"); gtkSetFilenameID = (*gdk_env)->GetMethodID (gdk_env, cx, - "gtkSetFilename", "(Ljava.lang.String;)V"); + "gtkSetFilename", "(Ljava/lang/String;)V"); isIDSet = 1; } -- 2.30.2