Index: lams_build/lib/lams/lams-central.jar =================================================================== diff -u -rebd388504924fe0a06bbf20a06fe0032abbf8d15 -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== diff -u -rad8707a3e0b0501d651993f3da9dd0ba975f39fc -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision ad8707a3e0b0501d651993f3da9dd0ba975f39fc) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -71,7 +71,6 @@ import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -101,6 +100,8 @@ import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -1436,8 +1437,9 @@ HttpServletResponse response) { PedagogicalPlannerAction.log.debug("Saving grouping activity"); PedagogicalPlannerGroupingForm plannerForm = (PedagogicalPlannerGroupingForm) form; - ActionMessages errors = plannerForm.validate(); - if (errors.isEmpty()) { + MultiValueMap errorMap = new LinkedMultiValueMap<>(); + errorMap = plannerForm.validate(); + if (errorMap.isEmpty()) { Grouping grouping = getAuthoringService().getGroupingById(plannerForm.getToolContentID()); if (grouping.isRandomGrouping()) { RandomGrouping randomGrouping = (RandomGrouping) grouping; @@ -1465,7 +1467,8 @@ grouping.setMaxNumberOfGroups(number); } } else { - saveMessages(request, errors); + request.setAttribute("errorMap", errorMap); + ; } return mapping.findForward(PedagogicalPlannerAction.FORWARD_GROUPING); } Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java (.../PedagogicalPlannerActivityForm.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java (.../PedagogicalPlannerActivityForm.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -20,14 +20,10 @@ * **************************************************************** */ - package org.lamsfoundation.lams.web.planner; -import javax.servlet.http.HttpServletRequest; - import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessages; +import org.springframework.util.LinkedMultiValueMap; /** * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this @@ -80,21 +76,21 @@ this.callID = callID; } - @Override - public void reset(ActionMapping mapping, HttpServletRequest request) { - super.reset(mapping, request); - setValid(true); - } +// @Override +// public void reset(ActionMapping mapping, HttpServletRequest request) { +// super.reset(mapping, request); +// setValid(true); +// } /** * Validates form. Must set {@link #valid} property. Can be overriden by inheriting classes, although call to this * method is only in activities themselves (and not on a higher level like lams_central). * * @return */ - public ActionMessages validate() { + public LinkedMultiValueMap validate() { setValid(true); - return new ActionMessages(); + return new LinkedMultiValueMap<>(); } public Integer getActivityOrderNumber() { Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java =================================================================== diff -u -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java (.../PedagogicalPlannerActivitySpringForm.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java (.../PedagogicalPlannerActivitySpringForm.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -22,7 +22,7 @@ package org.lamsfoundation.lams.web.planner; -import org.apache.struts.action.ActionMessages; +import org.springframework.util.LinkedMultiValueMap; /** * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this @@ -85,9 +85,9 @@ * * @return */ - public ActionMessages validate() { + public LinkedMultiValueMap validate() { setValid(true); - return new ActionMessages(); + return new LinkedMultiValueMap<>(); } public Integer getActivityOrderNumber() { Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java (.../PedagogicalPlannerGroupingForm.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java (.../PedagogicalPlannerGroupingForm.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -29,6 +29,8 @@ import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping; import org.lamsfoundation.lams.learningdesign.RandomGrouping; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; /** * Form for grouping activities in Pedagogical Planner. @@ -101,8 +103,8 @@ * Checks if the provided group/learner number is a nonnegative integer. */ @Override - public ActionMessages validate() { - ActionMessages errors = new ActionMessages(); + public LinkedMultiValueMap validate() { + MultiValueMap errorMap = new LinkedMultiValueMap<>(); boolean valid = true; boolean numberValid = true; @@ -116,11 +118,11 @@ numberValid = false; } if (!numberValid) { - errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.planner.grouping.number.integer")); + errorMap.add("GLOBAL", "error.planner.grouping.number.integer"); valid = false; } setValid(valid); - return errors; + return (LinkedMultiValueMap) errorMap; } public String getLearnersPerGroup() { Index: lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorSpringUtil.java =================================================================== diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorSpringUtil.java (.../FileValidatorSpringUtil.java) (revision a2d72bee6029b7e05e8cd696c02db214f3049365) +++ lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorSpringUtil.java (.../FileValidatorSpringUtil.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -104,7 +104,7 @@ * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false. */ - public static boolean validateFileSize(MultipartFile file, boolean largeFile, Errors errors) { + public static boolean validateFileSize(MultipartFile file, boolean largeFile) { long fileSize = 0; try { fileSize = file.getSize(); @@ -119,7 +119,6 @@ String maxSize = FileValidatorSpringUtil.formatSize(maxFileSize); // set error message - errors.reject(MSG_KEY, new Object[] { maxSize }, null); return false; } return true; @@ -153,12 +152,12 @@ * @param largeFile * @return return null if file size is below max filesize, otherwise, return error message */ - public static Errors validateFileSize(MultipartFile file, Long fileSize, boolean largeFile, Errors errors) { + public static Errors validateFileSize(MultipartFile file, Long fileSize, boolean largeFile) { fileSize = file.getSize(); Errors errorMessage = null; - boolean isMaxFilesizeExceeded = !FileValidatorSpringUtil.validateFileSize(file, largeFile, errors); + boolean isMaxFilesizeExceeded = !FileValidatorSpringUtil.validateFileSize(file, largeFile); if (isMaxFilesizeExceeded) { - errorMessage = (Errors) errors.getAllErrors(); +// errorMessage = (Errors) errors.getAllErrors(); } return errorMessage; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -81,16 +81,16 @@ public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { NotebookPedagogicalPlannerForm plannerForm = (NotebookPedagogicalPlannerForm) form; - ActionMessages errors = plannerForm.validate(); - if (errors.isEmpty()) { - String instructions = plannerForm.getInstructions(); - Long toolContentID = plannerForm.getToolContentID(); - Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID); - notebook.setInstructions(instructions); - getNotebookService().saveOrUpdateNotebook(notebook); - } else { - saveErrors(request, errors); - } +// ActionMessages errors = plannerForm.validate(); +// if (errors.isEmpty()) { +// String instructions = plannerForm.getInstructions(); +// Long toolContentID = plannerForm.getToolContentID(); +// Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID); +// notebook.setInstructions(instructions); +// getNotebookService().saveOrUpdateNotebook(notebook); +// } else { +// saveErrors(request, errors); +// } return mapping.findForward(NotebookConstants.SUCCESS); } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -80,18 +80,18 @@ public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { WikiPedagogicalPlannerForm plannerForm = (WikiPedagogicalPlannerForm) form; - ActionMessages errors = plannerForm.validate(); - if (errors.isEmpty()) { - String instructions = plannerForm.getWikiBody(); - Long toolContentID = plannerForm.getToolContentID(); - Wiki wiki = getWikiService().getWikiByContentId(toolContentID); - WikiPage wikiPage = wiki.getWikiPages().iterator().next(); - wikiPage.setTitle(plannerForm.getTitle()); - wikiPage.getCurrentWikiContent().setBody(plannerForm.getWikiBody()); - getWikiService().saveOrUpdateWikiPage(wikiPage); - } else { - saveErrors(request, errors); - } +// ActionMessages errors = plannerForm.validate(); +// if (errors.isEmpty()) { +// String instructions = plannerForm.getWikiBody(); +// Long toolContentID = plannerForm.getToolContentID(); +// Wiki wiki = getWikiService().getWikiByContentId(toolContentID); +// WikiPage wikiPage = wiki.getWikiPages().iterator().next(); +// wikiPage.setTitle(plannerForm.getTitle()); +// wikiPage.getCurrentWikiContent().setBody(plannerForm.getWikiBody()); +// getWikiService().saveOrUpdateWikiPage(wikiPage); +// } else { +// saveErrors(request, errors); +// } return mapping.findForward("success"); } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java (.../WikiPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java (.../WikiPedagogicalPlannerForm.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) @@ -71,16 +71,16 @@ } } - @Override - public ActionMessages validate() { - ActionMessages errors = new ActionMessages(); - boolean valid = true; - if (StringUtils.isEmpty(getTitle())) { - ActionMessage error = new ActionMessage("label.wiki.add.title.required"); - errors.add(ActionMessages.GLOBAL_MESSAGE, error); - valid = false; - } - setValid(valid); - return errors; - } +// @Override +// public ActionMessages validate() { +// ActionMessages errors = new ActionMessages(); +// boolean valid = true; +// if (StringUtils.isEmpty(getTitle())) { +// ActionMessage error = new ActionMessage("label.wiki.add.title.required"); +// errors.add(ActionMessages.GLOBAL_MESSAGE, error); +// valid = false; +// } +// setValid(valid); +// return errors; +// } } \ No newline at end of file