diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java index 1f4e0af80..dfe403086 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java @@ -1,6 +1,5 @@ package com.opensymphony.xwork2.conversion.impl; -import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; import com.opensymphony.xwork2.conversion.TypeConverter; import com.opensymphony.xwork2.inject.Inject; @@ -17,24 +16,17 @@ import java.util.TreeSet; public class CollectionConverter extends DefaultTypeConverter { private ObjectTypeDeterminer objectTypeDeterminer; - private ObjectFactory objectFactory; @Inject public void setObjectTypeDeterminer(ObjectTypeDeterminer determiner) { this.objectTypeDeterminer = determiner; } - @Inject - public void setObjectFactory(ObjectFactory factory) { - this.objectFactory = factory; - } - public Object convertValue(Map context, Object target, Member member, String propertyName, Object value, Class toType) { Collection result; Class memberType = String.class; if (target != null) { - //memberType = (Class) XWorkConverter.getInstance().getConverter(o.getClass(), XWorkConverter.CONVERSION_COLLECTION_PREFIX + prop); memberType = objectTypeDeterminer.getElementClass(target.getClass(), propertyName, null); if (memberType == null) {