Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v diff -u -r1.34 -r1.35 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 30 Aug 2006 06:37:38 -0000 1.34 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 31 Aug 2006 06:48:26 -0000 1.35 @@ -312,5 +312,13 @@ * @param entryText */ public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText); + /** + * Get reflection entry from notebook tool. + * @param sessionId + * @param idType + * @param signature + * @param userID + * @return + */ public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v diff -u -r1.45 -r1.46 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 30 Aug 2006 06:50:37 -0000 1.45 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 31 Aug 2006 06:48:26 -0000 1.46 @@ -204,10 +204,10 @@ sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS,forum.isAllowNewTopic()); sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor); sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber)); - sessionMap.put(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle()); sessionMap.put(ForumConstants.ATTR_REFLECTION_ON,forum.isReflectOnActivity()); sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION,forum.getReflectInstructions()); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); + sessionMap.put(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle()); sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions()); //add define later support @@ -253,7 +253,7 @@ forumService = getForumManager(); if (mode == ToolAccessMode.LEARNER || mode==ToolAccessMode.AUTHOR) { - if(!validateBeforeFinish(mapping, request, sessionMapID, sessionId)) + if(!validateBeforeFinish(request, sessionMapID)) return mapping.getInputForward(); String nextActivityUrl; @@ -326,9 +326,7 @@ //get session value String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - if(!validateBeforeFinish(mapping, request, sessionMapID, sessionId)) + if(!validateBeforeFinish(request, sessionMapID)) return mapping.getInputForward(); ReflectionForm refForm = (ReflectionForm) form; @@ -686,7 +684,10 @@ /** * Validation method to check whether user posts meet minimum number. */ - private boolean validateBeforeFinish(ActionMapping mapping, HttpServletRequest request, String sessionMapID, Long sessionId) { + private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) { + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); + ForumToolSession session = forumService.getSessionBySessionId(sessionId); Forum forum = session.getForum(); // get session from shared session.