* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80888
138bc75d-0d04-0410-961f-
82ee72b054a4
+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,
2004-04-20 Sascha Brawer <brawer@dandelis.ch>
* java/awt/image/DataBufferShort.java,
import java.awt.font.*;
import java.util.Locale;
import java.util.ResourceBundle;
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;
import java.text.*;
import gnu.java.awt.peer.ClasspathFontPeer;
{
super(name, style, size);
{
super(name, style, size);
- 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;
{
String weight;
String slant;
Xname = "-*-*-" + weight + "-" + slant + "-normal-*-*-" + size + "-*-*-" + spacing + "-*-*-*";
}
Xname = "-*-*-" + weight + "-" + slant + "-normal-*-*-" + size + "-*-*-" + spacing + "-*-*-*";
}
}
public String getXLFD ()
}
public String getXLFD ()
*/
private FontPeer getFontPeer (String name, int style, int size)
{
*/
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;