Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.41 -r1.41.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	19 Feb 2009 23:59:13 -0000	1.41
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	1 Nov 2010 10:39:18 -0000	1.41.8.1
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
+import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
@@ -90,11 +91,11 @@
 	generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
 	generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
 	generalLearnerFlowDTO.setActivityOffline(new Boolean(qaContent.isRunOffline()).toString());
-
+	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString());
+	
 	generalLearnerFlowDTO.setTotalQuestionCount(new Integer(qaContent.getQaQueContents().size()));
 
-	Map mapQuestions = new TreeMap(new QaComparator());
-	Map mapFeedback = new TreeMap(new QaComparator());
+	Map<String, QaQuestionContentDTO> mapQuestions = new TreeMap();
 
 	Iterator contentIterator = qaContent.getQaQueContents().iterator();
 	while (contentIterator.hasNext()) {
@@ -105,18 +106,12 @@
 		    /*
 		     *  add the question to the questions Map in the displayOrder
 		     */
-		    mapQuestions.put(new Integer(displayOrder).toString(), qaQueContent.getQuestion());
-
-		    String feedback = qaQueContent.getFeedback();
-		    if (feedback == null)
-			feedback = "";
-
-		    mapFeedback.put(new Integer(displayOrder).toString(), feedback.trim());
+		    QaQuestionContentDTO questionDTO = new QaQuestionContentDTO(qaQueContent);
+		    mapQuestions.put(questionDTO.getDisplayOrder(), questionDTO );
 		}
 	    }
 	}
 
-	generalLearnerFlowDTO.setMapFeedback(mapFeedback);
 	generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
 	return generalLearnerFlowDTO;
     }
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.70.4.1 -r1.70.4.1.4.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	11 May 2009 04:36:35 -0000	1.70.4.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	1 Nov 2010 10:40:05 -0000	1.70.4.1.4.1
@@ -52,6 +52,7 @@
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
+import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
@@ -171,7 +172,8 @@
 	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 
 	/* holds the question contents for a given tool session and relevant content */
-	Map mapQuestions = new TreeMap(new QaComparator());
+	Map mapQuestionStrings = new TreeMap(new QaComparator());
+	Map mapQuestions = new TreeMap<String,QaQuestionContentDTO>();
 
 	/*holds the answers */
 	Map mapAnswers = new TreeMap(new QaComparator());
@@ -318,11 +320,15 @@
 		    /*
 		     *  add the question to the questions Map in the displayOrder
 		     */
-		    mapQuestions.put(new Integer(displayOrder).toString(), qaQueContent.getQuestion());
+		    QaQuestionContentDTO questionDTO = new QaQuestionContentDTO(qaQueContent);
+		    mapQuestions.put(questionDTO.getDisplayOrder(), questionDTO);
+
+		    mapQuestionStrings.put(new Integer(displayOrder).toString(), qaQueContent.getQuestion());
+		    
 		}
 	    }
 	}
-	generalLearnerFlowDTO.setMapQuestions(mapQuestions);
+	generalLearnerFlowDTO.setMapQuestions(mapQuestionStrings);
 	generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
 
 	Iterator itMapQuestions = mapQuestions.entrySet().iterator();