Make Visual Test Engine work again (with jamvm)

[Mark Wielaard]

Hi,

Hopefully the last code commit before the actual 0.08 release.
But I just couldn't release without making sure that the vte worked
under jamvm. We have so much nice new AWT/GTK+ peer improvements and the
visual test engine is really the thing to try them out. With the hacks
below it work now. I don't think these patches are really very good.
They actually work around the real reason something goes wrong. But it
is good to have more robust code.

2004-03-12  Mark Wielaard  <address@hidden>

       * gnu/java/awt/peer/gtk/GtkFontPeer.java: Use fallback when
       MissingResourceException is thrown.

       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
       (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth):
       Don't access ws when it is null.
       (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight):
       Likewise.

AWT hackers, feel free to completely redesign/remove these patches.
After 0.08 is released.

Cheers,

Mark

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c 13 Jan 2004 
22:37:28 -0000      1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c 13 Mar 2004 
00:28:18 -0000
@@ -188,9 +188,12 @@
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
 
-  gtk_widget_size_request (sw->hscrollbar, &requisition);
-  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
-  height = requisition.height + spacing;
+  if (sw)
+    {
+      gtk_widget_size_request (sw->hscrollbar, &requisition);
+      gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, 
NULL);
+      height = requisition.height + spacing;
+    }
 
   gdk_threads_leave ();
 
@@ -212,9 +215,12 @@
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
 
-  gtk_widget_size_request (sw->vscrollbar, &requisition);
-  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
-  width = requisition.width + spacing;
+  if (sw)
+    {
+      gtk_widget_size_request (sw->vscrollbar, &requisition);
+      gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, 
NULL);
+      width = requisition.width + spacing;
+    }
 
   gdk_threads_leave ();
 
Index: gnu/java/awt/peer/gtk/GtkFontPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFontPeer.java,v
retrieving revision 1.7
diff -u -r1.7 GtkFontPeer.java
--- gnu/java/awt/peer/gtk/GtkFontPeer.java      7 Jan 2004 02:23:37 -0000       
1.7
+++ gnu/java/awt/peer/gtk/GtkFontPeer.java      13 Mar 2004 00:28:18 -0000
@@ -43,6 +43,7 @@
 import java.awt.font.*;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.MissingResourceException;
 import java.text.*;
 import gnu.java.awt.peer.ClasspathFontPeer;
 
@@ -68,9 +69,20 @@
   {
     super(name, style, 12 /* kludge */);
 
+    String Xname = null;
     if (bundle != null)
-      Xname = bundle.getString (name.toLowerCase () + "." + style);
-    else
+      {
+       try
+         {
+           Xname = bundle.getString (name.toLowerCase () + "." + style);
+         }
+       catch (MissingResourceException mre)
+         {
+           // ignored
+         }
+      }
+
+    if (Xname == null)
       {
        String weight;
        String slant;
@@ -92,6 +104,8 @@
 
         Xname = "-*-*-" + weight + "-" + slant + "-normal-*-%d-*-*-*-" + 
spacing + "-*-*-*";
       }
+
+    this.Xname = Xname;
   }
 
   public String getXLFD ()

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