stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6943487: NPE in makeMultiCharsetString while printing on linux

Browse Source 
Reviewed-by: igor, jgodinez
This commit is contained in:
Phil Race 2010-06-29 09:48:15 -07:00
parent ee0a2ddfe6
commit 93f31249a1
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/share/classes/sun/awt/PlatformFont.java
View File

@ -25,10 +25,10 @@
package sun.awt;
import java.awt.GraphicsEnvironment;
import java.awt.peer.FontPeer;
import java.util.Locale;
import java.util.Vector;
import sun.font.SunFontManager;
import sun.java2d.FontSupport;
import java.nio.CharBuffer;
import java.nio.ByteBuffer;
@ -57,9 +57,9 @@ public abstract class PlatformFont implements FontPeer {
protected static String osVersion;
public PlatformFont(String name, int style){
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
if (ge instanceof FontSupport) {
fontConfig = ((FontSupport)ge).getFontConfiguration();
SunFontManager sfm = SunFontManager.getInstance();
if (sfm instanceof FontSupport) {
fontConfig = ((FontSupport)sfm).getFontConfiguration();
}
if (fontConfig == null) {
return;

14
jdk/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java
View File

@ -59,17 +59,12 @@ import java.awt.Rectangle;
* Headless decorator implementation of a SunGraphicsEnvironment
*/
public class HeadlessGraphicsEnvironment extends GraphicsEnvironment
implements FontSupport {
public class HeadlessGraphicsEnvironment extends GraphicsEnvironment {
private GraphicsEnvironment ge;
private FontSupport fontSupport;
public HeadlessGraphicsEnvironment(GraphicsEnvironment ge) {
this.ge = ge;
if (ge instanceof FontSupport) {
fontSupport = (FontSupport)ge;
}
}
public GraphicsDevice[] getScreenDevices()
@ -101,13 +96,6 @@ public class HeadlessGraphicsEnvironment extends GraphicsEnvironment
public String[] getAvailableFontFamilyNames(Locale l) {
return ge.getAvailableFontFamilyNames(l); }
public FontConfiguration getFontConfiguration() {
if (fontSupport != null) {
return fontSupport.getFontConfiguration();
}
return null;
}
/* Used by FontManager : internal API */
public GraphicsEnvironment getSunGraphicsEnvironment() {
return ge;