# HG changeset patch # User aivanov # Date 1418120722 -10800 # Node ID 32a468bf8a27f13efa8a865d368275945aa32af2 # Parent 00550890d328bc22b35c0d8921f5b16394af5b07 8065098: JColorChooser no longer supports drag and drop between two JVM instances Reviewed-by: serb, alexsch diff -r 00550890d328 -r 32a468bf8a27 src/share/classes/sun/awt/datatransfer/DataTransferer.java --- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java Thu Dec 04 10:12:35 2014 +0000 +++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Dec 09 13:25:22 2014 +0300 @@ -1365,6 +1365,15 @@ // bytes and dump them into a byte array. For text flavors, decode back // to a String and recur to reencode according to the requested format. } else if (flavor.isRepresentationClassInputStream()) { + + // Workaround to JDK-8024061: Exception thrown when drag and drop + // between two components is executed quickly. + // and JDK-8065098: JColorChooser no longer supports drag and drop + // between two JVM instances + if (!(obj instanceof InputStream)) { + return new byte[0]; + } + InputStream is = (InputStream)obj; boolean eof = false; int avail = is.available(); diff -r 00550890d328 -r 32a468bf8a27 src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java --- a/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Thu Dec 04 10:12:35 2014 +0000 +++ b/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Tue Dec 09 13:25:22 2014 +0300 @@ -239,13 +239,6 @@ if (localTransferable != null) { return localTransferable.getTransferData(df); - } else if (df.isMimeTypeEqual(DataFlavor.javaJVMLocalObjectMimeType)) { - // Workaround to JDK-8024061: Exception thrown when drag and drop - // between two components is executed quickly. - // It is expected localTransferable is not null if javaJVMLocalObjectMimeType - // is used. Executing further results in ClassCastException, so null is - // returned here as no transfer data is available in this case. - return null; } if (dropStatus != STATUS_ACCEPT || dropComplete) { diff -r 00550890d328 -r 32a468bf8a27 test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java Tue Dec 09 13:25:22 2014 +0300 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import javax.swing.BorderFactory; +import javax.swing.JColorChooser; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; + +/* + * @bug 8065098 + * @summary JColorChooser no longer supports drag and drop + * between two JVM instances + */ +public class JColorChooserDnDTest { + + public static void main(String[] args) { + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + JFrame frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + JPanel panel = new JPanel(); + JColorChooser colorChooser = new JColorChooser(); + colorChooser.setDragEnabled(true); + panel.setBorder(BorderFactory.createTitledBorder("JColorChoosers")); + panel.add(colorChooser); + frame.setContentPane(panel); + frame.pack(); + frame.setVisible(true); + } + }); + } +} diff -r 00550890d328 -r 32a468bf8a27 test/javax/swing/JColorChooser/8065098/bug8065098.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JColorChooser/8065098/bug8065098.html Tue Dec 09 13:25:22 2014 +0300 @@ -0,0 +1,40 @@ + + + + + 1. Compile the java test JColorChooserDnDTest.java: + > /bin/javac JColorChooserDnDTest.java + 2. Run the first instance of the java test: + > /bin/java JColorChooserDnDTest + 3. Select a color in the color chooser + 4. Run the second instance of the java test: + > /bin/java JColorChooserDnDTest + 5. Drag and drop the selected color from the first color chooser + preview panel to the second color chooser preview panel + 6. If the color is dragged to the second color chooser then the test passes. + + + + + \ No newline at end of file diff -r 00550890d328 -r 32a468bf8a27 test/javax/swing/JColorChooser/8065098/bug8065098.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JColorChooser/8065098/bug8065098.java Tue Dec 09 13:25:22 2014 +0300 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import javax.swing.JApplet; + +/* + * @test + * @bug 8065098 + * @summary JColorChooser no longer supports drag and drop + * between two JVM instances + * @run applet/manual=yesno bug8065098.html + */ +public class bug8065098 extends JApplet { + +}