Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r8e7bae5bbcffc1c7ef3bd8a9b280363d8bc24a9e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 8e7bae5bbcffc1c7ef3bd8a9b280363d8bc24a9e) @@ -178,14 +178,6 @@ private ActionForward init(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - // perform the actions for all the tabs. - doTabs(mapping, form, request, response); - - return mapping.findForward("load"); - } - - private ActionForward doTabs(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { //set back tool content ID String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); @@ -195,10 +187,12 @@ request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true)); - this.summary(mapping, form, request, response); - this.viewInstructions(mapping, form, request, response); - this.viewActivity(mapping, form, request, response, toolContentID); - this.statistic(mapping, form, request, response); + // perform the actions for all the tabs. + summary(request); + viewInstructions(request); + viewActivity(request); + statistic(request); + return mapping.findForward("load"); } @@ -212,8 +206,7 @@ * @param response * @return */ - private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + private void summary(HttpServletRequest request) { Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); forumService = getForumService(); @@ -271,8 +264,6 @@ // request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID); request.setAttribute("sessionUserMap", sessionUsersMap); - return mapping.findForward("success"); - } /** @@ -408,62 +399,36 @@ /** * View activity for content. * - * @param mapping - * @param form * @param request - * @param response - * @return */ - private ActionForward viewActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response, Long toolContentID) { - + private void viewActivity(HttpServletRequest request) { + Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + forumService = getForumService(); Forum forum = forumService.getForumByContentId(toolContentID); - // if can not find out forum, echo back error message - if (forum == null) { - ActionErrors errors = new ActionErrors(); - errors.add("activity.globel", new ActionMessage("error.fail.get.forum")); - this.addErrors(request, errors); - return mapping.getInputForward(); - } String title = forum.getTitle(); String instruction = forum.getInstructions(); boolean isForumEditable = ForumWebUtils.isForumEditable(forum); request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable)); request.setAttribute("title", title); request.setAttribute("instruction", instruction); - return mapping.findForward("success"); } /** * View instruction information for a content. * - * @param mapping - * @param form * @param request - * @param response - * @return */ - private ActionForward viewInstructions(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + private void viewInstructions(HttpServletRequest request) { Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); forumService = getForumService(); Forum forum = forumService.getForumByContentId(toolContentID); - // if can not find out forum, echo back error message - if (forum == null) { - ActionErrors errors = new ActionErrors(); - errors.add("instruction.globel", new ActionMessage("error.fail.get.forum")); - this.addErrors(request, errors); - return mapping.getInputForward(); - } - ForumForm forumForm = new ForumForm(); forumForm.setForum(forum); request.setAttribute("forumBean", forumForm); - return mapping.findForward("success"); } /** @@ -477,6 +442,16 @@ */ private ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + statistic(request); + return mapping.findForward("success"); + } + + /** + * Performs all necessary actions for showing statistic page. + * + * @param request + */ + private void statistic(HttpServletRequest request) { Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); forumService = getForumService(); @@ -527,7 +502,6 @@ request.setAttribute("topicList", sessionTopicsMap); request.setAttribute("markAverage", sessionAvaMarkMap); request.setAttribute("totalMessage", sessionTotalMsgMap); - return mapping.findForward("success"); } /**