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

polishing

This commit is contained in:
Keith Donald 2009-11-27 04:31:09 +00:00
parent f751acea12
commit 18c63f70c4
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java
View File

@ -73,8 +73,8 @@ public class FormattingConversionService extends GenericConversionService
public Class<?>[][] getConvertibleTypes() {
return new Class<?>[][] {{fieldType, String.class}};
}
public boolean matches(TypeDescriptor sourceFieldType, TypeDescriptor targetFieldType) {
return (sourceFieldType.getAnnotation(annotationType) != null);
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return (sourceType.getAnnotation(annotationType) != null);
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
Printer<?> printer = annotationFormatterFactory.getPrinter(sourceType.getAnnotation(annotationType), sourceType.getType());
@ -89,8 +89,8 @@ public class FormattingConversionService extends GenericConversionService
public Class<?>[][] getConvertibleTypes() {
return new Class<?>[][] {{String.class, fieldType}};
}
public boolean matches(TypeDescriptor sourceFieldType, TypeDescriptor targetFieldType) {
return (targetFieldType.getAnnotation(annotationType) != null);
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return (targetType.getAnnotation(annotationType) != null);
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
Parser<?> parser = annotationFormatterFactory.getParser(targetType.getAnnotation(annotationType), targetType.getType());

7
org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
View File

@ -16,11 +16,9 @@
package org.springframework.core.convert.support;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.converter.ConverterRegistry;
/**
* A factory for creating common ConversionService configurations.
* A factory for common ConversionService configurations.
*
* @author Keith Donald
* @author Juergen Hoeller
@ -31,7 +29,7 @@ public abstract class ConversionServiceFactory {
/**
* Create a new default ConversionService instance that can be safely modified.
*/
public static ConversionService createDefaultConversionService() {
public static GenericConversionService createDefaultConversionService() {
GenericConversionService conversionService = new GenericConversionService();
addDefaultConverters(conversionService);
return conversionService;
@ -39,7 +37,6 @@ public abstract class ConversionServiceFactory {
/**
* Populate the given ConversionService instance with all applicable default converters.
* Callers may cast the returned ConversionService to a {@link ConverterRegistry} to supplement or override the default converters.
*/
public static void addDefaultConverters(GenericConversionService conversionService) {
conversionService.addGenericConverter(new ArrayToArrayConverter(conversionService));