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

accept Set<?> instead of Set<Object> (SPR-6742)

This commit is contained in:
Juergen Hoeller 2010-01-22 10:03:13 +00:00
parent 3339356a55
commit 6fcca3cd93
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,7 +35,7 @@ import org.springframework.core.convert.support.GenericConversionService;
*/ */
public class ConversionServiceFactoryBean implements FactoryBean<ConversionService>, InitializingBean { public class ConversionServiceFactoryBean implements FactoryBean<ConversionService>, InitializingBean {
private Set<Object> converters; private Set<?> converters;
private GenericConversionService conversionService; private GenericConversionService conversionService;
@ -46,7 +46,7 @@ public class ConversionServiceFactoryBean implements FactoryBean<ConversionServi
* {@link org.springframework.core.convert.converter.ConverterFactory}, * {@link org.springframework.core.convert.converter.ConverterFactory},
* or {@link org.springframework.core.convert.converter.GenericConverter}. * or {@link org.springframework.core.convert.converter.GenericConverter}.
*/ */
public void setConverters(Set<Object> converters) { public void setConverters(Set<?> converters) {
this.converters = converters; this.converters = converters;
} }

6
org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,7 +51,7 @@ public class FormattingConversionServiceFactoryBean
private static final boolean jodaTimePresent = ClassUtils.isPresent( private static final boolean jodaTimePresent = ClassUtils.isPresent(
"org.joda.time.DateTime", FormattingConversionService.class.getClassLoader()); "org.joda.time.DateTime", FormattingConversionService.class.getClassLoader());
private Set<Object> converters; private Set<?> converters;
private FormattingConversionService conversionService; private FormattingConversionService conversionService;
@ -62,7 +62,7 @@ public class FormattingConversionServiceFactoryBean
* {@link org.springframework.core.convert.converter.ConverterFactory}, * {@link org.springframework.core.convert.converter.ConverterFactory},
* or {@link org.springframework.core.convert.converter.GenericConverter}. * or {@link org.springframework.core.convert.converter.GenericConverter}.
*/ */
public void setConverters(Set<Object> converters) { public void setConverters(Set<?> converters) {
this.converters = converters; this.converters = converters;
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -90,7 +90,7 @@ public abstract class ConversionServiceFactory {
* {@link ConverterFactory}, or {@link GenericConverter} * {@link ConverterFactory}, or {@link GenericConverter}
* @param registry the target registry to register with * @param registry the target registry to register with
*/ */
public static void registerConverters(Set<Object> converters, ConverterRegistry registry) { public static void registerConverters(Set<?> converters, ConverterRegistry registry) {
if (converters != null) { if (converters != null) {
for (Object converter : converters) { for (Object converter : converters) {
if (converter instanceof GenericConverter) { if (converter instanceof GenericConverter) {