Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.89 -r1.90 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 17 Jan 2014 22:04:44 -0000 1.89 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 18 Feb 2014 14:15:39 -0000 1.90 @@ -62,8 +62,6 @@ public static final String EDIT_RESPONSE = "editResponse"; public static final String EDITABLE_RESPONSE_ID = "editableResponseId"; public static final String COPY_TOOL_CONTENT = "copyToolContent"; - public static final String ERROR_LIST = "errorList"; - public static final String ERROR_LIST_LEARNER = "errorListLearner"; public static final String MAP_SEQUENTIAL_ANSWERS_KEY = "mapSequentialAnswersKey"; public static final String DEFAULT_CONTENT_ID_STR = "defaultContentIdStr"; public static final String TOOL_SESSION_ID = "toolSessionID"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java 17 Jan 2014 22:04:44 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java 18 Feb 2014 14:15:39 -0000 1.6 @@ -218,8 +218,6 @@ request.getSession().removeAttribute(EDIT_RESPONSE); request.getSession().removeAttribute(EDITABLE_RESPONSE_ID); request.getSession().removeAttribute(COPY_TOOL_CONTENT); - request.getSession().removeAttribute(ERROR_LIST); - request.getSession().removeAttribute(ERROR_LIST_LEARNER); request.getSession().removeAttribute(DEFAULT_CONTENT_ID_STR); request.getSession().removeAttribute(TOOL_SESSION_ID); request.getSession().removeAttribute(LOAD); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.81 -r1.82 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 17 Jan 2014 22:04:43 -0000 1.81 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 18 Feb 2014 14:15:39 -0000 1.82 @@ -113,16 +113,14 @@ if (!QaUtils.existsSession(new Long(toolSessionID).longValue(), qaService)) { QaUtils.cleanUpSessionAbsolute(request); - logger.error("error: The tool expects mcSession."); - return (mapping.findForward(ERROR_LIST_LEARNER)); + throw new ServletException("No session found"); } QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); if (qaContent == null) { QaUtils.cleanUpSessionAbsolute(request); - logger.error("error: The tool expects qaContent."); - return (mapping.findForward(ERROR_LIST_LEARNER)); + throw new ServletException("No QA content found"); } QaQueUsr qaUser = null; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.75 -r1.76 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 17 Jan 2014 22:04:43 -0000 1.75 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 18 Feb 2014 14:15:39 -0000 1.76 @@ -21,73 +21,6 @@ /** * @author Ozgur Demirtas - * - - - - - - - - - - - - - - - - - - - - - - - */ /* $$Id$$ */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v diff -u -r1.63 -r1.64 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 17 Jan 2014 22:04:43 -0000 1.63 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 18 Feb 2014 14:15:39 -0000 1.64 @@ -94,8 +94,9 @@ GeneralMonitoringDTO generalMonitoringDTO = new GeneralMonitoringDTO(); boolean initData = initialiseMonitoringData(mapping, qaMonitoringForm, request, response, qaService, generalMonitoringDTO); - if (initData == false) - return (mapping.findForward(ERROR_LIST)); + if (initData == false) { + throw new ServletException("Data not initialised in Monitoring"); + } qaMonitoringForm.setCurrentTab("1"); @@ -227,24 +228,24 @@ * @param request * @param mapping * @return ActionForward + * @throws ServletException */ protected ActionForward validateParameters(HttpServletRequest request, ActionMapping mapping, - QaMonitoringForm qaMonitoringForm) { + QaMonitoringForm qaMonitoringForm) throws ServletException { String strToolContentId = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); if ((strToolContentId == null) || (strToolContentId.length() == 0)) { QaUtils.cleanUpSessionAbsolute(request); - return (mapping.findForward(ERROR_LIST)); + 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) { - logger.error("add error.contentId.numberFormatException to ActionMessages."); QaUtils.cleanUpSessionAbsolute(request); - return (mapping.findForward(ERROR_LIST)); + throw e; } } return null; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.79 -r1.80 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 17 Jan 2014 22:04:43 -0000 1.79 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 18 Feb 2014 14:15:39 -0000 1.80 @@ -263,7 +263,7 @@ if (strToolContentID == null || strToolContentID.equals("")) { QaUtils.cleanUpSessionAbsolute(request); - return mapping.findForward(QaAppConstants.ERROR_LIST); + throw new ServletException("No Tool Content ID found"); } qaAuthoringForm.setToolContentID(strToolContentID); @@ -290,10 +290,7 @@ if (qaService.isStudentActivityOccurredGlobal(qaContent)) { QaUtils.cleanUpSessionAbsolute(request); - - //add error.content.inUse to ActionMessages. - persistError(request, "error.content.inUse"); - return mapping.findForward(QaAppConstants.ERROR_LIST); + throw new ServletException("Content in use"); } qaContent = retrieveContent(request, mapping, qaAuthoringForm, new Long( strToolContentID).longValue(), false, qaService, qaGeneralAuthoringDTO, sessionMap);