litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2158 Add generics to EditProcessObject

Browse source
This commit is contained in:
jeb228 2011-02-25 17:54:09 +00:00
parent 1613cf2526
commit 1ac5eb13c8
2 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

65
webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
View file

@ -2,47 +2,50 @@
package edu.cornell.mannlib.vedit.beans; package edu.cornell.mannlib.vedit.beans;
import java.util.List; import java.io.Serializable;
import java.util.LinkedList; import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
import edu.cornell.mannlib.vedit.listener.ChangeListener;
import edu.cornell.mannlib.vedit.listener.EditPreProcessor;
import edu.cornell.mannlib.vedit.validator.Validator; import edu.cornell.mannlib.vedit.validator.Validator;
import edu.cornell.mannlib.vedit.beans.FormObject;
import java.lang.reflect.Method;
import java.io.Serializable;
public class EditProcessObject implements Serializable { public class EditProcessObject implements Serializable {
private String key = null; private String key = null;
private Class beanClass = null; private Class<?> beanClass = null;
private Class implementationClass = null; private Class<?> implementationClass = null;
private boolean useRecycledBean = false; private boolean useRecycledBean = false;
private Object beanMask = null; private Object beanMask = null;
private List simpleMask = new LinkedList(); private List<Object[] /* Object[2] */> simpleMask = new LinkedList<Object[]>();
private Map<String, List<Validator>> validatorMap = new HashMap<String, List<Validator>>(); private Map<String, List<Validator>> validatorMap = new HashMap<String, List<Validator>>();
private Map<String, String> errMsgMap = new HashMap<String, String>(); private Map<String, String> errMsgMap = new HashMap<String, String>();
private Map<String, String> defaultValueMap = new HashMap<String, String>(); private Map<String, String> defaultValueMap = new HashMap<String, String>();
private List preProcessorList = new LinkedList(); private List<EditPreProcessor> preProcessorList = new LinkedList<EditPreProcessor>();
private List changeListenerList = new LinkedList(); private List<ChangeListener> changeListenerList = new LinkedList<ChangeListener>();
private Object originalBean = null; private Object originalBean = null;
private Object newBean = null; private Object newBean = null;
private String idFieldName = null; private String idFieldName = null;
private Class idFieldClass = null; private Class<?> idFieldClass = null;
private FormObject formObject = null; private FormObject formObject = null;
private Object dataAccessObject = null; private Object dataAccessObject = null;
private HashMap additionalDaoMap = new HashMap(); private HashMap<String, Object /* DAO */> additionalDaoMap = new HashMap<String, Object>();
private Method insertMethod = null; private Method insertMethod = null;
private Method updateMethod = null; private Method updateMethod = null;
@ -57,7 +60,7 @@ public class EditProcessObject implements Serializable {
private String action = null; private String action = null;
private Map requestParameterMap = null; private Map<String, String[]> requestParameterMap = null;
private Map<String, String> badValueMap = new HashMap<String, String>(); private Map<String, String> badValueMap = new HashMap<String, String>();
@ -74,19 +77,19 @@ public class EditProcessObject implements Serializable {
this.key = key; this.key = key;
} }
public Class getBeanClass(){ public Class<?> getBeanClass(){
return beanClass; return beanClass;
} }
public void setBeanClass(Class beanClass){ public void setBeanClass(Class<?> beanClass){
this.beanClass = beanClass; this.beanClass = beanClass;
} }
public Class getImplementationClass(){ public Class<?> getImplementationClass(){
return implementationClass; return implementationClass;
} }
public void setImplementationClass(Class implementationClass){ public void setImplementationClass(Class<?> implementationClass){
this.implementationClass = implementationClass; this.implementationClass = implementationClass;
} }
@ -98,28 +101,28 @@ public class EditProcessObject implements Serializable {
this.beanMask = beanMask; this.beanMask = beanMask;
} }
public List getSimpleMask(){ public List<Object[]> getSimpleMask(){
return simpleMask; return simpleMask;
} }
public void setSimpleMask(List simpleMask){ public void setSimpleMask(List<Object[]> simpleMask){
this.simpleMask = simpleMask; this.simpleMask = simpleMask;
} }
public List getChangeListenerList() { public List<ChangeListener> getChangeListenerList() {
return changeListenerList; return changeListenerList;
} }
public void setChangeListenerList(List changeListenerList) { public void setChangeListenerList(List<? extends ChangeListener> changeListenerList) {
this.changeListenerList = changeListenerList; this.changeListenerList = new ArrayList<ChangeListener>(changeListenerList);
} }
public List getPreProcessorList() { public List<EditPreProcessor> getPreProcessorList() {
return preProcessorList; return preProcessorList;
} }
public void setPreProcessorList(List preProcessorList) { public void setPreProcessorList(List<? extends EditPreProcessor> preProcessorList) {
this.preProcessorList = preProcessorList; this.preProcessorList = new ArrayList<EditPreProcessor>(preProcessorList);
} }
public Object getOriginalBean(){ public Object getOriginalBean(){
@ -146,11 +149,11 @@ public class EditProcessObject implements Serializable {
this.idFieldName = ifn; this.idFieldName = ifn;
} }
public Class getIdFieldClass() { public Class<?> getIdFieldClass() {
return idFieldClass; return idFieldClass;
} }
public void setIdFieldClass(Class cls) { public void setIdFieldClass(Class<?> cls) {
this.idFieldClass = cls; this.idFieldClass = cls;
} }
@ -194,11 +197,11 @@ public class EditProcessObject implements Serializable {
this.action = action; this.action = action;
} }
public Map getRequestParameterMap() { public Map<String, String[]> getRequestParameterMap() {
return requestParameterMap; return requestParameterMap;
} }
public void setRequestParameterMap (Map rpmap) { public void setRequestParameterMap (Map<String, String[]> rpmap) {
requestParameterMap = rpmap; requestParameterMap = rpmap;
} }
@ -234,10 +237,10 @@ public class EditProcessObject implements Serializable {
dataAccessObject = dao; dataAccessObject = dao;
} }
public HashMap getAdditionalDaoMap() { public HashMap<String, Object> getAdditionalDaoMap() {
return additionalDaoMap; return additionalDaoMap;
} }
public void setAdditionalDaoMap(HashMap adm) { public void setAdditionalDaoMap(HashMap<String, Object> adm) {
additionalDaoMap = adm; additionalDaoMap = adm;
} }

6
webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java
View file

@ -320,11 +320,11 @@ public class OperationController extends BaseEditController {
} }
private void notifyChangeListeners(EditProcessObject epo, String action) { private void notifyChangeListeners(EditProcessObject epo, String action) {
List changeListeners = epo.getChangeListenerList(); List<ChangeListener> changeListeners = epo.getChangeListenerList();
if (changeListeners != null){ if (changeListeners != null){
Iterator changeIt = changeListeners.iterator(); Iterator<ChangeListener> changeIt = changeListeners.iterator();
while (changeIt.hasNext()) { while (changeIt.hasNext()) {
ChangeListener cl = (ChangeListener) changeIt.next(); ChangeListener cl = changeIt.next();
if (action.equals("insert")) if (action.equals("insert"))
cl.doInserted(epo.getNewBean(),epo); cl.doInserted(epo.getNewBean(),epo);
else if (action.equals("update")) else if (action.equals("update"))