Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
24e587db
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24e587db
编写于
11月 27, 2014
作者:
A
alexsch
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8065098: JColorChooser no longer supports drag and drop between two JVM instances
Reviewed-by: serb, pchelko
上级
95184625
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
137 addition
and
7 deletion
+137
-7
src/share/classes/sun/awt/datatransfer/DataTransferer.java
src/share/classes/sun/awt/datatransfer/DataTransferer.java
+9
-0
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
+0
-7
test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java
...vax/swing/JColorChooser/8065098/JColorChooserDnDTest.java
+54
-0
test/javax/swing/JColorChooser/8065098/bug8065098.html
test/javax/swing/JColorChooser/8065098/bug8065098.html
+40
-0
test/javax/swing/JColorChooser/8065098/bug8065098.java
test/javax/swing/JColorChooser/8065098/bug8065098.java
+34
-0
未找到文件。
src/share/classes/sun/awt/datatransfer/DataTransferer.java
浏览文件 @
24e587db
...
...
@@ -1295,6 +1295,15 @@ search:
// 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
];
}
try
(
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
())
{
try
(
InputStream
is
=
(
InputStream
)
obj
)
{
boolean
eof
=
false
;
...
...
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
浏览文件 @
24e587db
...
...
@@ -239,13 +239,6 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer,
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
)
{
...
...
test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java
0 → 100644
浏览文件 @
24e587db
/*
* 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
);
}
});
}
}
test/javax/swing/JColorChooser/8065098/bug8065098.html
0 → 100644
浏览文件 @
24e587db
<!--
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.
-->
<html>
<body>
1. Compile the java test JColorChooserDnDTest.java:
>
<path-to-the-tested-jdk>
/bin/javac JColorChooserDnDTest.java
2. Run the first instance of the java test:
>
<path-to-the-tested-jdk>
/bin/java JColorChooserDnDTest
3. Select a color in the color chooser
4. Run the second instance of the java test:
>
<path-to-the-tested-jdk>
/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.
<applet
width=
"500"
height=
"1"
code=
"bug8065098.class"
>
</applet>
</body>
</html>
\ No newline at end of file
test/javax/swing/JColorChooser/8065098/bug8065098.java
0 → 100644
浏览文件 @
24e587db
/*
* 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
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录