Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java =================================================================== diff -u -r7da4eb99b105fef928be8501f19e41f7bb3211ce -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 7da4eb99b105fef928be8501f19e41f7bb3211ce) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) @@ -61,14 +61,6 @@ SessionMap sessionMap; - public MultiValueMap validate(MessageService messageService, HttpServletRequest arg1) { - - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - errorMap.add("GLOBAL", messageService.getMessage("this is an error")); - - return errorMap; - } - public String getSessionMapID() { return sessionMapID; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java =================================================================== diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java (.../AdminForm.java) (revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java (.../AdminForm.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) @@ -22,13 +22,9 @@ package org.lamsfoundation.lams.tool.imageGallery.web.form; -import javax.servlet.http.HttpServletRequest; - import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; /** * @@ -45,13 +41,6 @@ private String thumbnailImageDimensions; - public MultiValueMap validate(HttpServletRequest arg1) { - - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - errorMap.add("GLOBAL", messageService.getMessage("this is an error")); - return errorMap; - } - public String getMediumImageDimensions() { return mediumImageDimensions; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java =================================================================== diff -u -re24d6ed72c977828fd089bf2bc718ca4a8328f26 -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java (.../QaMonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java (.../QaMonitoringController.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) @@ -104,10 +104,12 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); qaMonitoringForm.setContentFolderID(contentFolderID); - String validateParameters = validateParameters(request, qaMonitoringForm); - if (validateParameters != null) { - return validateParameters; + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + if ((strToolContentID == null) || (strToolContentID.length() == 0)) { + QaUtils.cleanUpSessionAbsolute(request); + throw new ServletException("No Tool Content ID found"); } + qaMonitoringForm.setToolContentID(strToolContentID); String toolContentID = qaMonitoringForm.getToolContentID(); QaContent qaContent = qaService.getQaContent(new Long(toolContentID).longValue()); @@ -116,11 +118,8 @@ throw new ServletException("Data not initialised in Monitoring"); } - qaMonitoringForm.setCurrentTab("1"); + qaMonitoringForm.setCurrentTab("1"); - String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); - qaMonitoringForm.setToolContentID(strToolContentID); - /* this section is related to summary tab. Starts here. */ // SessionMap sessionMap = new SessionMap(); // sessionMap.put(ACTIVITY_TITLE_KEY, qaContent.getTitle()); @@ -211,35 +210,6 @@ return "monitoring/MonitoringMaincontent"; } - /** - * validates request paramaters based on tool contract - * - * @param request - * @param mapping - * @return ActionForward - * @throws ServletException - */ - protected String validateParameters(HttpServletRequest request, - @ModelAttribute("qaMonitoringForm") QaMonitoringForm qaMonitoringForm) throws ServletException { - - String strToolContentId = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); - - if ((strToolContentId == null) || (strToolContentId.length() == 0)) { - QaUtils.cleanUpSessionAbsolute(request); - throw new ServletException("No Tool Content ID found"); - } else { - try { - long toolContentId = new Long(strToolContentId).longValue(); - - qaMonitoringForm.setToolContentID(new Long(toolContentId).toString()); - } catch (NumberFormatException e) { - QaUtils.cleanUpSessionAbsolute(request); - throw e; - } - } - return null; - } - @RequestMapping("/updateResponse") public String updateResponse(HttpServletRequest request) throws IOException, ServletException { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java =================================================================== diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision ebe9a494826fab1aebb345e6801ad512abb52416) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) @@ -50,14 +50,6 @@ private boolean reflectOnActivity; private String reflectInstructions; - public MultiValueMap validate(MessageService messageService, HttpServletRequest arg1) { - - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - errorMap.add("GLOBAL", messageService.getMessage("this is an error")); - - return errorMap; - } - public String getSessionMapID() { return sessionMapID; } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/AuthoringForm.java =================================================================== diff -u -r9f52e75fa4cf7f605aa95ac3aff5794c6eb860dd -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 9f52e75fa4cf7f605aa95ac3aff5794c6eb860dd) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) @@ -86,15 +86,6 @@ SessionMap sessionMap; - @Override - public MultiValueMap validate(HttpServletRequest arg1) { - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - - errorMap.add("GLOBAL", messageService.getMessage("this is an error")); - - return errorMap; - } - public String getSessionMapID() { return sessionMapID; } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPageForm.java =================================================================== diff -u -r82c8ee6bc80d47736337c5b07ccc686c5ea3ba32 -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPageForm.java (.../WikiPageForm.java) (revision 82c8ee6bc80d47736337c5b07ccc686c5ea3ba32) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPageForm.java (.../WikiPageForm.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) @@ -135,12 +135,4 @@ public void setNewPageIsEditable(Boolean newPageIsEditable) { this.newPageIsEditable = newPageIsEditable; } - - public MultiValueMap validate(HttpServletRequest arg1) { - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - - errorMap.add("GLOBAL", messageService.getMessage("this is an error")); - - return errorMap; - } }