8169339: Provide internal API to JavaFX to locate JDK fonts
Reviewed-by: serb, kcr
--- a/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java Wed Nov 09 10:04:43 2016 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java Wed Nov 09 10:26:29 2016 -0800
@@ -362,6 +362,14 @@
});
}
+ /**
+ * If the module image layout changes the location of JDK fonts,
+ * this will be updated to reflect that.
+ */
+ public static final String getJDKFontDir() {
+ return jreFontDirName;
+ }
+
public TrueTypeFont getEUDCFont() {
// Overridden in Windows.
return null;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/font/lookup/JDKFontLookup.java Wed Nov 09 10:26:29 2016 -0800
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.font.lookup;
+
+import sun.font.SunFontManager;
+
+/**
+ * Implementation-class accessed by other JDK modules to
+ * locate the JDK-provided fonts.
+ */
+public final class JDKFontLookup {
+
+ public final static String getJDKFontDir() {
+ return SunFontManager.getJDKFontDir();
+ }
+}