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.126 -r1.127
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	31 Oct 2006 23:58:17 -0000	1.126
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	11 Nov 2006 19:01:54 -0000	1.127
@@ -521,10 +521,10 @@
 		boolean validateSingleCorrectCandidate=authoringUtil.validateSingleCorrectCandidate(caList);
 	    logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
 	    
-	    /*
+
 		boolean validateOnlyOneCorrectCandidate=authoringUtil.validateOnlyOneCorrectCandidate(caList);
 	    logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
-	    */
+
 	    
 	    
         ActionMessages errors = new ActionMessages();
@@ -541,14 +541,12 @@
             ActionMessage error = new ActionMessage("candidates.none.correct");
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
-        
-        /*
+
         if (!validateOnlyOneCorrectCandidate)
         {
             ActionMessage error = new ActionMessage("candidates.duplicate.correct");
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
-        */
         
         
         logger.debug("errors: " + errors);
@@ -955,11 +953,11 @@
 		boolean validateSingleCorrectCandidate=authoringUtil.validateSingleCorrectCandidate(caList);
 	    logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
 	    
-	    /*
+
 		boolean validateOnlyOneCorrectCandidate=authoringUtil.validateOnlyOneCorrectCandidate(caList);
 	    logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
-	    */
 
+
 	    
         ActionMessages errors = new ActionMessages();
         
@@ -977,13 +975,11 @@
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
         
-        /*
         if (!validateOnlyOneCorrectCandidate)
         {
             ActionMessage error = new ActionMessage("candidates.duplicate.correct");
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
-        */
         
         logger.debug("errors: " + errors);
 
@@ -1444,21 +1440,6 @@
         mcGeneralAuthoringDTO.setTotalMarks(totalMark);
 
         
-        /*
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
-		*/
-        
-
         logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
     	request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.31 -r1.32
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	31 Oct 2006 23:58:17 -0000	1.31
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	11 Nov 2006 19:01:54 -0000	1.32
@@ -1236,10 +1236,10 @@
 		boolean validateSingleCorrectCandidate=authoringUtil.validateSingleCorrectCandidate(caList);
 	    logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
 
-	    /*
+
 		boolean validateOnlyOneCorrectCandidate=authoringUtil.validateOnlyOneCorrectCandidate(caList);
 	    logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
-	    */
+
 	    
 	    
         ActionMessages errors = new ActionMessages();
@@ -1258,13 +1258,11 @@
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
 
-        /*
         if (!validateOnlyOneCorrectCandidate)
         {
             ActionMessage error = new ActionMessage("candidates.duplicate.correct");
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
-        */
         
         logger.debug("errors: " + errors);
 
@@ -1648,10 +1646,10 @@
 		boolean validateSingleCorrectCandidate=authoringUtil.validateSingleCorrectCandidate(caList);
 	    logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
 	    
-	    /*
+
 		boolean validateOnlyOneCorrectCandidate=authoringUtil.validateOnlyOneCorrectCandidate(caList);
 	    logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
-	    */
+
 	    
 	    
         ActionMessages errors = new ActionMessages();
@@ -1669,13 +1667,12 @@
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
 
-        /*
         if (!validateOnlyOneCorrectCandidate)
         {
             ActionMessage error = new ActionMessage("candidates.duplicate.correct");
 			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
         }
-        */
+
         logger.debug("errors: " + errors);
 
 	 	if(!errors.isEmpty()){
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	31 Oct 2006 23:58:18 -0000	1.7
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	11 Nov 2006 19:01:55 -0000	1.8
@@ -93,7 +93,9 @@
 				{
 					var msg = "<fmt:message key="candidates.duplicate.correct"/>";
 					alert(msg);
+					return false;
 				}
+				return true;
 			}
 			
 		</script>
@@ -159,7 +161,7 @@
 			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 
 			<div class="space-bottom-top">
-				<a href="#" onclick="validateDuplicateCorrectAnswers(); getElementById('newQuestionForm').submit();"
+				<a href="#" onclick="if (validateDuplicateCorrectAnswers()) { getElementById('newQuestionForm').submit(); }"
 					class="button-add-item"> <fmt:message key="label.save.question" />
 				</a>
 
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	31 Oct 2006 23:58:18 -0000	1.7
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	11 Nov 2006 19:01:55 -0000	1.8
@@ -75,7 +75,9 @@
 				{
 					var msg = "<fmt:message key="candidates.duplicate.correct"/>";
 					alert(msg);
+					return false;
 				}
+				return true;
 			}
 			
 		</script>
@@ -138,7 +140,7 @@
 			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 
 			<div class="space-bottom-top">
-				<a href="#" onclick="validateDuplicateCorrectAnswers(); getElementById('newQuestionForm').submit();"
+				<a href="#" onclick="if (validateDuplicateCorrectAnswers()) { getElementById('newQuestionForm').submit(); }"				
 					class="button-add-item"> <fmt:message key="label.save.question" />
 				</a>
 
Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/editQuestionBox.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/monitoring/editQuestionBox.jsp	31 Oct 2006 23:58:18 -0000	1.6
+++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp	11 Nov 2006 19:01:55 -0000	1.7
@@ -76,7 +76,9 @@
 				{
 					var msg = "<fmt:message key="candidates.duplicate.correct"/>";
 					alert(msg);
+					return false;
 				}
+				return true;
 			}
 			
 		</script>		
@@ -171,8 +173,8 @@
 						<table>
 							<tr>
 							<td> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-								<a href="#" onclick="validateDuplicateCorrectAnswers(); getElementById('newQuestionForm').submit();" class="button-add-item">
-									<fmt:message key="label.save.question" />
+								<a href="#" onclick="if (validateDuplicateCorrectAnswers()) { getElementById('newQuestionForm').submit(); }"
+									class="button-add-item"> <fmt:message key="label.save.question" />
 								</a>
 							</td> 
 	
Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/newQuestionBox.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/monitoring/newQuestionBox.jsp	31 Oct 2006 23:58:18 -0000	1.6
+++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp	11 Nov 2006 19:01:55 -0000	1.7
@@ -74,7 +74,9 @@
 				{
 					var msg = "<fmt:message key="candidates.duplicate.correct"/>";
 					alert(msg);
+					return false;
 				}
+				return true;
 			}
 			
 		</script>		
@@ -169,10 +171,9 @@
 						<table>
 							<tr>
 							<td> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-								<a href="#" onclick="validateDuplicateCorrectAnswers(); getElementById('newQuestionForm').submit();" class="button-add-item">
-									<fmt:message key="label.save.question" />
-								</a>
-							</td> 
+								<a href="#" onclick="if (validateDuplicateCorrectAnswers()) { getElementById('newQuestionForm').submit(); }"				
+									class="button-add-item"> <fmt:message key="label.save.question" />
+								</a>							
 	
 							<td>
 								<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">