From 4d413bc451ea5d0f20f1819488674b7ec8a7d2b8 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Mon, 21 Feb 2011 23:01:18 +0000 Subject: [PATCH] NIHVIVO-2158 Add generic info to some of the structures in EditProcessObject. Use interfaces in method signatures instead of concrete implementations. --- .../vedit/beans/EditProcessObject.java | 29 ++++++++++--------- .../mannlib/vedit/beans/FormObject.java | 7 +++-- .../vedit/controller/OperationController.java | 5 ++-- .../cornell/mannlib/vedit/util/FormUtils.java | 4 +-- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java b/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java index be7d841a8..2c7ba1e08 100644 --- a/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java +++ b/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java @@ -9,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpSession; import edu.cornell.mannlib.vedit.forwarder.PageForwarder; +import edu.cornell.mannlib.vedit.validator.Validator; import edu.cornell.mannlib.vedit.beans.FormObject; import java.lang.reflect.Method; import java.io.Serializable; @@ -24,10 +25,10 @@ public class EditProcessObject implements Serializable { private Object beanMask = null; private List simpleMask = new LinkedList(); - private HashMap validatorMap = new HashMap(); - private HashMap errMsgMap = new HashMap(); + private Map> validatorMap = new HashMap>(); + private Map errMsgMap = new HashMap(); - private HashMap defaultValueMap = new HashMap(); + private Map defaultValueMap = new HashMap(); private List preProcessorList = new LinkedList(); private List changeListenerList = new LinkedList(); @@ -58,9 +59,9 @@ public class EditProcessObject implements Serializable { private Map requestParameterMap = null; - private HashMap badValueMap = new HashMap(); + private Map badValueMap = new HashMap(); - private HashMap attributeMap = new HashMap(); + private Map attributeMap = new HashMap(); private Method getMethod = null; //assumed to take an integer primary key argument, at least for now @@ -272,39 +273,39 @@ public class EditProcessObject implements Serializable { this.getMethod = getMethod; } - public HashMap getDefaultValueMap() { + public Map getDefaultValueMap() { return defaultValueMap; } - public void setDefaultValueMap(HashMap dvh) { + public void setDefaultValueMap(Map dvh) { this.defaultValueMap = dvh; } - public HashMap getValidatorMap(){ + public Map> getValidatorMap(){ return validatorMap; } - public void setValidatorMap(HashMap validatorMap){ + public void setValidatorMap(Map> validatorMap){ this.validatorMap = validatorMap; } - public HashMap getErrMsgMap() { + public Map getErrMsgMap() { return errMsgMap; } - public void setErrMsgMap(HashMap emh){ + public void setErrMsgMap(Map emh){ errMsgMap = emh; } - public HashMap getBadValueMap() { + public Map getBadValueMap() { return badValueMap; } - public void setBadValueMap(HashMap bvh){ + public void setBadValueMap(Map bvh){ badValueMap = bvh; } - public Map getAttributeMap() { + public Map getAttributeMap() { return this.attributeMap; } diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java b/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java index dbaf8bcf9..cf758759c 100644 --- a/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java +++ b/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java @@ -6,13 +6,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; public class FormObject implements Serializable { private HashMap values = new HashMap(); private HashMap> optionLists = new HashMap>(); private HashMap> checkboxLists = new HashMap>(); - private HashMap errorMap = new HashMap(); + private Map errorMap = new HashMap(); private List dynamicFields = new ArrayList(); public HashMap getValues(){ @@ -43,11 +44,11 @@ public class FormObject implements Serializable { return checkboxLists; } - public HashMap getErrorMap(){ + public Map getErrorMap(){ return errorMap; } - public void setErrorMap(HashMap errorMap){ + public void setErrorMap(Map errorMap){ this.errorMap = errorMap; } diff --git a/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java b/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java index 6fa6e745c..dafac4986 100644 --- a/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java +++ b/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java @@ -9,6 +9,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -278,9 +279,9 @@ public class OperationController extends BaseEditController { } if (fieldValid){ if (currValue.length()==0) { - HashMap defaultHash = epo.getDefaultValueMap(); + Map defaultHash = epo.getDefaultValueMap(); try { - String defaultValue = (String)defaultHash.get(currParam); + String defaultValue = defaultHash.get(currParam); if (defaultValue != null) currValue=defaultValue; } catch (Exception e) {} diff --git a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java index 46a7718be..7b14c77ea 100644 --- a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java +++ b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java @@ -34,7 +34,7 @@ public class FormUtils { return htmlFormFromBean(bean,action,null,foo,new HashMap()); } - public static String htmlFormFromBean (Object bean, String action, FormObject foo, HashMap badValuesHash) { + public static String htmlFormFromBean (Object bean, String action, FormObject foo, Map badValuesHash) { return htmlFormFromBean(bean,action,null,foo,badValuesHash); } @@ -47,7 +47,7 @@ public class FormUtils { * @return XHTML markup of an editing form for the specified class * @author bjl23 */ - public static String htmlFormFromBean (Object bean, String action, EditProcessObject epo, FormObject foo, HashMap BadValuesHash) { + public static String htmlFormFromBean (Object bean, String action, EditProcessObject epo, FormObject foo, Map BadValuesHash) { String formMarkup = "";