Mercurial > hg > icedtea9-forest > jdk
changeset 5827:b1c5e4a843f3
7181027: [macosx] Unable to use headless mode
Reviewed-by: anthony
author | leonidr |
---|---|
date | Thu, 19 Jul 2012 19:41:59 +0400 |
parents | 28665fa73b4a |
children | f04d8dee2da9 |
files | src/share/classes/java/awt/GraphicsEnvironment.java src/solaris/native/java/lang/java_props_md.c |
diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/awt/GraphicsEnvironment.java Thu Jul 19 19:09:30 2012 +0400 +++ b/src/share/classes/java/awt/GraphicsEnvironment.java Thu Jul 19 19:41:59 2012 +0400 @@ -170,12 +170,12 @@ if (System.getProperty("javaplugin.version") != null) { headless = defaultHeadless = Boolean.FALSE; } else { - if ("sun.awt.HeadlessGraphicsEnvironment".equals( - System.getProperty("java.awt.graphicsenv"))) + String osName = System.getProperty("os.name"); + if (osName.contains("OS X") && "sun.awt.HToolkit".equals( + System.getProperty("awt.toolkit"))) { headless = defaultHeadless = Boolean.TRUE; } else { - String osName = System.getProperty("os.name"); headless = defaultHeadless = Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName) ||
--- a/src/solaris/native/java/lang/java_props_md.c Thu Jul 19 19:09:30 2012 +0400 +++ b/src/solaris/native/java/lang/java_props_md.c Thu Jul 19 19:41:59 2012 +0400 @@ -398,6 +398,7 @@ PreferredToolkit prefToolkit = getPreferredToolkit(); switch (prefToolkit) { case CToolkit: + case HToolkit: sprops.graphics_env = "sun.awt.CGraphicsEnvironment"; break; case XToolkit: @@ -405,9 +406,6 @@ sprops.graphics_env = "sun.awt.X11GraphicsEnvironment"; #ifdef MACOSX break; - default: - sprops.graphics_env = "sun.java2d.HeadlessGraphicsEnvironment"; - break; } #endif /* AWT properties */