changeset 3963:e4090d232e69

7034231: Default font appears twice in fallback font list Reviewed-by: okutsu, prr
author peytoia
date Tue, 12 Apr 2011 18:58:30 +0900
parents e392becfd94f
children b83978b25d1d
files src/windows/classes/sun/awt/Win32FontManager.java src/windows/classes/sun/awt/Win32GraphicsEnvironment.java
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/Win32FontManager.java	Tue Apr 12 16:16:41 2011 +0900
+++ b/src/windows/classes/sun/awt/Win32FontManager.java	Tue Apr 12 18:58:30 2011 +0900
@@ -100,6 +100,14 @@
             });
     }
 
+    /**
+     * Whether registerFontFile expects absolute or relative
+     * font file names.
+     */
+    protected boolean useAbsoluteFontFileNames() {
+        return false;
+    }
+
     /* Unlike the shared code version, this expects a base file name -
      * not a full path name.
      * The font configuration file has base file names and the FontConfiguration
--- a/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	Tue Apr 12 16:16:41 2011 +0900
+++ b/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	Tue Apr 12 18:58:30 2011 +0900
@@ -212,14 +212,6 @@
  * ----END DISPLAY CHANGE SUPPORT----
  */
 
-    /**
-     * Whether registerFontFile expects absolute or relative
-     * font file names.
-     */
-    protected boolean useAbsoluteFontFileNames() {
-        return false;
-    }
-
     protected GraphicsDevice makeScreenDevice(int screennum) {
         GraphicsDevice device = null;
         if (WindowsFlags.isD3DEnabled()) {