Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1e9ab530
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1e9ab530
编写于
10月 28, 2014
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CharacterEditor uses Character.valueOf(char) and throws a more descriptive exception
Issue: SPR-12386
上级
33d85d2a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
11 deletion
+10
-11
spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
...pringframework/beans/propertyeditors/CharacterEditor.java
+10
-11
未找到文件。
spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
浏览文件 @
1e9ab530
/*
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
4
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -57,11 +57,10 @@ public class CharacterEditor extends PropertyEditorSupport {
...
@@ -57,11 +57,10 @@ public class CharacterEditor extends PropertyEditorSupport {
/**
/**
* Create a new CharacterEditor instance.
* Create a new CharacterEditor instance.
* <p>The "allowEmpty" parameter controls whether an empty String is
* <p>The "allowEmpty" parameter controls whether an empty String is to be
* to be allowed in parsing, i.e. be interpreted as the {@code null}
* allowed in parsing, i.e. be interpreted as the {@code null} value when
* value when {@link #setAsText(String) text is being converted}. If
* {@link #setAsText(String) text is being converted}. If {@code false},
* {@code false}, an {@link IllegalArgumentException} will be thrown
* an {@link IllegalArgumentException} will be thrown at that time.
* at that time.
* @param allowEmpty if empty strings are to be allowed
* @param allowEmpty if empty strings are to be allowed
*/
*/
public
CharacterEditor
(
boolean
allowEmpty
)
{
public
CharacterEditor
(
boolean
allowEmpty
)
{
...
@@ -81,12 +80,12 @@ public class CharacterEditor extends PropertyEditorSupport {
...
@@ -81,12 +80,12 @@ public class CharacterEditor extends PropertyEditorSupport {
else
if
(
isUnicodeCharacterSequence
(
text
))
{
else
if
(
isUnicodeCharacterSequence
(
text
))
{
setAsUnicode
(
text
);
setAsUnicode
(
text
);
}
}
else
if
(
text
.
length
()
!=
1
)
{
else
if
(
text
.
length
()
==
1
)
{
throw
new
IllegalArgumentException
(
"String ["
+
text
+
"] with length "
+
setValue
(
Character
.
valueOf
(
text
.
charAt
(
0
)));
text
.
length
()
+
" cannot be converted to char type"
);
}
}
else
{
else
{
setValue
(
new
Character
(
text
.
charAt
(
0
)));
throw
new
IllegalArgumentException
(
"String ["
+
text
+
"] with length "
+
text
.
length
()
+
" cannot be converted to char type: neither Unicode nor single character"
);
}
}
}
}
...
@@ -103,7 +102,7 @@ public class CharacterEditor extends PropertyEditorSupport {
...
@@ -103,7 +102,7 @@ public class CharacterEditor extends PropertyEditorSupport {
private
void
setAsUnicode
(
String
text
)
{
private
void
setAsUnicode
(
String
text
)
{
int
code
=
Integer
.
parseInt
(
text
.
substring
(
UNICODE_PREFIX
.
length
()),
16
);
int
code
=
Integer
.
parseInt
(
text
.
substring
(
UNICODE_PREFIX
.
length
()),
16
);
setValue
(
new
Character
((
char
)
code
));
setValue
(
Character
.
valueOf
((
char
)
code
));
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录