Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.69 -r1.70 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 6 Sep 2006 05:47:06 -0000 1.69 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 8 Sep 2006 06:46:39 -0000 1.70 @@ -851,7 +851,9 @@ toolContentObj.setDefineLater(Boolean.FALSE); toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setLimitedChar(5000); // this is the default value - + toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectInstructions(null); + // lockOnFinsh = ! isReusable Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_MB_REUSABLE); toolContentObj.setLockWhenFinished(bool != null ? ! bool.booleanValue() : false); @@ -919,7 +921,7 @@ } /** Set the description, throws away the title value as this is not supported in 2.0 */ - public void setReflectiveData(Long toolContentId, String title, String defaultInputValues) + public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException, DataMissingException { Forum toolContentObj = getForumByContentId(toolContentId); @@ -929,9 +931,8 @@ +" as the tool content does not exist."); } - // TODO Forum doesn't support reflection yet! - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); + toolContentObj.setReflectOnActivity(Boolean.TRUE); + toolContentObj.setReflectInstructions(description); } //*************************************************************************************************************** Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.75 -r1.76 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 5 Sep 2006 21:50:22 -0000 1.75 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 8 Sep 2006 06:46:53 -0000 1.76 @@ -2628,9 +2628,8 @@ toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); - // TODO add reflection - //toolContentObj.setReflectInstructions(null); - //toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflect(Boolean.FALSE); + toolContentObj.setReflectionSubject(null); toolContentObj.setRunOffline(Boolean.FALSE.booleanValue()); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); @@ -2739,9 +2738,8 @@ +" as the tool content does not exist."); } - // TODO add reflection - // qaContent.setReflectOnActivity(Boolean.TRUE); - // qaContent.setReflectInstructions(description); + toolContentObj.setReflect(Boolean.TRUE); + toolContentObj.setReflectionSubject(description); } public Long createNotebookEntry(Long id, Integer idType, String signature, 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.65 -r1.66 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 4 Sep 2006 15:40:15 -0000 1.65 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 8 Sep 2006 06:47:10 -0000 1.66 @@ -2092,9 +2092,8 @@ toolContentObj.setInstructions(null); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); - // TODO add reflection - //toolContentObj.setReflectInstructions(null); - //toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflect(Boolean.FALSE); + toolContentObj.setReflectionSubject(null); toolContentObj.setRunOffline(Boolean.FALSE.booleanValue()); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); toolContentObj.setQaContentId(toolContentId); @@ -2143,9 +2142,8 @@ +" as the tool content does not exist."); } - // TODO add reflection - // qaContent.setReflectOnActivity(Boolean.TRUE); - // qaContent.setReflectInstructions(description); + qaContent.setReflect(Boolean.TRUE); + qaContent.setReflectionSubject(description); } //========================================================================================= Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.43 -r1.44 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 6 Sep 2006 02:05:50 -0000 1.43 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 8 Sep 2006 06:47:43 -0000 1.44 @@ -1006,6 +1006,8 @@ toolContentObj.setOnlineInstructions(null); toolContentObj.setRunOffline(Boolean.FALSE); toolContentObj.setUpdated(now); + toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectInstructions(null); toolContentObj.setRunAuto(Boolean.FALSE); Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_FILE); @@ -1106,9 +1108,8 @@ +" as the tool content does not exist."); } - // TODO Share Resources doesn't support reflection yet! - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); + toolContentObj.setReflectOnActivity(Boolean.TRUE); + toolContentObj.setReflectInstructions(description); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.62 -r1.63 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 6 Sep 2006 02:38:52 -0000 1.62 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 8 Sep 2006 06:48:14 -0000 1.63 @@ -795,7 +795,9 @@ toolContentObj.setUpdated(now); // 1.0.2 doesn't allow users to go back after completion, which is the equivalent of lock on finish. toolContentObj.setLockOnFinished(Boolean.TRUE); - + toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectInstructions(null); + SubmitUser suser = createContentUser(user, toolContentId); toolContentObj.setCreatedBy(suser); @@ -816,9 +818,8 @@ +" as the tool content does not exist."); } - // TODO Share Resources doesn't support reflection yet! - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); + toolContentObj.setReflectOnActivity(Boolean.TRUE); + toolContentObj.setReflectInstructions(description); } public SubmitUser getUserByUid(Long learnerID){ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.45 -r1.46 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 6 Sep 2006 13:14:09 -0000 1.45 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 8 Sep 2006 06:48:26 -0000 1.46 @@ -2642,9 +2642,8 @@ toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); - // TODO add reflection - //toolContentObj.setReflectInstructions(null); - //toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectionSubject(null); + toolContentObj.setReflect(Boolean.FALSE); toolContentObj.setRunOffline(Boolean.FALSE); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); @@ -2702,9 +2701,8 @@ +" as the tool content does not exist."); } - // TODO add reflection - // qaContent.setReflectOnActivity(Boolean.TRUE); - // qaContent.setReflectInstructions(description); + toolContentObj.setReflect(Boolean.TRUE); + toolContentObj.setReflectionSubject(description); } public Long createNotebookEntry(Long id, Integer idType, String signature,