Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
a925cd89
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看板
提交
a925cd89
编写于
8月 17, 2011
作者:
J
jjg
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
3c1c5143
ed10c2fb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
2 deletion
+34
-2
src/share/classes/java/util/Locale.java
src/share/classes/java/util/Locale.java
+1
-1
src/windows/native/java/lang/java_props_md.c
src/windows/native/java/lang/java_props_md.c
+12
-0
test/java/util/Locale/LocaleCategory.java
test/java/util/Locale/LocaleCategory.java
+20
-0
test/java/util/Locale/LocaleCategory.sh
test/java/util/Locale/LocaleCategory.sh
+1
-1
未找到文件。
src/share/classes/java/util/Locale.java
浏览文件 @
a925cd89
...
@@ -1589,7 +1589,7 @@ public final class Locale implements Cloneable, Serializable {
...
@@ -1589,7 +1589,7 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7
* @since 1.7
*/
*/
public
String
getDisplayScript
()
{
public
String
getDisplayScript
()
{
return
getDisplayScript
(
getDefault
());
return
getDisplayScript
(
getDefault
(
Category
.
DISPLAY
));
}
}
/**
/**
...
...
src/windows/native/java/lang/java_props_md.c
浏览文件 @
a925cd89
...
@@ -563,6 +563,18 @@ GetJavaProperties(JNIEnv* env)
...
@@ -563,6 +563,18 @@ GetJavaProperties(JNIEnv* env)
{
{
char
*
display_encoding
;
char
*
display_encoding
;
// Windows UI Language selection list only cares "language"
// information of the UI Language. For example, the list
// just lists "English" but it actually means "en_US", and
// the user cannot select "en_GB" (if exists) in the list.
// So, this hack is to use the user LCID region information
// for the UI Language, if the "language" portion of those
// two locales are the same.
if
(
PRIMARYLANGID
(
LANGIDFROMLCID
(
userDefaultLCID
))
==
PRIMARYLANGID
(
LANGIDFROMLCID
(
userDefaultUILang
)))
{
userDefaultUILang
=
userDefaultLCID
;
}
SetupI18nProps
(
userDefaultUILang
,
SetupI18nProps
(
userDefaultUILang
,
&
sprops
.
language
,
&
sprops
.
language
,
&
sprops
.
script
,
&
sprops
.
script
,
...
...
test/java/util/Locale/LocaleCategory.java
浏览文件 @
a925cd89
...
@@ -56,6 +56,7 @@ public class LocaleCategory {
...
@@ -56,6 +56,7 @@ public class LocaleCategory {
Locale
.
getDefault
().
getVariant
())).
build
();
Locale
.
getDefault
().
getVariant
())).
build
();
checkDefault
();
checkDefault
();
testGetSetDefault
();
testGetSetDefault
();
testBug7079486
();
}
finally
{
}
finally
{
// restore the reserved locale
// restore the reserved locale
Locale
.
setDefault
(
reservedLocale
);
Locale
.
setDefault
(
reservedLocale
);
...
@@ -82,5 +83,24 @@ public class LocaleCategory {
...
@@ -82,5 +83,24 @@ public class LocaleCategory {
throw
new
RuntimeException
(
"setDefault() should set all default locales for all categories"
);
throw
new
RuntimeException
(
"setDefault() should set all default locales for all categories"
);
}
}
}
}
static
void
testBug7079486
()
{
Locale
zh_Hans_CN
=
Locale
.
forLanguageTag
(
"zh-Hans-CN"
);
// make sure JRE has zh_Hans_CN localized string
if
(
zh_Hans_CN
.
getDisplayScript
(
Locale
.
US
).
equals
(
zh_Hans_CN
.
getDisplayScript
(
zh_Hans_CN
)))
{
return
;
}
Locale
.
setDefault
(
Locale
.
US
);
String
en_script
=
zh_Hans_CN
.
getDisplayScript
();
Locale
.
setDefault
(
Locale
.
Category
.
DISPLAY
,
zh_Hans_CN
);
String
zh_script
=
zh_Hans_CN
.
getDisplayScript
();
if
(
en_script
.
equals
(
zh_script
))
{
throw
new
RuntimeException
(
"Locale.getDisplayScript() (no args) does not honor default DISPLAY locale"
);
}
}
}
}
test/java/util/Locale/LocaleCategory.sh
浏览文件 @
a925cd89
#!/bin/sh
#!/bin/sh
#
#
# @test
# @test
# @bug 4700857 6997928
# @bug 4700857 6997928
7079486
# @summary tests for Locale.getDefault(Locale.Category) and
# @summary tests for Locale.getDefault(Locale.Category) and
# Locale.setDefault(Locale.Category, Locale)
# Locale.setDefault(Locale.Category, Locale)
# @build LocaleCategory
# @build LocaleCategory
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录