switched to better encapsulated convert(Object, TypeDescriptor) where possible

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3880 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java

@@ -64,4 +64,10 @@ public interface ConversionService {
 	 */
 	Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType);
 
-}
+	// 3.1 additions that encapsulate TypeDescriptor.forObject(source)
+	
+	boolean canConvert(Object source, TypeDescriptor targetType);
+
+	Object convert(Object source, TypeDescriptor targetType);
+
+}

org.springframework.core/src/main/java/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.java

@@ -56,7 +56,7 @@ public class ConvertingPropertyEditorAdapter extends PropertyEditorSupport {
 
 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
-		setValue(this.conversionService.convert(text, TypeDescriptor.valueOf(String.class), this.targetDescriptor));
+		setValue(this.conversionService.convert(text, this.targetDescriptor));
 	}
 
 	@Override

org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java

@@ -188,6 +188,14 @@ public class GenericConversionService implements ConversionService, ConverterReg
 		return result;
 	}
 
+	public boolean canConvert(Object source, TypeDescriptor targetType) {
+		return canConvert(TypeDescriptor.forObject(source), targetType);
+	}
+
+	public Object convert(Object source, TypeDescriptor targetType) {
+		return convert(source, TypeDescriptor.forObject(source), targetType);
+	}
+
 	public String toString() {
 		List<String> converterStrings = new ArrayList<String>();
 		for (Map<Class<?>, MatchableConverters> targetConverters : this.converters.values()) {