root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polish 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1937 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Keith Donald 2009-09-18 21:07:53 +00:00
parent 26ff01d23b
commit 03dab76899
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@ -38,7 +38,7 @@ import org.springframework.util.ClassUtils;
public class TypeDescriptor {
/**
* Constant defining an 'empty' TypeDescriptor.
* Constant defining an 'unknown' TypeDescriptor.
*/
public static final TypeDescriptor NULL = new TypeDescriptor();
@ -231,10 +231,16 @@ public class TypeDescriptor {
}
}
/**
* Returns map key type as a type descriptor.
*/
public TypeDescriptor getMapKeyTypeDescriptor() {
return TypeDescriptor.valueOf(getMapKeyType());
}
/**
* Returns map value type as a type descriptor.
*/
public TypeDescriptor getMapValueTypeDescriptor() {
return TypeDescriptor.valueOf(getMapValueType());
}
@ -270,7 +276,7 @@ public class TypeDescriptor {
*/
public boolean isAssignableValue(Object obj) {
Class<?> type = getType();
return (type != null && ClassUtils.isAssignableValue(getType(), obj));
return type != null && ClassUtils.isAssignableValue(getType(), obj);
}
/**
@ -279,7 +285,11 @@ public class TypeDescriptor {
* @return true if this type is assignable to the target
*/
public boolean isAssignableTo(TypeDescriptor targetType) {
return ClassUtils.isAssignable(targetType.getType(), getType());
if (targetType == TypeDescriptor.NULL) {
return false;
}
Class<?> type = getType();
return type != null && ClassUtils.isAssignable(targetType.getType(), type);
}
/**

2
org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionGenericConverter.java
View File

@ -67,7 +67,7 @@ class CollectionGenericConverter implements GenericConverter {
return TypeDescriptor.valueOf(element.getClass());
}
}
return null;
return TypeDescriptor.NULL;
}
private Collection compatibleCollectionWithoutElementConversion(Collection source, TypeDescriptor targetType) {

4
org.springframework.core/src/main/java/org/springframework/core/convert/support/MapGenericConverter.java
View File

@ -31,11 +31,11 @@ class MapGenericConverter implements GenericConverter {
return compatibleMapWithoutEntryConversion(sourceMap, targetType);
}
boolean keysCompatible = false;
if (sourceKeyType != null && targetKeyType != null && sourceKeyType.isAssignableTo(targetKeyType)) {
if (sourceKeyType != TypeDescriptor.NULL && targetKeyType != TypeDescriptor.NULL && sourceKeyType.isAssignableTo(targetKeyType)) {
keysCompatible = true;
}
boolean valuesCompatible = false;
if (sourceValueType != null && targetValueType != null && sourceValueType.isAssignableTo(targetValueType)) {
if (sourceValueType != TypeDescriptor.NULL && targetValueType != TypeDescriptor.NULL && sourceValueType.isAssignableTo(targetValueType)) {
valuesCompatible = true;
}
if (keysCompatible && valuesCompatible) {