From bb93f5967f2286fb9674b0374031d9d75f07e212 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Tue, 15 Dec 2009 14:00:27 +0000 Subject: [PATCH] removed generic warning --- .../core/convert/support/ObjectToStringConverter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java b/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java index 2ea30a22ce..34f34b0f97 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java +++ b/org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java @@ -37,18 +37,18 @@ import org.springframework.core.convert.converter.ConditionalGenericConverter; */ final class ObjectToStringConverter implements ConditionalGenericConverter { + public Set getConvertibleTypes() { + return Collections.singleton(new ConvertiblePair(Object.class, String.class)); + } + public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { - Class sourceClass = sourceType.getObjectType(); + Class sourceClass = sourceType.getObjectType(); return Number.class.isAssignableFrom(sourceClass) || Boolean.class.equals(sourceClass) || Character.class.equals(sourceClass) || CharSequence.class.isAssignableFrom(sourceClass) || StringWriter.class.isAssignableFrom(sourceClass) || sourceClass.isEnum() || ObjectToObjectConverter.hasValueOfMethodOrConstructor(sourceClass, String.class); } - public Set getConvertibleTypes() { - return Collections.singleton(new ConvertiblePair(Object.class, String.class)); - } - public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return (source != null ? source.toString() : null); }