Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml,v diff -u -r1.3.10.1 -r1.3.10.2 --- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml 16 Mar 2011 19:58:18 -0000 1.3.10.1 +++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml 22 Mar 2011 16:38:45 -0000 1.3.10.2 @@ -30,7 +30,7 @@ Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml,v diff -u -r1.10.6.1.4.3 -r1.10.6.1.4.4 --- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 16 Mar 2011 19:58:19 -0000 1.10.6.1.4.3 +++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 22 Mar 2011 16:38:45 -0000 1.10.6.1.4.4 @@ -190,7 +190,7 @@ Fisheye: Tag 1.3.12.2 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQuestion.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml,v diff -u -r1.2.12.2 -r1.2.12.3 --- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml 16 Mar 2011 19:58:19 -0000 1.2.12.2 +++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml 22 Mar 2011 16:38:45 -0000 1.2.12.3 @@ -51,7 +51,7 @@ questions = new TreeSet(new QaQueContentComparator()); + private Set questions = new TreeSet(new QaQueContentComparator()); private static Logger log = Logger.getLogger(QaCondition.class); public SortedSet temporaryQuestionDTOSet = new TreeSet( @@ -65,15 +65,15 @@ public QaCondition(QaConditionDTO conditionDTO) { super(conditionDTO); - for (QaQuestion question : conditionDTO.getQuestions()) { - QaQuestion questionCopy = new QaQuestion(question.getQuestion(), question.getDisplayOrder(), null, + for (QaQueContent question : conditionDTO.getQuestions()) { + QaQueContent questionCopy = new QaQueContent(question.getQuestion(), question.getDisplayOrder(), null, question.isRequired(), null, null); getQuestions().add(questionCopy); } } public QaCondition(Long conditionId, Integer conditionUIID, Integer orderId, String name, String displayName, - String allWords, String phrase, String anyWords, String excludedWords, Set questions) { + String allWords, String phrase, String anyWords, String excludedWords, Set questions) { super(conditionId, conditionUIID, orderId, name, displayName, BranchCondition.OUTPUT_TYPE_COMPLEX, null, null, null, allWords, phrase, anyWords, excludedWords); setQuestions(questions); @@ -89,7 +89,7 @@ // the condition "knows" it's an array of strings, i.e. user's answers String[] answers = (String[]) value.getValue(); result = true; - for (QaQuestion question : questions) { + for (QaQueContent question : questions) { String textToMatch = answers[question.getDisplayOrder() - 1]; textToMatch = WebUtil.removeHTMLtags(textToMatch); result &= matches(textToMatch); @@ -106,11 +106,11 @@ return result; } - public Set getQuestions() { + public Set getQuestions() { return questions; } - public void setQuestions(Set questions) { + public void setQuestions(Set questions) { this.questions = questions; } @@ -119,7 +119,7 @@ */ @Override public Object clone() { - Set questionsCopy = new TreeSet(new QaQueContentComparator()); + Set questionsCopy = new TreeSet(new QaQueContentComparator()); questionsCopy.addAll(questions); return new QaCondition(null, null, orderId, name, displayName, allWords, phrase, anyWords, excludedWords, questionsCopy); @@ -134,10 +134,10 @@ @Override public QaCondition clone(int uiidOffset) { Integer newConditionUIID = LearningDesign.addOffset(conditionUIID, uiidOffset); - Set questionsCopy = new TreeSet(new QaQueContentComparator()); + Set questionsCopy = new TreeSet(new QaQueContentComparator()); - for (QaQuestion question : getQuestions()) { - QaQuestion questionCopy = new QaQuestion(question.getQuestion(), question.getDisplayOrder(), null, + for (QaQueContent question : getQuestions()) { + QaQueContent questionCopy = new QaQueContent(question.getQuestion(), question.getDisplayOrder(), null, question.isRequired(), null, null); questionsCopy.add(questionCopy); } @@ -152,9 +152,9 @@ */ public QaCondition clone(QaContent qaContent) { - Set questionsCopy = new TreeSet(new QaQueContentComparator()); - for (QaQuestion conditionQuestion : getQuestions()) { - for (QaQuestion contentQuestion : (Set) qaContent.getQaQuestions()) { + Set questionsCopy = new TreeSet(new QaQueContentComparator()); + for (QaQueContent conditionQuestion : getQuestions()) { + for (QaQueContent contentQuestion : (Set) qaContent.getQaQueContents()) { if (conditionQuestion.getDisplayOrder() == contentQuestion.getDisplayOrder()) { questionsCopy.add(contentQuestion); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v diff -u -r1.22.4.1.4.2 -r1.22.4.1.4.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 16 Mar 2011 19:51:48 -0000 1.22.4.1.4.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 22 Mar 2011 16:38:45 -0000 1.22.4.1.4.3 @@ -55,7 +55,6 @@ * to the tool by the database. */ public class QaContent implements Serializable { - static Logger logger = Logger.getLogger(QaContent.class.getName()); /** identifier field */ private Long uid; @@ -124,7 +123,7 @@ private Date updateDate; /** persistent field */ - private Set qaQuestions; + private Set qaQueContents; /** persistent field */ private Set qaSessions; @@ -166,12 +165,11 @@ this.reflectionSubject = reflectionSubject; this.creationDate = creationDate; this.updateDate = updateDate; - this.qaQuestions = qaQueContents; + this.qaQueContents = qaQueContents; this.qaSessions = qaSessions; this.qaUploadedFiles = qaUploadedFiles; this.conditions = conditions; this.allowRichEditor = allowRichEditor; - QaContent.logger.debug(QaContent.logger + " " + this.getClass().getName() + "in full constructor: QaContent()"); } /** @@ -195,7 +193,7 @@ qa.getReflectionSubject(), qa.getCreationDate(), qa.getUpdateDate(), new TreeSet(), new TreeSet(), new TreeSet(), new TreeSet(new TextSearchConditionComparator()), qa.isAllowRichEditor()); - newContent.setQaQuestions(qa.deepCopyQaQueContent(newContent)); + newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent)); newContent.setQaUploadedFiles(qa.deepCopyQaAttachments(toolContentHandler, newContent)); newContent.setConditions(qa.deepCopyConditions(newContent)); @@ -204,9 +202,9 @@ public Set deepCopyQaQueContent(QaContent newQaContent) { Set newQaQueContent = new TreeSet(); - for (Iterator i = this.getQaQuestions().iterator(); i.hasNext();) { - QaQuestion queContent = (QaQuestion) i.next(); - newQaQueContent.add(QaQuestion.newInstance(queContent, newQaContent)); + for (Iterator i = this.getQaQueContents().iterator(); i.hasNext();) { + QaQueContent queContent = (QaQueContent) i.next(); + newQaQueContent.add(QaQueContent.newInstance(queContent, newQaContent)); } return newQaQueContent; } @@ -241,15 +239,15 @@ return new TreeSet(); } - public Set getQaQuestions() { - if (qaQuestions == null) { - setQaQuestions(new TreeSet()); + public Set getQaQueContents() { + if (qaQueContents == null) { + setQaQueContents(new TreeSet()); } - return qaQuestions; + return qaQueContents; } - public void setQaQuestions(Set qaQueContents) { - this.qaQuestions = qaQueContents; + public void setQaQueContents(Set qaQueContents) { + this.qaQueContents = qaQueContents; } public Set getQaSessions() { @@ -578,21 +576,6 @@ } /** - * @return Returns the logger. - */ - public static Logger getLogger() { - return QaContent.logger; - } - - /** - * @param logger - * The logger to set. - */ - public static void setLogger(Logger logger) { - QaContent.logger = logger; - } - - /** * @return Returns the creationDate. */ public Date getCreationDate() { Fisheye: Tag 1.14.8.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestion.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUploadedFile.java,v diff -u -r1.15.8.1 -r1.15.8.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 16 Mar 2011 19:51:48 -0000 1.15.8.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 22 Mar 2011 16:38:46 -0000 1.15.8.2 @@ -43,9 +43,9 @@ */ /** - * QaQuestion Value Object The value object that maps to our model database + * QaQueContent Value Object The value object that maps to our model database * table: tl_laqa11_que_content The relevant hibernate mapping resides in: - * QaQuestion.hbm.xml + * QaQueContent.hbm.xml * * Holds question content within a particular content */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java,v diff -u -r1.10.8.1 -r1.10.8.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java 16 Mar 2011 19:51:48 -0000 1.10.8.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java 22 Mar 2011 16:38:46 -0000 1.10.8.2 @@ -53,7 +53,7 @@ private Date attemptTime; /** nullable persistent field */ - private QaQuestion qaQuestion; + private QaQueContent qaQuestion; private boolean visible; @@ -65,7 +65,7 @@ /** full constructor */ public QaUsrResp(Long responseId, String answer, Date attemptTime, String timezone, - QaQuestion qaQuestion, QaQueUsr qaQueUser) { + QaQueContent qaQuestion, QaQueUsr qaQueUser) { this.responseId = responseId; this.answer = answer; this.attemptTime = attemptTime; @@ -74,7 +74,7 @@ this.qaQueUser = qaQueUser; } - public QaUsrResp(String answer, Date attemptTime, String timezone, QaQuestion qaQuestion, + public QaUsrResp(String answer, Date attemptTime, String timezone, QaQueContent qaQuestion, QaQueUsr qaQueUser) { this.answer = answer; this.attemptTime = attemptTime; @@ -83,7 +83,7 @@ this.qaQueUser = qaQueUser; } - public QaUsrResp(String answer, Date attemptTime, String timezone, QaQuestion qaQuestion, + public QaUsrResp(String answer, Date attemptTime, String timezone, QaQueContent qaQuestion, QaQueUsr qaQueUser, boolean visible) { this.answer = answer; this.attemptTime = attemptTime; @@ -159,15 +159,15 @@ /** * @return Returns the qaQuestion. */ - public QaQuestion getQaQuestion() { + public QaQueContent getQaQuestion() { return qaQuestion; } /** * @param qaQuestion * The qaQuestion to set. */ - public void setQaQuestion(QaQuestion qaQuestion) { + public void setQaQuestion(QaQueContent qaQuestion) { this.qaQuestion = qaQuestion; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java 18 Mar 2011 17:58:14 -0000 1.1.2.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java 22 Mar 2011 16:38:47 -0000 1.1.2.3 @@ -26,7 +26,7 @@ import java.util.List; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; /** * @@ -35,19 +35,19 @@ */ public interface IQaQuestionDAO { - public void createQueContent(QaQuestion queContent); + public void createQueContent(QaQueContent queContent); - public void saveOrUpdateQaQueContent(QaQuestion qaQuestion); + public void saveOrUpdateQaQueContent(QaQueContent qaQuestion); public void removeQueContent(long qaQueContentId); - public void removeQaQueContent(QaQuestion qaQuestion); + public void removeQaQueContent(QaQueContent qaQuestion); public List getAllQuestionEntries(final long contentUid); - public QaQuestion getQuestionContentByQuestionText(final String question, Long contentUid); + public QaQueContent getQuestionContentByQuestionText(final String question, Long contentUid); - public QaQuestion getQuestionByDisplayOrder(Long displayOrder, Long contentUid); + public QaQueContent getQuestionByDisplayOrder(Long displayOrder, Long contentUid); public List getAllQuestionEntriesSorted(final long �ontentUid); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java,v diff -u -r1.20.8.1 -r1.20.8.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java 16 Mar 2011 19:53:07 -0000 1.20.8.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java 22 Mar 2011 16:38:47 -0000 1.20.8.2 @@ -32,7 +32,7 @@ import org.hibernate.Session; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaContentDAO; import org.springframework.orm.hibernate3.HibernateCallback; import org.springframework.orm.hibernate3.HibernateTemplate; @@ -133,7 +133,7 @@ public void removeQuestionsFromCache(QaContent qaContent) { if (qaContent != null) { - for (QaQuestion question : (Set) qaContent.getQaQuestions()) { + for (QaQueContent question : (Set) qaContent.getQaQueContents()) { getHibernateTemplate().evict(question); } getHibernateTemplate().evict(qaContent); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v diff -u -r1.22.8.1 -r1.22.8.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 16 Mar 2011 19:53:07 -0000 1.22.8.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 22 Mar 2011 16:38:47 -0000 1.22.8.2 @@ -46,7 +46,7 @@ private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSession"; private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSessionId"; - private static final String GET_USER_COUNT_FOR_CONTENT = "select count(*) from QaQueUsr quser, QaSession qses, QaQuestion qcon where " + private static final String GET_USER_COUNT_FOR_CONTENT = "select count(*) from QaQueUsr quser, QaSession qses, QaQueContent qcon where " + "quser.qaSession=qses and " + "qses.qaContent=qcon and " + "qcon.uid=:uid"; public int countSessionUser(QaSession qaSession) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java 18 Mar 2011 17:58:14 -0000 1.1.2.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java 22 Mar 2011 16:38:47 -0000 1.1.2.3 @@ -29,7 +29,7 @@ import org.apache.log4j.Logger; import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO; import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; @@ -39,30 +39,30 @@ * */ public class QaQuestionDAO extends HibernateDaoSupport implements IQaQuestionDAO { - private static final String LOAD_QUESTION_BY_CONTENT_UID = "from qaQuestion in class QaQuestion where qaQuestion.qaContent.uid=:uid"; - private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from qaQuestion in class QaQuestion where qaQuestion.question=:question and qaQuestion.qaContent.uid=:uid"; - private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from qaQuestion in class QaQuestion where qaQuestion.displayOrder=:displayOrder and qaQuestion.qaContent.uid=:uid"; - private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from qaQuestion in class QaQuestion where qaQuestion.qaContent.uid=:uid order by qaQuestion.displayOrder"; + private static final String LOAD_QUESTION_BY_CONTENT_UID = "from qaQuestion in class QaQueContent where qaQuestion.qaContent.uid=:uid"; + private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from qaQuestion in class QaQueContent where qaQuestion.question=:question and qaQuestion.qaContent.uid=:uid"; + private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from qaQuestion in class QaQueContent where qaQuestion.displayOrder=:displayOrder and qaQuestion.qaContent.uid=:uid"; + private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from qaQuestion in class QaQueContent where qaQuestion.qaContent.uid=:uid order by qaQuestion.displayOrder"; - public QaQuestion getQuestionContentByQuestionText(final String question, Long contentUid) { + public QaQueContent getQuestionContentByQuestionText(final String question, Long contentUid) { HibernateTemplate templ = this.getHibernateTemplate(); List list = getSession().createQuery(QaQuestionDAO.LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT).setString( "question", question).setLong("uid", contentUid.longValue()).list(); if (list != null && list.size() > 0) { - QaQuestion qa = (QaQuestion) list.get(0); + QaQueContent qa = (QaQueContent) list.get(0); return qa; } return null; } - public QaQuestion getQuestionByDisplayOrder(Long displayOrder, Long contentUid) { + public QaQueContent getQuestionByDisplayOrder(Long displayOrder, Long contentUid) { List list = getSession().createQuery(QaQuestionDAO.LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER).setLong( "displayOrder", displayOrder.longValue()).setLong("uid", contentUid.longValue()).list(); if (list != null && list.size() > 0) { - QaQuestion qa = (QaQuestion) list.get(0); + QaQueContent qa = (QaQueContent) list.get(0); return qa; } return null; @@ -84,24 +84,24 @@ return list; } - public void createQueContent(QaQuestion queContent) { + public void createQueContent(QaQueContent queContent) { this.getSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(queContent); } - public void saveOrUpdateQaQueContent(QaQuestion qaQuestion) { + public void saveOrUpdateQaQueContent(QaQueContent qaQuestion) { this.getSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(qaQuestion); } public void removeQueContent(long qaQueContentId) { - QaQuestion qaQuestion = (QaQuestion) this.getHibernateTemplate().load(QaQuestion.class, + QaQueContent qaQuestion = (QaQueContent) this.getHibernateTemplate().load(QaQueContent.class, new Long(qaQueContentId)); this.getSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaQuestion); } - public void removeQaQueContent(QaQuestion qaQuestion) { + public void removeQaQueContent(QaQueContent qaQuestion) { this.getSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaQuestion); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java 16 Mar 2011 19:53:59 -0000 1.1.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java 22 Mar 2011 16:38:48 -0000 1.1.2.2 @@ -28,26 +28,26 @@ import org.lamsfoundation.lams.learningdesign.dto.TextSearchConditionDTO; import org.lamsfoundation.lams.tool.qa.QaCondition; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.util.QaQueContentComparator; public class QaConditionDTO extends TextSearchConditionDTO { - private Set questions = new TreeSet(new QaQueContentComparator()); + private Set questions = new TreeSet(new QaQueContentComparator()); public QaConditionDTO(QaCondition condition, Integer toolActivityUIID) { super(condition, toolActivityUIID); - for (QaQuestion question : condition.getQuestions()) { - QaQuestion questionCopy = new QaQuestion(question.getQuestion(), question.getDisplayOrder(), null, + for (QaQueContent question : condition.getQuestions()) { + QaQueContent questionCopy = new QaQueContent(question.getQuestion(), question.getDisplayOrder(), null, question.isRequired(), null, null); getQuestions().add(questionCopy); } } - public Set getQuestions() { + public Set getQuestions() { return questions; } - public void setQuestions(Set questions) { + public void setQuestions(Set questions) { this.questions = questions; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java 16 Mar 2011 19:54:00 -0000 1.1.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java 22 Mar 2011 16:38:48 -0000 1.1.2.2 @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.qa.dto; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; /** *

@@ -45,7 +45,7 @@ "displayOrder:", displayOrder).append("required:", Boolean.toString(required)).toString(); } - public QaQuestionDTO(QaQuestion que) { + public QaQuestionDTO(QaQueContent que) { this.question = que.getQuestion(); this.displayOrder = new Integer(que.getDisplayOrder()).toString(); this.feedback = que.getFeedback() != null ? que.getFeedback() : " "; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.54.8.2 -r1.54.8.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 16 Mar 2011 19:55:29 -0000 1.54.8.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 22 Mar 2011 16:38:47 -0000 1.54.8.3 @@ -37,7 +37,7 @@ import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUploadedFile; import org.lamsfoundation.lams.tool.qa.QaUsrResp; @@ -84,25 +84,25 @@ */ void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder); - public void createQaQue(QaQuestion qaQuestion) throws QaApplicationException; + public void createQaQue(QaQueContent qaQuestion) throws QaApplicationException; - public void removeQaQueContent(QaQuestion qaQuestion) throws QaApplicationException; + public void removeQaQueContent(QaQueContent qaQuestion) throws QaApplicationException; public void createQaUsrResp(QaUsrResp qaUsrResp) throws QaApplicationException; public void updateUserResponse(QaUsrResp resp) throws QaApplicationException; public QaUsrResp getResponseById(Long responseId) throws QaApplicationException; - public QaQuestion getQuestionContentByQuestionText(final String question, Long contentUid) + public QaQueContent getQuestionContentByQuestionText(final String question, Long contentUid) throws QaApplicationException; - public QaQuestion getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid) + public QaQueContent getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid) throws QaApplicationException; public List getAllQuestionEntriesSorted(final long qaContentId) throws QaApplicationException; - public void saveOrUpdateQaQueContent(QaQuestion qaQuestion) throws QaApplicationException; + public void saveOrUpdateQaQueContent(QaQueContent qaQuestion) throws QaApplicationException; /** * Return the qa session object according to the requested session id. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java,v diff -u -r1.4.8.2 -r1.4.8.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java 16 Mar 2011 19:55:29 -0000 1.4.8.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java 22 Mar 2011 16:38:47 -0000 1.4.8.3 @@ -24,7 +24,8 @@ import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaUsrResp; /** * Import filter class for different versions of Q&A content. @@ -42,8 +43,11 @@ } public void up20081126To20101022() { - this.removeField(QaQuestion.class, "isOptional"); - this.addField(QaQuestion.class, "required", new Boolean(false)); - + this.removeField(QaQueContent.class, "isOptional"); + this.addField(QaQueContent.class, "required", new Boolean(false)); } + + public void up201010226To20110217() { + this.removeField(QaUsrResp.class, "hidden"); + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java,v diff -u -r1.9.8.1 -r1.9.8.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java 16 Mar 2011 19:55:28 -0000 1.9.8.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java 22 Mar 2011 16:38:47 -0000 1.9.8.2 @@ -39,7 +39,7 @@ import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; @@ -64,7 +64,7 @@ // adding all existing conditions allAnswersDefinition.setDefaultConditions(new ArrayList(qaContent.getConditions())); // if no conditions were created in the tool instance, a default condition is added; - if (allAnswersDefinition.getDefaultConditions().isEmpty() && !qaContent.getQaQuestions().isEmpty()) { + if (allAnswersDefinition.getDefaultConditions().isEmpty() && !qaContent.getQaQueContents().isEmpty()) { QaCondition defaultCondition = createDefaultComplexCondition(qaContent); qaContent.getConditions().add(defaultCondition); @@ -131,11 +131,11 @@ QaSession session = qaService.retrieveQaSession(toolSessionId); QaContent qaContent = session.getQaContent(); - Set questions = qaContent.getQaQuestions(); + Set questions = qaContent.getQaQueContents(); String[] answers = new String[questions.size()]; QaQueUsr user = qaService.getUserByIdAndSession(learnerId, session.getQaSessionId()); - for (QaQuestion question : questions) { + for (QaQueContent question : questions) { QaUsrResp response = qaService.getResponseByUserAndQuestion(user.getQueUsrId(), question.getUid()); if (response != null) { answers[question.getDisplayOrder() - 1] = response.getAnswer(); @@ -168,11 +168,11 @@ * @return default Q&A condition */ protected QaCondition createDefaultComplexCondition(QaContent qaContent) { - if (qaContent.getQaQuestions().isEmpty()) { + if (qaContent.getQaQueContents().isEmpty()) { return null; } - Set questions = new HashSet(); - questions.add((QaQuestion) qaContent.getQaQuestions().iterator().next()); + Set questions = new HashSet(); + questions.add((QaQueContent) qaContent.getQaQueContents().iterator().next()); String name = buildConditionName(QaAppConstants.TEXT_SEARCH_DEFINITION_NAME, qaContent.getQaContentId() .toString()); // Default condition checks if the first answer contains word "LAMS" Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.88.8.3 -r1.88.8.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 18 Mar 2011 17:58:14 -0000 1.88.8.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 22 Mar 2011 16:38:47 -0000 1.88.8.4 @@ -72,7 +72,7 @@ import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUploadedFile; import org.lamsfoundation.lams.tool.qa.QaUsrResp; @@ -178,7 +178,7 @@ } - public QaQuestion getQuestionContentByQuestionText(final String question, Long contentUid) + public QaQueContent getQuestionContentByQuestionText(final String question, Long contentUid) throws QaApplicationException { try { return qaQuestionDAO.getQuestionContentByQuestionText(question, contentUid); @@ -189,7 +189,7 @@ } } - public QaQuestion getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid) + public QaQueContent getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid) throws QaApplicationException { try { return qaQuestionDAO.getQuestionByDisplayOrder(displayOrder, contentUid); @@ -200,7 +200,7 @@ } } - public void saveOrUpdateQaQueContent(QaQuestion qaQuestion) throws QaApplicationException { + public void saveOrUpdateQaQueContent(QaQueContent qaQuestion) throws QaApplicationException { try { qaQuestionDAO.saveOrUpdateQaQueContent(qaQuestion); @@ -211,7 +211,7 @@ } - public void createQaQue(QaQuestion qaQuestion) throws QaApplicationException { + public void createQaQue(QaQueContent qaQuestion) throws QaApplicationException { try { qaQuestionDAO.createQueContent(qaQuestion); } catch (DataAccessException e) { @@ -322,7 +322,7 @@ updateQa(qaContent); } - QaQuestion question = getQuestionByContentAndDisplayOrder(new Long(questionDisplayOrder), + QaQueContent question = getQuestionByContentAndDisplayOrder(new Long(questionDisplayOrder), qaContent.getUid()); @@ -489,7 +489,7 @@ } } - public void removeQaQueContent(QaQuestion qaQuestion) throws QaApplicationException { + public void removeQaQueContent(QaQueContent qaQuestion) throws QaApplicationException { try { qaQuestionDAO.removeQaQueContent(qaQuestion); } catch (DataAccessException e) { @@ -734,8 +734,8 @@ // don't export following fields value toolContentObj.setQaSessions(null); - Set questions = toolContentObj.getQaQuestions(); - for (QaQuestion question : questions) { + Set questions = toolContentObj.getQaQueContents(); + for (QaQueContent question : questions) { question.setQaQueUsers(null); question.setQaContent(null); } @@ -784,8 +784,8 @@ toolContentObj.setCreatedBy(newUserUid); // set back the tool content - Set questions = toolContentObj.getQaQuestions(); - for (QaQuestion question : questions) { + Set questions = toolContentObj.getQaQueContents(); + for (QaQueContent question : questions) { question.setQaContent(toolContentObj); } Set files = toolContentObj.getQaUploadedFiles(); @@ -1386,12 +1386,12 @@ // setQaSessions(Set qaSessions); // set up question from body - QaQuestion question = new QaQuestion(); + QaQueContent question = new QaQueContent(); String content = WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY)); question.setQuestion(content); question.setDisplayOrder(1); question.setQaContent(toolContentObj); - toolContentObj.getQaQuestions().add(question); + toolContentObj.getQaQueContents().add(question); qaDAO.saveOrUpdateQa(toolContentObj); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java,v diff -u -r1.2.8.1 -r1.2.8.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java 16 Mar 2011 19:55:28 -0000 1.2.8.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java 22 Mar 2011 16:38:48 -0000 1.2.8.2 @@ -2,20 +2,20 @@ import java.util.Comparator; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; /** - * Comparator for QaQuestion. Only the display order is + * Comparator for QaQueContent. Only the display order is * compared. * * @author Marcin Cieslak */ -public class QaQueContentComparator implements Comparator { +public class QaQueContentComparator implements Comparator { /** * {@inheritDoc} */ - public int compare(QaQuestion o1, QaQuestion o2) { + public int compare(QaQueContent o1, QaQueContent o2) { if (o1 != null && o2 != null) { return o1.getDisplayOrder() - o2.getDisplayOrder(); } else if (o1 != null) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v diff -u -r1.49.4.1.4.7 -r1.49.4.1.4.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 18 Mar 2011 17:58:14 -0000 1.49.4.1.4.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 22 Mar 2011 16:38:47 -0000 1.49.4.1.4.8 @@ -43,7 +43,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; import org.lamsfoundation.lams.tool.qa.service.IQaService; import org.lamsfoundation.lams.tool.qa.util.QaComparator; @@ -438,9 +438,9 @@ qaContent = qaService.getQa(new Long(strToolContentID).longValue()); for (QaCondition condition : conditions) { - condition.setQuestions(new TreeSet(new QaQueContentComparator())); + condition.setQuestions(new TreeSet(new QaQueContentComparator())); for (QaQuestionDTO dto : condition.temporaryQuestionDTOSet) { - for (QaQuestion queContent : (Set) qaContent.getQaQuestions()) { + for (QaQueContent queContent : (Set) qaContent.getQaQueContents()) { if (dto.getDisplayOrder().equals(String.valueOf(queContent.getDisplayOrder()))) { condition.getQuestions().add(queContent); } @@ -472,7 +472,7 @@ while (listIterator.hasNext()) { ++mapIndex; - QaQuestion queContent = (QaQuestion) listIterator.next(); + QaQueContent queContent = (QaQueContent) listIterator.next(); //Checking whether to remove question with id queContent.getUid() entryUsed = false; @@ -487,7 +487,7 @@ if (entryUsed == false) { - QaQuestion removeableQaQueContent = qaService.getQuestionContentByQuestionText(queContent + QaQueContent removeableQaQueContent = qaService.getQuestionContentByQuestionText(queContent .getQuestion(), qaContent.getUid()); if (removeableQaQueContent != null) { //Removing question with id removeableQaQueContent.getUid() @@ -522,11 +522,11 @@ ++displayOrder; - QaQuestion existingQaQueContent = qaService.getQuestionContentByQuestionText(questionText, qaContent.getUid()); + QaQueContent existingQaQueContent = qaService.getQuestionContentByQuestionText(questionText, qaContent.getUid()); if (existingQaQueContent == null) { - QaQuestion queContent = new QaQuestion(questionText, displayOrder, questionContentDTO.getFeedback(), + QaQueContent queContent = new QaQueContent(questionText, displayOrder, questionContentDTO.getFeedback(), questionContentDTO.isRequired(), qaContent, null); - qaContent.getQaQuestions().add(queContent); + qaContent.getQaQueContents().add(queContent); queContent.setQaContent(qaContent); AuthoringUtil.logger.info("Creating new question with question=" + queContent.getQuestion() + ", displayOrder=" + queContent.getDisplayOrder()); @@ -572,9 +572,9 @@ Iterator listIterator = sortedQuestions.iterator(); int displayOrder = 1; while (listIterator.hasNext()) { - QaQuestion queContent = (QaQuestion) listIterator.next(); + QaQueContent queContent = (QaQueContent) listIterator.next(); - QaQuestion existingQaQueContent = qaService.getQuestionContentByQuestionText( + QaQueContent existingQaQueContent = qaService.getQuestionContentByQuestionText( queContent.getQuestion(), qaContent.getUid()); existingQaQueContent.setDisplayOrder(displayOrder); qaService.saveOrUpdateQaQueContent(existingQaQueContent); 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.8.4 -r1.41.8.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 18 Mar 2011 17:58:14 -0000 1.41.8.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 22 Mar 2011 16:38:46 -0000 1.41.8.5 @@ -37,7 +37,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO; @@ -90,11 +90,11 @@ generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString()); generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString()); - generalLearnerFlowDTO.setTotalQuestionCount(new Integer(qaContent.getQaQuestions().size())); + generalLearnerFlowDTO.setTotalQuestionCount(new Integer(qaContent.getQaQueContents().size())); //create mapQuestions Map mapQuestions = new TreeMap(); - for (QaQuestion question : qaContent.getQaQuestions()) { + for (QaQueContent question : qaContent.getQaQueContents()) { int displayOrder = question.getDisplayOrder(); if (displayOrder != 0) { //add the question to the questions Map in the displayOrder @@ -128,18 +128,18 @@ // // check if Attempt to Entry is allowed, if so create the responses // if (!user.isResponseFinalized() || !qaContent.isLockWhenFinished()) { // -// Set questionsToStore; +// Set questionsToStore; // if (qaContent.isQuestionsSequenced()) { // String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex(); -// QaQuestion currentQuestion = qaService.getQuestionContentByDisplayOrder(new Long(currentQuestionIndex), qaContent.getQaContentId()); -// questionsToStore = new LinkedHashSet(); +// QaQueContent currentQuestion = qaService.getQuestionContentByDisplayOrder(new Long(currentQuestionIndex), qaContent.getQaContentId()); +// questionsToStore = new LinkedHashSet(); // questionsToStore.add(currentQuestion); // // } else { // questionsToStore = qaContent.getQaQuestions(); // } // -// for (QaQuestion question : questionsToStore) { +// for (QaQueContent question : questionsToStore) { // // String displayOrder = new Long(question.getDisplayOrder()).toString(); // String answer = (String) mapAnswers.get(displayOrder); @@ -200,7 +200,7 @@ // get responses from DB Map mapAnswersFromDb = new TreeMap(); - for (QaQuestion question : qaContent.getQaQuestions()) { + for (QaQueContent question : qaContent.getQaQueContents()) { Long questionUid = question.getUid(); QaUsrResp dbResponse = qaService.getResponseByUserAndQuestion(qaQueUsr.getQueUsrId(), questionUid); if (dbResponse != null) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v diff -u -r1.42.8.4 -r1.42.8.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 18 Mar 2011 18:59:27 -0000 1.42.8.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 22 Mar 2011 16:38:46 -0000 1.42.8.5 @@ -38,7 +38,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO; @@ -125,7 +125,7 @@ Iterator itListQuestions = listQuestions.iterator(); while (itListQuestions.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) itListQuestions.next(); + QaQueContent qaQuestion = (QaQueContent) itListQuestions.next(); if (qaQuestion != null) { QaMonitoredAnswersDTO qaMonitoredAnswersDTO = new QaMonitoredAnswersDTO(); @@ -390,7 +390,7 @@ if (qaSession != null) { Iterator itListQuestions = listQuestions.iterator(); while (itListQuestions.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) itListQuestions.next(); + QaQueContent qaQuestion = (QaQueContent) itListQuestions.next(); if (qaQuestion != null) { QaMonitoredAnswersDTO qaMonitoredAnswersDTO = new QaMonitoredAnswersDTO(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v diff -u -r1.28.8.4 -r1.28.8.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 18 Mar 2011 17:58:13 -0000 1.28.8.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 22 Mar 2011 16:38:46 -0000 1.28.8.5 @@ -54,7 +54,7 @@ import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaUploadedFile; import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO; import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO; @@ -1789,9 +1789,9 @@ List listQuestionContentDTO = new LinkedList(); - Iterator queIterator = qaContent.getQaQuestions().iterator(); + Iterator queIterator = qaContent.getQaQueContents().iterator(); while (queIterator.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) queIterator.next(); + QaQueContent qaQuestion = (QaQueContent) queIterator.next(); if (qaQuestion != null) { QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.37.4.1.4.4 -r1.37.4.1.4.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 18 Mar 2011 17:58:13 -0000 1.37.4.1.4.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 22 Mar 2011 16:38:46 -0000 1.37.4.1.4.5 @@ -122,7 +122,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO; @@ -272,7 +272,7 @@ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); - int intTotalQuestionCount = qaContent.getQaQuestions().size(); + int intTotalQuestionCount = qaContent.getQaQueContents().size(); if (! qaContent.isQuestionsSequenced()) { @@ -284,7 +284,7 @@ } else { String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex(); String newAnswer = qaLearningForm.getAnswer(); - QaQuestion currentQuestion = qaService.getQuestionByContentAndDisplayOrder(new Long(currentQuestionIndex), qaContent.getUid()); + QaQueContent currentQuestion = qaService.getQuestionByContentAndDisplayOrder(new Long(currentQuestionIndex), qaContent.getUid()); boolean isRequiredQuestionMissed = currentQuestion.isRequired() && isEmpty(newAnswer); if (!isRequiredQuestionMissed) { 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.4.3 -r1.70.4.1.4.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 16 Mar 2011 19:56:48 -0000 1.70.4.1.4.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 22 Mar 2011 16:38:46 -0000 1.70.4.1.4.4 @@ -49,7 +49,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; @@ -225,9 +225,9 @@ /* * fetch question content from content */ - Iterator contentIterator = qaContent.getQaQuestions().iterator(); + Iterator contentIterator = qaContent.getQaQueContents().iterator(); while (contentIterator.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) contentIterator.next(); + QaQueContent qaQuestion = (QaQueContent) contentIterator.next(); if (qaQuestion != null) { int displayOrder = qaQuestion.getDisplayOrder(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.61.8.6 -r1.61.8.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 18 Mar 2011 18:59:26 -0000 1.61.8.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 22 Mar 2011 16:38:46 -0000 1.61.8.7 @@ -120,7 +120,7 @@ import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO; @@ -652,9 +652,9 @@ List listQuestionContentDTO = new LinkedList(); - Iterator queIterator = qaContent.getQaQuestions().iterator(); + Iterator queIterator = qaContent.getQaQueContents().iterator(); while (queIterator.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) queIterator.next(); + QaQueContent qaQuestion = (QaQueContent) queIterator.next(); if (qaQuestion != null) { QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion); listQuestionContentDTO.add(qaQuestionDTO); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v diff -u -r1.53.8.5 -r1.53.8.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 18 Mar 2011 18:59:27 -0000 1.53.8.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 22 Mar 2011 16:38:47 -0000 1.53.8.6 @@ -48,7 +48,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO; import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.qa.dto.GeneralMonitoringDTO; @@ -173,10 +173,10 @@ List listQuestionContentDTO = new LinkedList(); - Iterator queIterator = qaContent.getQaQuestions().iterator(); + Iterator queIterator = qaContent.getQaQueContents().iterator(); while (queIterator.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) queIterator.next(); + QaQueContent qaQuestion = (QaQueContent) queIterator.next(); if (qaQuestion != null) { QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion); listQuestionContentDTO.add(qaQuestionDTO); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java,v diff -u -r1.4.8.2 -r1.4.8.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java 16 Mar 2011 19:56:50 -0000 1.4.8.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java 22 Mar 2011 16:38:47 -0000 1.4.8.3 @@ -38,7 +38,7 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.service.IQaService; import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy; import org.lamsfoundation.lams.tool.qa.web.form.QaPedagogicalPlannerForm; @@ -108,14 +108,14 @@ if (StringUtils.isEmpty(question)) { plannerForm.removeQuestion(questionIndex); } else { - if (questionIndex < qaContent.getQaQuestions().size()) { - QaQuestion qaQuestion = getQaService().getQuestionByContentAndDisplayOrder( + if (questionIndex < qaContent.getQaQueContents().size()) { + QaQueContent qaQuestion = getQaService().getQuestionByContentAndDisplayOrder( (long) questionIndex + 1, qaContent.getUid()); qaQuestion.setQuestion(question); getQaService().saveOrUpdateQaQueContent(qaQuestion); } else { - QaQuestion qaQuestion = new QaQuestion(); + QaQueContent qaQuestion = new QaQueContent(); qaQuestion.setDisplayOrder(questionIndex + 1); qaQuestion.setRequired(false); qaQuestion.setQaContent(qaContent); @@ -125,10 +125,10 @@ questionIndex++; } } while (question != null); - if (questionIndex < qaContent.getQaQuestions().size()) { + if (questionIndex < qaContent.getQaQueContents().size()) { getQaService().removeQuestionsFromCache(qaContent); - for (; questionIndex < qaContent.getQaQuestions().size(); questionIndex++) { - QaQuestion qaQuestion = getQaService().getQuestionByContentAndDisplayOrder( + for (; questionIndex < qaContent.getQaQueContents().size(); questionIndex++) { + QaQueContent qaQuestion = getQaService().getQuestionByContentAndDisplayOrder( (long) questionIndex + 1, qaContent.getUid()); getQaService().removeQaQueContent(qaQuestion); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.71.4.1.4.4 -r1.71.4.1.4.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 18 Mar 2011 17:58:13 -0000 1.71.4.1.4.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 22 Mar 2011 16:38:46 -0000 1.71.4.1.4.5 @@ -147,7 +147,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; import org.lamsfoundation.lams.tool.qa.service.IQaService; @@ -441,10 +441,10 @@ * get the existing question content */ boolean isFirst = false; - Iterator queIterator = qaContent.getQaQuestions().iterator(); + Iterator queIterator = qaContent.getQaQueContents().iterator(); while (queIterator.hasNext()) { - QaQuestion qaQuestion = (QaQuestion) queIterator.next(); + QaQueContent qaQuestion = (QaQueContent) queIterator.next(); if (qaQuestion != null) { QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion); listQuestionContentDTO.add(qaQuestionDTO); @@ -467,7 +467,7 @@ for (QaCondition condition : qaContent.getConditions()) { conditionSet.add(condition); for (QaQuestionDTO dto : listQuestionContentDTO) { - for (QaQuestion question : condition.getQuestions()) { + for (QaQueContent question : condition.getQuestions()) { if (dto.getDisplayOrder().equals(String.valueOf(question.getDisplayOrder()))) { condition.temporaryQuestionDTOSet.add(dto); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java 16 Mar 2011 19:56:47 -0000 1.1.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java 22 Mar 2011 16:38:45 -0000 1.1.2.2 @@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQuestion; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; public class QaPedagogicalPlannerForm extends PedagogicalPlannerActivityForm { @@ -75,10 +75,10 @@ setToolContentID(qaContent.getQaContentId()); question = new ArrayList(); - Set questions = qaContent.getQaQuestions(); + Set questions = qaContent.getQaQueContents(); if (questions != null) { int topicIndex = 0; - for (QaQuestion message : (Set) questions) { + for (QaQueContent message : (Set) questions) { setQuestion(topicIndex++, message.getQuestion()); } } Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaContent.hbm.xml,v diff -u -r1.15.12.1 -r1.15.12.2 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 16 Mar 2011 19:58:18 -0000 1.15.12.1 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 22 Mar 2011 16:38:45 -0000 1.15.12.2 @@ -186,7 +186,7 @@ Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaDataAccessTestCase.java,v diff -u -r1.19.12.2 -r1.19.12.3 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 16 Mar 2011 19:58:18 -0000 1.19.12.2 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 22 Mar 2011 16:38:45 -0000 1.19.12.3 @@ -67,7 +67,7 @@ protected QaSession qaSession; - protected QaQuestion qaQuestion; + protected QaQueContent qaQuestion; public QaDataAccessTestCase(String name) @@ -104,7 +104,7 @@ /* protected QaQueUsr getExistingUser(String username, String fullname) { - QaQuestion qaQuestion = qaQuestionDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID); + QaQueContent qaQuestion = qaQuestionDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID); QaSession qaSession = qaSessionDAO.getQaSessionById(TEST_EXISTING_SESSION_ID); QaQueUsr qaQueUsr= new QaQueUsr(new Long(TEST_NEW_USER_ID), @@ -118,7 +118,7 @@ } - protected QaUsrResp getNewResponse(String response, QaQuestion qaQuestion) + protected QaUsrResp getNewResponse(String response, QaQueContent qaQuestion) { QaUsrResp qaUsrResp= new QaUsrResp(response, false, new Date(System.currentTimeMillis()), @@ -146,13 +146,13 @@ qa.setOnlineInstructions(""); qa.setOfflineInstructions(""); qa.setReportTitle(""); - qa.setQaQuestions(new TreeSet()); + qa.setQaQueContents(new TreeSet()); qa.setQaSessions(new TreeSet()); //create new qa que content - QaQuestion qaQuestion = new QaQuestion("What planet are you from", 4, "", false, qa, new TreeSet()); + QaQueContent qaQuestion = new QaQueContent("What planet are you from", 4, "", false, qa, new TreeSet()); - qa.getQaQuestions().add(qaQuestion); + qa.getQaQueContents().add(qaQuestion); //create the new content qaContentDAO.createQa(qa); Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueContent.hbm.xml,v diff -u -r1.14.12.1 -r1.14.12.2 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 16 Mar 2011 19:58:18 -0000 1.14.12.1 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 22 Mar 2011 16:38:45 -0000 1.14.12.2 @@ -5,7 +5,7 @@ Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaUsrResp.hbm.xml,v diff -u -r1.13.12.1 -r1.13.12.2 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml 16 Mar 2011 19:58:18 -0000 1.13.12.1 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml 22 Mar 2011 16:38:45 -0000 1.13.12.2 @@ -80,7 +80,7 @@