Index: src/main/java/common/java/awt/Window.java =================================================================== --- src/main/java/common/java/awt/Window.java (revision 504675) +++ src/main/java/common/java/awt/Window.java (working copy) @@ -539,6 +539,11 @@ } else { disposed = false; } + + if (getFont() == null) { + setFont(Font.DEFAULT_FONT); + } + super.show(); toFront(); if (!opened) { Index: src/main/java/common/java/awt/Font.java =================================================================== --- src/main/java/common/java/awt/Font.java (revision 504675) +++ src/main/java/common/java/awt/Font.java (working copy) @@ -75,6 +75,8 @@ public static final int LAYOUT_NO_START_CONTEXT = 2; public static final int LAYOUT_NO_LIMIT_CONTEXT = 4; + + static final Font DEFAULT_FONT = new Font("Dialog", Font.PLAIN, 12); //$NON-NLS-1$ protected String name; @@ -353,18 +355,18 @@ // as the delimiter to avoid unexpected parse results of font face names // with spaces. + if (str == null) { + return DEFAULT_FONT; + } + StringTokenizer strTokens; String delim = "-"; //$NON-NLS-1$ String substr; - int fontSize = 12; - int fontStyle = Font.PLAIN; - String fontName = "dialog"; //$NON-NLS-1$ + int fontSize = DEFAULT_FONT.size; + int fontStyle = DEFAULT_FONT.style; + String fontName = DEFAULT_FONT.name; - if (str == null) { - return new Font(fontName, fontStyle, fontSize); - } - strTokens = new StringTokenizer(str.trim(), delim); // Font Name Index: src/main/java/common/java/awt/Button.java =================================================================== --- src/main/java/common/java/awt/Button.java (revision 504675) +++ src/main/java/common/java/awt/Button.java (working copy) @@ -186,11 +186,6 @@ } } - @Override - boolean hasDefaultFont() { - return true; - } - public String getLabel() { toolkit.lockAWT(); try { Index: src/main/java/common/java/awt/Component.java =================================================================== --- src/main/java/common/java/awt/Component.java (revision 504675) +++ src/main/java/common/java/awt/Component.java (working copy) @@ -2960,17 +2960,12 @@ public Font getFont() { toolkit.lockAWT(); try { - if (font == null && hasDefaultFont()) { - return toolkit.getDefaultFont(); - } - if (font == null && parent != null) { - return parent.getFont(); - } - return font; + return (font == null) && (parent != null) ? parent.getFont() : font; } finally { toolkit.unlockAWT(); } } + public void setFont(Font f) { Font oldFont; @@ -2992,9 +2987,6 @@ } } - boolean hasDefaultFont() { - return false; - } /** * Invalidate the component if it inherits the font from the parent. This Index: src/main/java/common/java/awt/Label.java =================================================================== --- src/main/java/common/java/awt/Label.java (revision 504675) +++ src/main/java/common/java/awt/Label.java (working copy) @@ -273,11 +273,6 @@ } @Override - boolean hasDefaultFont() { - return true; - } - - @Override AccessibleContext createAccessibleContext() { return new AccessibleAWTLabel(); }