From c81b3455112a3b09a8341fc8c45a91bd92c15a12 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 6 Jun 2011 14:37:09 +0000 Subject: Mon Jun 6 14:37:05 UTC 2011 --- extra/openjdk6/aatext_by_default.diff | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 extra/openjdk6/aatext_by_default.diff (limited to 'extra/openjdk6') diff --git a/extra/openjdk6/aatext_by_default.diff b/extra/openjdk6/aatext_by_default.diff deleted file mode 100644 index 268ea99a9..000000000 --- a/extra/openjdk6/aatext_by_default.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old 2008-01-08 20:23:56.000000000 +0200 -+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2008-02-24 12:39:19.000000000 +0200 -@@ -1875,7 +1875,6 @@ - */ - private static boolean useSystemAAFontSettings() { - if (!checkedSystemAAFontSettings) { -- useSystemAAFontSettings = true; /* initially set this true */ - String systemAAFonts = null; - Toolkit tk = Toolkit.getDefaultToolkit(); - if (tk instanceof SunToolkit) { -@@ -1883,20 +1882,10 @@ - (String)AccessController.doPrivileged( - new GetPropertyAction("awt.useSystemAAFontSettings")); - } -- if (systemAAFonts != null) { -- useSystemAAFontSettings = -- Boolean.valueOf(systemAAFonts).booleanValue(); -- /* If it is anything other than "true", then it may be -- * a hint name , or it may be "off, "default", etc. -- */ -- if (!useSystemAAFontSettings) { -- desktopFontHints = getDesktopAAHintsByName(systemAAFonts); -- } -- } -- /* If its still true, apply the extra condition */ -- if (useSystemAAFontSettings) { -- useSystemAAFontSettings = lastExtraCondition; -- } -+ if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts)) -+ systemAAFonts = "on"; -+ desktopFontHints = getDesktopAAHintsByName(systemAAFonts); -+ useSystemAAFontSettings = desktopFontHints != null; - checkedSystemAAFontSettings = true; - } - return useSystemAAFontSettings; -- cgit v1.2.3-54-g00ecf