Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7159136: JDK 7 font manager refactoring left JNI header generation and inclusion out of sync
authorprr
Thu, 05 Apr 2012 15:17:19 -0700
changeset 12392 af6c2083c5d7
parent 12391 dd686d9acbf2
child 12393 c88c137e54fc
7159136: JDK 7 font manager refactoring left JNI header generation and inclusion out of sync Reviewed-by: igor, jgodinez
jdk/make/sun/font/Makefile file | annotate | diff | comparison | revisions
jdk/make/sun/font/t2k/Makefile file | annotate | diff | comparison | revisions
jdk/src/share/native/sun/font/sunFont.c file | annotate | diff | comparison | revisions 
--- a/jdk/make/sun/font/Makefile	Thu Apr 05 15:14:06 2012 -0700
+++ b/jdk/make/sun/font/Makefile	Thu Apr 05 15:17:19 2012 -0700
@@ -62,7 +62,7 @@
     java/text/Bidi.java \
     sun/font/FileFont.java \
     sun/font/FileFontStrike.java \
-    sun/font/FontManager.java \
+    sun/font/SunFontManager.java \
     sun/font/GlyphList.java \
     sun/font/NativeFont.java \
     sun/font/StrikeCache.java \
--- a/jdk/make/sun/font/t2k/Makefile	Thu Apr 05 15:14:06 2012 -0700
+++ b/jdk/make/sun/font/t2k/Makefile	Thu Apr 05 15:17:19 2012 -0700
@@ -52,7 +52,6 @@
 FILES_export = \
     java/awt/Font.java \
     sun/font/FileFont.java \
-    sun/font/FontManager.java \
     sun/font/GlyphList.java \
     sun/font/NativeFont.java \
     sun/font/StrikeCache.java \
--- a/jdk/src/share/native/sun/font/sunFont.c	Thu Apr 05 15:14:06 2012 -0700
+++ b/jdk/src/share/native/sun/font/sunFont.c	Thu Apr 05 15:17:19 2012 -0700
@@ -29,7 +29,7 @@
 #include "jlong.h"
 #include "sunfontids.h"
 #include "fontscalerdefs.h"
-#include "sun_font_FontManager.h"
+#include "sun_font_SunFontManager.h"
 #include "sun_font_NullFontScaler.h"
 #include "sun_font_StrikeCache.h"
jdk-sandbox