changeset 10373:0d6cc86942f8

Merge
author asaha
date Tue, 02 Sep 2014 13:07:31 -0700
parents fc4646e5a11f c28674454d48
children 7e529f35f9f4
files .hgtags
diffstat 5 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Aug 29 20:16:35 2014 -0700
+++ b/.hgtags	Tue Sep 02 13:07:31 2014 -0700
@@ -327,4 +327,5 @@
 eaaa9a04b9fdcfa4a830b811ed209eb2c45a4a6b jdk8u25-b12
 c3a855402b923d3ba819b05292a971953fc8ed0b jdk8u25-b13
 2a6df63ca0f0f59bb730638b05c72d77a23f93c8 jdk8u25-b14
+412d9ade90401d098f3662bd688ab393008423bd jdk8u25-b15
 f935349e2c065487c745bc41f81ddc7869bd2d2d jdk8u31-b00
--- a/src/share/classes/sun/awt/ComponentFactory.java	Fri Aug 29 20:16:35 2014 -0700
+++ b/src/share/classes/sun/awt/ComponentFactory.java	Tue Sep 02 13:07:31 2014 -0700
@@ -25,6 +25,8 @@
 
 package sun.awt;
 
+import sun.awt.datatransfer.DataTransferer;
+
 import java.awt.*;
 import java.awt.dnd.*;
 import java.awt.dnd.peer.DragSourceContextPeer;
@@ -93,4 +95,6 @@
     RobotPeer createRobot(Robot target, GraphicsDevice screen)
         throws AWTException, HeadlessException;
 
+    DataTransferer getDataTransferer();
+
 }
--- a/src/share/classes/sun/awt/HeadlessToolkit.java	Fri Aug 29 20:16:35 2014 -0700
+++ b/src/share/classes/sun/awt/HeadlessToolkit.java	Tue Sep 02 13:07:31 2014 -0700
@@ -25,6 +25,8 @@
 
 package sun.awt;
 
+import sun.awt.datatransfer.DataTransferer;
+
 import java.awt.*;
 import java.awt.dnd.*;
 import java.awt.dnd.peer.DragSourceContextPeer;
@@ -401,6 +403,11 @@
         return null;
     }
 
+    @Override
+    public DataTransferer getDataTransferer() {
+        return null;
+    }
+
     @SuppressWarnings("deprecation")
     public FontMetrics getFontMetrics(Font font) {
         return tk.getFontMetrics(font);
--- a/src/share/classes/sun/awt/SunToolkit.java	Fri Aug 29 20:16:35 2014 -0700
+++ b/src/share/classes/sun/awt/SunToolkit.java	Tue Sep 02 13:07:31 2014 -0700
@@ -205,8 +205,6 @@
 
     public abstract boolean isTraySupported();
 
-    public abstract DataTransferer getDataTransferer();
-
     @SuppressWarnings("deprecation")
     public abstract FontPeer getFontPeer(String name, int style);
 
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java	Fri Aug 29 20:16:35 2014 -0700
+++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java	Tue Sep 02 13:07:31 2014 -0700
@@ -86,6 +86,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import sun.awt.ComponentFactory;
 import sun.util.logging.PlatformLogger;
 
 import sun.awt.AppContext;
@@ -272,7 +273,7 @@
      * instead, null will be returned.
      */
     public static synchronized DataTransferer getInstance() {
-        return ((SunToolkit) Toolkit.getDefaultToolkit()).getDataTransferer();
+        return ((ComponentFactory) Toolkit.getDefaultToolkit()).getDataTransferer();
     }
 
     /**