Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
e506f19d
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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,发现更多精彩内容 >>
提交
e506f19d
编写于
10月 29, 2013
作者:
B
bagiras
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8027151: AWT_DnD/Basic_DnD/Automated/DnDMerlinQL/MultipleJVM failing on windows machine
Reviewed-by: anthony, pchelko
上级
54c17d29
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
6 deletion
+11
-6
src/share/classes/sun/awt/datatransfer/DataTransferer.java
src/share/classes/sun/awt/datatransfer/DataTransferer.java
+9
-1
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
+2
-5
未找到文件。
src/share/classes/sun/awt/datatransfer/DataTransferer.java
浏览文件 @
e506f19d
/*
* Copyright (c) 2000, 20
08
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 20
13
, 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
...
...
@@ -1740,6 +1740,14 @@ search:
}
theObject
=
files
;
// Target data is a String. Strip terminating NUL bytes. Decode bytes
// into characters. Search-and-replace EOLN.
}
else
if
(
String
.
class
.
equals
(
flavor
.
getRepresentationClass
())
&&
isFlavorCharsetTextType
(
flavor
)
&&
isTextFormat
(
format
))
{
return
translateBytesToString
(
inputStreamToByteArray
(
str
),
format
,
localeTransferable
);
// Special hack to maintain backwards-compatibility with the brokenness
// of StringSelection. Return a StringReader instead of an InputStream.
// Recur to obtain String and encapsulate.
...
...
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
浏览文件 @
e506f19d
/*
* Copyright (c) 2000, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 201
3
, 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
...
...
@@ -271,14 +271,11 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer,
throw
new
InvalidDnDOperationException
(
e
.
getMessage
());
}
}
else
if
(
ret
instanceof
InputStream
)
{
InputStream
inputStream
=
(
InputStream
)
ret
;
try
{
return
DataTransferer
.
getInstance
().
translateStream
(
inputStream
,
df
,
format
,
this
);
translateStream
(
(
InputStream
)
ret
,
df
,
format
,
this
);
}
catch
(
IOException
e
)
{
throw
new
InvalidDnDOperationException
(
e
.
getMessage
());
}
finally
{
inputStream
.
close
();
}
}
else
{
throw
new
IOException
(
"no native data was transfered"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录