GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

polishing 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2528 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Keith Donald 16 years ago
parent
00e6745d26
commit
e0cd89a139
2 changed files with 6 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java
  2. 7
      org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java

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

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

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

@ -16,11 +16,9 @@
package org.springframework.core.convert.support; 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 Keith Donald
* @author Juergen Hoeller * @author Juergen Hoeller
@ -31,7 +29,7 @@ public abstract class ConversionServiceFactory {
/** /**
* Create a new default ConversionService instance that can be safely modified. * Create a new default ConversionService instance that can be safely modified.
*/ */
public static ConversionService createDefaultConversionService() { public static GenericConversionService createDefaultConversionService() {
GenericConversionService conversionService = new GenericConversionService(); GenericConversionService conversionService = new GenericConversionService();
addDefaultConverters(conversionService); addDefaultConverters(conversionService);
return conversionService; return conversionService;
@ -39,7 +37,6 @@ public abstract class ConversionServiceFactory {
/** /**
* Populate the given ConversionService instance with all applicable default converters. * 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) { public static void addDefaultConverters(GenericConversionService conversionService) {
conversionService.addGenericConverter(new ArrayToArrayConverter(conversionService)); conversionService.addGenericConverter(new ArrayToArrayConverter(conversionService));

Write Preview
Loading…
Cancel
Save