Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
e8ffc873
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e8ffc873
编写于
6月 25, 2009
作者:
Y
yan
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
232b48c5
ead1c117
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
83 addition
and
2 deletion
+83
-2
jdk/src/share/classes/java/text/SimpleDateFormat.java
jdk/src/share/classes/java/text/SimpleDateFormat.java
+2
-2
jdk/test/java/text/Format/DateFormat/Bug6609750.java
jdk/test/java/text/Format/DateFormat/Bug6609750.java
+81
-0
未找到文件。
jdk/src/share/classes/java/text/SimpleDateFormat.java
浏览文件 @
e8ffc873
...
...
@@ -1030,9 +1030,9 @@ public class SimpleDateFormat extends DateFormat {
case
1
:
// 'y' - YEAR
if
(
calendar
instanceof
GregorianCalendar
)
{
if
(
count
>=
4
)
if
(
count
!=
2
)
zeroPaddingNumber
(
value
,
count
,
maxIntCount
,
buffer
);
else
// count
< 4
else
// count
== 2
zeroPaddingNumber
(
value
,
2
,
2
,
buffer
);
// clip 1996 to 96
}
else
{
if
(
current
==
null
)
{
...
...
jdk/test/java/text/Format/DateFormat/Bug6609750.java
0 → 100644
浏览文件 @
e8ffc873
/*
* Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/**
* @test
* @bug 6609750
* @summary Make sure that SimpleDateFormat.format() formats years correctly.
*/
import
java.text.*
;
import
java.util.*
;
public
class
Bug6609750
{
public
static
void
main
(
String
[]
args
)
{
boolean
error
=
false
;
Locale
defaultLocale
=
Locale
.
getDefault
();
Locale
.
setDefault
(
Locale
.
US
);
Date
[]
dates
=
{
new
Date
(
9
-
1900
,
Calendar
.
JUNE
,
12
),
new
Date
(
99
-
1900
,
Calendar
.
JUNE
,
12
),
new
Date
(
999
-
1900
,
Calendar
.
JUNE
,
12
),
new
Date
(
2009
-
1900
,
Calendar
.
JUNE
,
12
),
new
Date
(
30009
-
1900
,
Calendar
.
JUNE
,
12
),
};
String
[]
patterns
=
{
"y"
,
"yy"
,
"yyy"
,
"yyyy"
,
"yyyyy"
,
"yyyyyy"
};
String
[][]
expectedResults
=
{
{
"9"
,
"09"
,
"009"
,
"0009"
,
"00009"
,
"000009"
},
{
"99"
,
"99"
,
"099"
,
"0099"
,
"00099"
,
"000099"
},
{
"999"
,
"99"
,
"999"
,
"0999"
,
"00999"
,
"000999"
},
{
"2009"
,
"09"
,
"2009"
,
"2009"
,
"02009"
,
"002009"
},
{
"30009"
,
"09"
,
"30009"
,
"30009"
,
"30009"
,
"030009"
},
};
SimpleDateFormat
sdf
=
new
SimpleDateFormat
();
for
(
int
dateNo
=
0
;
dateNo
<
dates
.
length
;
dateNo
++)
{
Date
date
=
dates
[
dateNo
];
for
(
int
patternNo
=
0
;
patternNo
<
patterns
.
length
;
patternNo
++)
{
sdf
.
applyPattern
(
patterns
[
patternNo
]);
String
got
=
sdf
.
format
(
date
);
if
(!
expectedResults
[
dateNo
][
patternNo
].
equals
(
got
))
{
error
=
true
;
System
.
err
.
println
(
"Failed: Unexpected format result: "
+
"Expected: \""
+
expectedResults
[
dateNo
][
patternNo
]
+
"\", Got: \""
+
got
+
"\" for date "
+
date
+
" with pattern \""
+
patterns
[
patternNo
]
+
"\""
);
}
}
}
Locale
.
setDefault
(
defaultLocale
);
if
(
error
)
{
throw
new
RuntimeException
(
"SimpleDateFormat.format() error."
);
};
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录