Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

binder addition

Browse Source
This commit is contained in:
Keith Donald
2008-07-22 03:21:30 +00:00
parent 454ecc7222
commit b70c76d459
22 changed files with 218 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-binding/src/main/java/org/springframework/binding/convert/service/GenericConversionService.java
View File

@@ -168,11 +168,23 @@ public class GenericConversionService implements ConversionService {
public ConversionExecutor getConversionExecutor(String id, Class sourceClass, Class targetClass)
throws ConversionExecutorNotFoundException {
Assert.hasText(id, "The id of the custom converter is required");
Assert.notNull(sourceClass, "The source class to convert from is required");
Assert.notNull(targetClass, "The target class to convert to is required");
sourceClass = convertToWrapperClassIfNecessary(sourceClass);
targetClass = convertToWrapperClassIfNecessary(targetClass);
if (targetClass.isAssignableFrom(sourceClass)) {
return new StaticConversionExecutor(sourceClass, targetClass, new NoOpConverter(sourceClass, targetClass));
}
Converter converter = (Converter) customConverters.get(id);
if (converter == null) {
throw new ConversionExecutorNotFoundException(sourceClass, targetClass,
"No custom ConversionExecutor found with id '" + id + "' for converting from sourceClass ["
+ sourceClass.getName() + "] to targetClass [" + targetClass.getName() + "]");
if (parent != null) {
return parent.getConversionExecutor(id, sourceClass, targetClass);
} else {
throw new ConversionExecutorNotFoundException(sourceClass, targetClass,
"No custom ConversionExecutor found with id '" + id + "' for converting from sourceClass ["
+ sourceClass.getName() + "] to targetClass [" + targetClass.getName() + "]");
}
}
if (converter.getSourceClass().isAssignableFrom(sourceClass)) {
if (!converter.getTargetClass().isAssignableFrom(targetClass)) {