GtkFontPeer.java: Use fallback when MissingResourceException is thrown.

2004-04-20  Mark Wielaard  <mark@klomp.org>

	* gnu/java/awt/peer/gtk/GtkFontPeer.java: Use fallback when
	MissingResourceException is thrown.
	* gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return
	null when a MissingResourceException is thrown. Should never happen.

From-SVN: r80888

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a30122fc17e76b78fc9ce85ec3304702766f76f5..7e4f4c15846c19e487c0db5cbe45844d2cbe74d2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-20  Mark Wielaard  <mark@klomp.org>
+
+       * gnu/java/awt/peer/gtk/GtkFontPeer.java: Use fallback when
+       MissingResourceException is thrown.
+       * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return
+       null when a MissingResourceException is thrown. Should never happen.
+
 2004-04-20  Sascha Brawer  <brawer@dandelis.ch>
 
        * java/awt/image/DataBufferShort.java,

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
index 1ab7bc13420bee01c41c038c8241ad27d46a65e3..5de3301270dce4e8a1306a5bd4860f6d02e3ae34 100644 (file)
--- a/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
@@ -43,6 +43,7 @@ import java.awt.geom.*;
 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;
 
@@ -74,9 +75,20 @@ public class GtkFontPeer extends ClasspathFontPeer
   {
     super(name, style, size);
 
+    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;
@@ -98,6 +110,8 @@ public class GtkFontPeer extends ClasspathFontPeer
 
         Xname = "-*-*-" + weight + "-" + slant + "-normal-*-*-" + size + "-*-*-" + spacing + "-*-*-*";
       }
+
+    this.Xname = Xname;
   }
 
   public String getXLFD ()

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java
index 1d961f2d5b79badfb0978b745801c24eb01dbc6a..ed1c567624bf20dbf195053ff92caf3980e5509f 100644 (file)
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -377,12 +377,8 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
    */
   private FontPeer getFontPeer (String name, int style, int size) 
   {
-    try {
-      GtkFontPeer fp = new GtkFontPeer (name, style, size);
-      return fp;
-    } catch (MissingResourceException ex) {
-      return null;
-    }
+    GtkFontPeer fp = new GtkFontPeer (name, style, size);
+    return fp;
   }
 
   /**