Author: lukaszlenart
Date: Thu Sep 19 06:36:48 2013
New Revision: 1524629
URL: http://svn.apache.org/r1524629
Log:
Removes unused field
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java?rev=1524629&r1=1524628&r2=1524629&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
Thu Sep 19 06:36:48 2013
@@ -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<String, Object> 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) {
