Mercurial > hg > openjdk > bsd-port > jdk
changeset 6722:070b277e1b43 jdk7u40-b38
Merge
author | lana |
---|---|
date | Tue, 06 Aug 2013 15:39:36 -0700 |
parents | cf8cdc0fa8b8 (current diff) 9f6cbd5a5c62 (diff) |
children | 67e30ddcc6b3 81ea60e97a31 |
files | |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/awt/AppContext.java Fri Aug 02 13:11:02 2013 -0700 +++ b/src/share/classes/sun/awt/AppContext.java Tue Aug 06 15:39:36 2013 -0700 @@ -309,11 +309,13 @@ // and excludes applets because by the time applet starts // a number of contexts have already been created by the plugin. if (numAppContexts.get() == 0) { - // This check is not necessary, its purpose is to help - // Plugin devs to catch all the cases of main AC creation. if (System.getProperty("javaplugin.version") == null && System.getProperty("javawebstart.version") == null) { initMainAppContext(); + } else if (System.getProperty("javafx.version") != null && + threadGroup.getParent() != null) { + // Swing inside JavaFX case + SunToolkit.createNewAppContext(); } }