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

generic converter updates

This commit is contained in:
Keith Donald 2009-09-18 20:08:45 +00:00
parent d3b43ebccb
commit f1f4bd9fb4
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.context/src/main/java/org/springframework/ui/format/support/FormattingConversionServiceAdapter.java
View File

@ -55,8 +55,8 @@ public class FormattingConversionServiceAdapter extends GenericConversionService
} }
@Override @Override
protected GenericConverter getConverter(Class sourceType, TypeDescriptor targetType) { protected GenericConverter getConverter(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (String.class.equals(sourceType)) { if (String.class.equals(sourceType.getType())) {
Formatter formatter = this.formatterRegistry.getFormatter(targetType); Formatter formatter = this.formatterRegistry.getFormatter(targetType);
if (formatter != null) { if (formatter != null) {
return new FormattingConverter(formatter); return new FormattingConverter(formatter);
@ -76,13 +76,18 @@ public class FormattingConversionServiceAdapter extends GenericConversionService
this.formatter = formatter; this.formatter = formatter;
} }
public Object convert(Object source, TypeDescriptor targetType) { public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
throw new UnsupportedOperationException("Should not be called");
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
try { try {
return this.formatter.parse((String) source, LocaleContextHolder.getLocale()); return this.formatter.parse((String) source, LocaleContextHolder.getLocale());
} catch (ParseException ex) { } catch (ParseException ex) {
throw new IllegalArgumentException("Could not convert formatted value '" + source + "'", ex); throw new IllegalArgumentException("Could not convert formatted value '" + source + "'", ex);
} }
} }
} }
} }

9
org.springframework.core/src/main/java/org/springframework/core/convert/support/MatchableGenericConverter.java
View File

@ -1,9 +0,0 @@
package org.springframework.core.convert.support;
import org.springframework.core.convert.TypeDescriptor;
public interface MatchableGenericConverter extends GenericConverter {
boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType);
}