FYI: Two gui fixlets from classpath

[Mark Wielaard <mark at klomp dot org>]

Hi,

After merging and testing the latest gui drop I made these two patches
for GNU Classpath.

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.

They also work correctly with gcj/gij so I checked them in on mainline.
It might be a good idea to put them on the gui branch also, but I don't
have a working copy of that.

Cheers,

Mark

Index: java/awt/EventQueue.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/EventQueue.java,v
retrieving revision 1.17
diff -u -r1.17 EventQueue.java
--- java/awt/EventQueue.java	19 Jan 2004 18:22:29 -0000	1.17
+++ java/awt/EventQueue.java	27 Jun 2004 12:06:21 -0000
@@ -161,6 +161,9 @@
    */
   public synchronized void postEvent(AWTEvent evt)
   {
+    if (evt == null)
+      throw new NullPointerException();
+
     if (next != null)
       {
         next.postEvent(evt);
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c	21 Apr 2004 06:52:26 -0000	1.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c	27 Jun 2004 12:06:21 -0000
@@ -198,7 +198,7 @@
       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 @@
       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;
     }

Attachment: signature.asc
Description: This is a digitally signed message part