changeset 7839:81f8878be887

Merge
author asaha
date Mon, 10 Nov 2014 11:49:11 -0800
parents c3399fab85b5 92c585d80cd4
children c4a1bb40daa3
files .hgtags
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Sep 29 17:36:58 2014 +0100
+++ b/.hgtags	Mon Nov 10 11:49:11 2014 -0800
@@ -519,6 +519,7 @@
 ec3e1e179298a41bc6b77a170e2da66efb0bae3b jdk7u75-b05
 e9596c6470c944ff19c5198cfeb7fd979aad9120 jdk7u75-b06
 e0afb6ec0633d18f360f074c5672fa4c2196ea39 jdk7u75-b07
+8268d82995af433655d3db9a51b549032c19537d jdk7u75-b08
 0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
 182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
 3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
--- a/src/share/classes/sun/awt/SunToolkit.java	Mon Sep 29 17:36:58 2014 +0100
+++ b/src/share/classes/sun/awt/SunToolkit.java	Mon Nov 10 11:49:11 2014 -0800
@@ -378,7 +378,7 @@
      * null or the target can't be found, a null with be returned.
      */
     public static AppContext targetToAppContext(Object target) {
-        if (target == null || GraphicsEnvironment.isHeadless()) {
+        if (target == null) {
             return null;
         }
         AppContext context = getAppContext(target);
@@ -452,12 +452,10 @@
      * via targetToAppContext() above.
      */
     public static void insertTargetMapping(Object target, AppContext appContext) {
-        if (!GraphicsEnvironment.isHeadless()) {
-            if (!setAppContext(target, appContext)) {
-                // Target is not a Component/MenuComponent, use the private Map
-                // instead.
-                appContextMap.put(target, appContext);
-            }
+        if (!setAppContext(target, appContext)) {
+            // Target is not a Component/MenuComponent, use the private Map
+            // instead.
+            appContextMap.put(target, appContext);
         }
     }