diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-27 12:10:12 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-27 12:10:12 +0000 |
| commit | 8174c934f12831af1a7c76a2496dafc9a9a1e94f (patch) | |
| tree | 612d1c3cc6ca3d5f78695a352f7e7dd6e1cb5329 | |
| parent | 9fbbe6173c58a4140ea875e343181d6e9427efd1 (diff) | |
| download | gcc-8174c934f12831af1a7c76a2496dafc9a9a1e94f.tar.gz | |
2004-06-27 Mark Wielaard <mark@klomp.org>
* java/awt/EventQueue.java (postEvent): Throw NullPointerException
when argument is null.
2004-06-26 Mark Wielaard <mark@klomp.org>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83731 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/java/awt/EventQueue.java | 3 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/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 <mark@klomp.org> + + * java/awt/EventQueue.java (postEvent): Throw NullPointerException + when argument is null. + +2004-06-26 Mark Wielaard <mark@klomp.org> + + * 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 <a.tobler@schweiz.ch> * 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; } |