Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.66 -r1.67
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	24 Nov 2005 12:34:33 -0000	1.66
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	24 Nov 2005 13:56:02 -0000	1.67
@@ -419,7 +419,7 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward editOptions(ActionMapping mapping,
             ActionForm form,
@@ -1386,7 +1386,6 @@
 		String richTextEndLearningMessage=(String)request.getSession().getAttribute(RICHTEXT_END_LEARNING_MSG);
 		logger.debug("richTextEndLearningMessage: " + richTextEndLearningMessage);
 		
-		
 		mapQuestionsContent=AuthoringUtil.repopulateMap(request, "questionContent");
 	 	logger.debug("FINAL mapQuestionsContent after shrinking: " + mapQuestionsContent);
 	 	logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
@@ -1398,7 +1397,6 @@
 		McContent mcContent=mcService.retrieveMc(toolContentId);
 		logger.debug("mcContent:" + mcContent);
 		
-					
 		if (mcContent != null)
 		{
 			logger.debug("updating mcContent title and instructions:" + mcContent);
@@ -1476,7 +1474,7 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward viewFileItem(ActionMapping mapping,
             ActionForm form,
@@ -1562,15 +1560,15 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward doneAdvancedTab(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
     {
-    	logger.debug("dispatching advancedTabDone...");
+    	logger.debug("dispatching doneAdvancedTab...");
     	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 
@@ -1593,15 +1591,15 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward doneInstructionsTab(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
     {
-    	logger.debug("dispatching advancedTabDone...");
+    	logger.debug("dispatching doneInstructionsTab...");
     	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	
@@ -1623,7 +1621,7 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward submitOfflineFiles(ActionMapping mapping,
             ActionForm form,
@@ -1659,7 +1657,7 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward submitOnlineFiles(ActionMapping mapping,
             ActionForm form,
@@ -1839,9 +1837,7 @@
 		    redirect="true"
 	  	/>
 
-    </action>
-    */
-        /**
+     * </action>
      *  responds to learner activity in learner mode.
      * 
      * ActionForward displayMc(ActionMapping mapping,
@@ -1928,19 +1924,19 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward continueOptionsCombined(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 	{                                         
+		logger.debug("dispatching continueOptionsCombined...");
 		McLearningForm mcLearningForm = (McLearningForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	
-		logger.debug("continue options combined requested.");
-		/* process the answers */
+	 	/* process the answers */
 		Map mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
     	logger.debug("final mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
     	
@@ -2021,15 +2017,15 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward getNextOptions(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 	{
-		logger.debug("requested next options...");
+		logger.debug("dispatching getNextOptions...");
 		McLearningForm mcLearningForm = (McLearningForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 		
@@ -2067,15 +2063,15 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward redoQuestions(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 	{
-		logger.debug("requested redoQuestions...");
+		logger.debug("dispatching redoQuestions...");
 		McLearningForm mcLearningForm = (McLearningForm) form;
  		IMcService mcService =McUtils.getToolService(request);
  		
@@ -2105,15 +2101,15 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward viewAnswers(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 	{
-		logger.debug("requested view Answers, listall the answers user has given.");
+		logger.debug("dispatching viewAnswers...");
 		McLearningForm mcLearningForm = (McLearningForm) form;
  		IMcService mcService =McUtils.getToolService(request);
 		String totalQuestionCount= (String) request.getSession().getAttribute(TOTAL_QUESTION_COUNT);
@@ -2217,15 +2213,15 @@
      * @param request
      * @param form
      * @param mapping
-     * @return
+     * @return ActionForward
      */
     public ActionForward viewSummary(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 	{
-		logger.debug("requested results summary...");
+		logger.debug("dispatching viewSummary...");
 		McLearningForm mcLearningForm = (McLearningForm) form;
  		IMcService mcService =McUtils.getToolService(request);