Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
04cd95ff
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,发现更多精彩内容 >>
提交
04cd95ff
编写于
8月 25, 2009
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed accidental test failures
上级
9a48f3f3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
29 deletion
+29
-29
org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
...java/org/springframework/beans/TypeConverterDelegate.java
+22
-22
org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java
...ework.beans/src/test/java/test/beans/DerivedTestBean.java
+6
-2
org.springframework.beans/src/test/java/test/beans/TestBean.java
...ingframework.beans/src/test/java/test/beans/TestBean.java
+0
-4
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
...ces/org/springframework/beans/factory/xml/collections.xml
+1
-1
未找到文件。
org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
浏览文件 @
04cd95ff
...
...
@@ -437,6 +437,16 @@ class TypeConverterDelegate {
protected
Collection
convertToTypedCollection
(
Collection
original
,
String
propertyName
,
Class
requiredType
,
MethodParameter
methodParam
)
{
boolean
originalAllowed
=
requiredType
.
isInstance
(
original
);
Class
elementType
=
null
;
if
(
methodParam
!=
null
)
{
elementType
=
GenericCollectionTypeResolver
.
getCollectionParameterType
(
methodParam
);
}
if
(
elementType
==
null
&&
originalAllowed
&&
!
this
.
propertyEditorRegistry
.
hasCustomEditorForElement
(
null
,
propertyName
))
{
return
original
;
}
Iterator
it
;
try
{
it
=
original
.
iterator
();
...
...
@@ -473,16 +483,6 @@ class TypeConverterDelegate {
return
original
;
}
boolean
originalAllowed
=
requiredType
.
isInstance
(
original
);
Class
elementType
=
null
;
if
(
methodParam
!=
null
)
{
elementType
=
GenericCollectionTypeResolver
.
getCollectionParameterType
(
methodParam
);
}
if
(
elementType
==
null
&&
originalAllowed
&&
!
this
.
propertyEditorRegistry
.
hasCustomEditorForElement
(
null
,
propertyName
))
{
return
original
;
}
int
i
=
0
;
for
(;
it
.
hasNext
();
i
++)
{
Object
element
=
it
.
next
();
...
...
@@ -503,6 +503,18 @@ class TypeConverterDelegate {
@SuppressWarnings
(
"unchecked"
)
protected
Map
convertToTypedMap
(
Map
original
,
String
propertyName
,
Class
requiredType
,
MethodParameter
methodParam
)
{
boolean
originalAllowed
=
requiredType
.
isInstance
(
original
);
Class
keyType
=
null
;
Class
valueType
=
null
;
if
(
methodParam
!=
null
)
{
keyType
=
GenericCollectionTypeResolver
.
getMapKeyParameterType
(
methodParam
);
valueType
=
GenericCollectionTypeResolver
.
getMapValueParameterType
(
methodParam
);
}
if
(
keyType
==
null
&&
valueType
==
null
&&
originalAllowed
&&
!
this
.
propertyEditorRegistry
.
hasCustomEditorForElement
(
null
,
propertyName
))
{
return
original
;
}
Iterator
it
;
try
{
it
=
original
.
entrySet
().
iterator
();
...
...
@@ -539,18 +551,6 @@ class TypeConverterDelegate {
return
original
;
}
boolean
originalAllowed
=
requiredType
.
isInstance
(
original
);
Class
keyType
=
null
;
Class
valueType
=
null
;
if
(
methodParam
!=
null
)
{
keyType
=
GenericCollectionTypeResolver
.
getMapKeyParameterType
(
methodParam
);
valueType
=
GenericCollectionTypeResolver
.
getMapValueParameterType
(
methodParam
);
}
if
(
keyType
==
null
&&
valueType
==
null
&&
originalAllowed
&&
!
this
.
propertyEditorRegistry
.
hasCustomEditorForElement
(
null
,
propertyName
))
{
return
original
;
}
while
(
it
.
hasNext
())
{
Map
.
Entry
entry
=
(
Map
.
Entry
)
it
.
next
();
Object
key
=
entry
.
getKey
();
...
...
org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java
浏览文件 @
04cd95ff
/*
* Copyright 2002-200
7
the original author or authors.
* Copyright 2002-200
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -60,6 +60,10 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
return
beanName
;
}
public
void
setActualSpouse
(
TestBean
spouse
)
{
setSpouse
(
spouse
);
}
public
void
setSpouseRef
(
String
name
)
{
setSpouse
(
new
TestBean
(
name
));
}
...
...
@@ -82,4 +86,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
return
destroyed
;
}
}
\ No newline at end of file
}
org.springframework.beans/src/test/java/test/beans/TestBean.java
浏览文件 @
04cd95ff
...
...
@@ -200,10 +200,6 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
this
.
spouses
=
new
ITestBean
[]
{
spouse
};
}
public
void
setActualSpouse
(
TestBean
spouse
)
{
this
.
spouses
=
new
ITestBean
[]
{
spouse
};
}
public
ITestBean
getSpouse
()
{
return
(
spouses
!=
null
?
spouses
[
0
]
:
null
);
}
...
...
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
浏览文件 @
04cd95ff
...
...
@@ -44,7 +44,7 @@
</property>
</bean>
<bean
id=
"pDavid"
class=
"test.beans.TestBean"
scope=
"prototype"
>
<bean
id=
"pDavid"
class=
"test.beans.
Derived
TestBean"
scope=
"prototype"
>
<property
name=
"name"
><value>
David
</value></property>
<property
name=
"age"
><value>
27
</value></property>
<property
name=
"actualSpouse"
value=
"Jen"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录