OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GtkFontPeer.java: Use fallback when MissingResourceException is thrown.

Browse Source 
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
This commit is contained in:
Mark Wielaard 2004-04-20 09:46:28 +00:00 committed by Michael Koch
parent a7b1dc36da
commit 7f6f517f8a
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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,

18
libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
View File

@ -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 ()

8
libjava/gnu/java/awt/peer/gtk/GtkToolkit.java
View File

@ -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;
}
/**