Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r279ab8b6c6d02f80bb949e44011343f6c7150f6e -r40eb54374e84591563d8b6a679ac719dbc85c8f7 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (.../LamsAuthoringFinishAction.java) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (.../LamsAuthoringFinishAction.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -69,6 +69,8 @@ private static final String TOOL_SIGNATURE = "signature"; private static final String CONFIRM_ACTION = "confirm"; + private static final String CANCEL_ACTION = "cancel"; + private static final String RE_EDIT_URL = "reEditUrl"; /** @@ -108,7 +110,14 @@ } response.sendRedirect(nextUrl); } + if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) { + String signature = request.getParameter(TOOL_SIGNATURE); + Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + ToolContentManager contentManager = (ToolContentManager) findToolService(signature); + contentManager.resetDefineLater(toolContentId); + } + return null; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -53,6 +53,20 @@ public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException; /** + * Reset this tool content's define later flag to false. I.e., allowing learners to access it. The toolContentId + * should already exist in the tool. This method will normally be called after teacher cancels editing content in + * Monitor. + * + * @param toolContentId + * the tool content id of the tool content to be changed. + * @throws DataMissingException + * if no tool content matches the toolContentId + * @throws ToolException + * if any other error occurs + */ + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException; + + /** * Remove tool's content according specified the content id. It will be needed by lams to modify the learning * design. * Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== diff -u -r2a68a250e3ae88b708a9a2a91e9f3439a4b6d7a9 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 2a68a250e3ae88b708a9a2a91e9f3439a4b6d7a9) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -136,6 +136,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r495a38a55b249f3b65031de0ac76ecbd9b86ce09 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 495a38a55b249f3b65031de0ac76ecbd9b86ce09) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -996,7 +996,7 @@ isQuestionModified = true; } - //options is different + //options are different Set oldOptions = oldQuestion.getOptions(); Set newOptions = newQuestion.getOptions(); for (AssessmentQuestionOption oldOption : oldOptions) { @@ -1604,6 +1604,15 @@ assessmentDao.saveObject(toContent); } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Assessment assessment = assessmentDao.getByContentId(toolContentId); + if (assessment == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + assessment.setDefineLater(false); + } + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Assessment assessment = assessmentDao.getByContentId(toolContentId); Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml =================================================================== diff -u -ref851974c4dc3f5468b188fab9997a37b73c0e50 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision ef851974c4dc3f5468b188fab9997a37b73c0e50) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -37,9 +37,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -182,7 +182,18 @@ Bbb toContent = Bbb.newInstance(fromContent, toContentId, bbbToolContentHandler); saveOrUpdateBbb(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Bbb bbb = getBbbByContentId(toolContentId); + if (bbb == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + bbb.setDefineLater(false); + saveOrUpdateBbb(bbb); + } + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { // TODO Auto-generated method stub Fisheye: Tag 40eb54374e84591563d8b6a679ac719dbc85c8f7 refers to a dead (removed) revision in file `lams_tool_chat/.settings/org.eclipse.jdt.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml =================================================================== diff -u -ref851974c4dc3f5468b188fab9997a37b73c0e50 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision ef851974c4dc3f5468b188fab9997a37b73c0e50) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -49,6 +49,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -81,7 +81,7 @@ public class ChatService implements ToolSessionManager, ToolContentManager, ToolContentImport102Manager, IChatService { - static Logger logger = Logger.getLogger(ChatService.class.getName()); + private static Logger logger = Logger.getLogger(ChatService.class.getName()); private IChatDAO chatDAO = null; @@ -223,6 +223,16 @@ Chat toContent = Chat.newInstance(fromContent, toContentId); chatDAO.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Chat chat = chatDAO.getByContentId(toolContentId); + if (chat == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + chat.setDefineLater(false); + chatDAO.saveOrUpdate(chat); + } public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml =================================================================== diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision bb597b8155375e6ac4dfe280f630d323b6e5e575) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -110,6 +110,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -833,6 +833,15 @@ dacoSessionDao.saveObject(resSession); } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Daco daco = dacoDao.getByContentId(toolContentId); + if (daco == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + daco.setDefineLater(false); + } + // ***************************************************************************** // set methods for Spring Bean // ***************************************************************************** Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml (.../eadventureApplicationContext.xml) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml (.../eadventureApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -144,6 +144,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -1036,6 +1036,15 @@ public String getToolContentTitle(Long toolContentId) { return getEadventureByContentId(toolContentId).getTitle(); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Eadventure eadventure = eadventureDao.getByContentId(toolContentId); + if (eadventure == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + eadventure.setDefineLater(false); + } public boolean isContentEdited(Long toolContentId) { return getEadventureByContentId(toolContentId).isDefineLater(); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -166,7 +166,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception - + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception @@ -179,7 +179,6 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -767,6 +767,16 @@ } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Forum forum = forumDao.getByContentId(toolContentId); + if (forum == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + forum.setDefineLater(false); + forum.setContentInUse(false); + } + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Forum forum = forumDao.getByContentId(toolContentId); Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml (.../gmapApplicationContext.xml) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml (.../gmapApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -39,9 +39,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -206,6 +206,16 @@ gmapDAO.saveOrUpdate(toContent); } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Gmap gmap = gmapDAO.getByContentId(toolContentId); + if (gmap == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + gmap.setDefineLater(false); + gmapDAO.saveOrUpdate(gmap); + } + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { // TODO Auto-generated method stub Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision bb597b8155375e6ac4dfe280f630d323b6e5e575) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -142,6 +142,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED, -java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -879,6 +879,15 @@ public String getToolContentTitle(Long toolContentId) { return getImageGalleryByContentId(toolContentId).getTitle(); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + ImageGallery imageGallery = imageGalleryDao.getByContentId(toolContentId); + if (imageGallery == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + imageGallery.setDefineLater(false); + } public boolean isContentEdited(Long toolContentId) { return getImageGalleryByContentId(toolContentId).isDefineLater(); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -116,6 +116,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -886,6 +886,15 @@ return getCommonCartridgeByContentId(toolContentId).getTitle(); } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + CommonCartridge commonCartridge = commonCartridgeDao.getByContentId(toolContentId); + if (commonCartridge == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + commonCartridge.setDefineLater(false); + } + public boolean isContentEdited(Long toolContentId) { return getCommonCartridgeByContentId(toolContentId).isDefineLater(); } Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -56,6 +56,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -199,6 +199,16 @@ Kaltura toContent = Kaltura.newInstance(fromContent, toContentId); kalturaDao.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Kaltura kaltura = kalturaDao.getByContentId(toolContentId); + if (kaltura == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + kaltura.setDefineLater(false); + kalturaDao.saveOrUpdate(kaltura); + } @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -90,6 +90,7 @@ PROPAGATION_REQUIRED,-McApplicationException PROPAGATION_REQUIRED, -MccpApplicationException PROPAGATION_REQUIRED,-McApplicationException + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-McApplicationException PROPAGATION_REQUIRED,-McApplicationException PROPAGATION_REQUIRED,-McApplicationException Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -106,7 +106,7 @@ List refreshQuestionContent(final Long mcContentId) throws McApplicationException; - List getAllQuestionEntriesSorted(final long mcContentId) throws McApplicationException; + List getAllQuestionsSorted(final long mcContentId) throws McApplicationException; McQueContent getQuestionByUid(Long uid); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -271,7 +271,7 @@ } } - public List getAllQuestionEntriesSorted(final long mcContentId) throws McApplicationException { + public List getAllQuestionsSorted(final long mcContentId) throws McApplicationException { try { return mcQueContentDAO.getAllQuestionEntriesSorted(mcContentId); } catch (DataAccessException e) { @@ -1379,6 +1379,16 @@ throw new ToolException("toolContentId is missing"); } } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + McContent mcContent = getMcContent(toolContentId); + if (mcContent == null) { + throw new DataMissingException("mcContent is missing"); + } + mcContent.setDefineLater(false); + saveMcContent(mcContent); + } @SuppressWarnings("unchecked") public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -175,12 +175,10 @@ if (mcContent != null) { // sorts the questions by the display order - List sortedQuestions = mcService.getAllQuestionEntriesSorted(mcContent.getUid() + List sortedQuestions = mcService.getAllQuestionsSorted(mcContent.getUid() .longValue()); - Iterator iterSort = sortedQuestions.iterator(); int displayOrder = 1; - while (iterSort.hasNext()) { - McQueContent question = (McQueContent) iterSort.next(); + for (McQueContent question : sortedQuestions) { McQueContent existingQuestion = mcService.getQuestionByUid(question.getUid()); existingQuestion.setDisplayOrder(new Integer(displayOrder)); mcService.updateQuestion(existingQuestion); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -rc5457cc74f3986b393bc2947604b17168ba54dfb -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -101,6 +101,7 @@ PROPAGATION_REQUIRED,-QaApplicationException PROPAGATION_REQUIRED, -QaApplicationException PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED,-QaApplicationException PROPAGATION_REQUIRED,-QaApplicationException PROPAGATION_REQUIRED,-QaApplicationException PROPAGATION_REQUIRED,-QaApplicationException Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r842344241305fd167b1b6bbe990351e9d69ab581 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 842344241305fd167b1b6bbe990351e9d69ab581) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -453,16 +453,19 @@ } } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + QaContent qaContent = qaDAO.getQaByContentId(toolContentId.longValue()); + if (qaContent == null) { + QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved qaContent is null."); + throw new DataMissingException("qaContent is missing"); + } + qaContent.setDefineLater(false); + updateQaContent(qaContent); + } - /** - * gets called ONLY when a lesson is being created in monitoring mode. Should create the new content(toContent) - * based on what the author has created her content with. In q/a tool's case that is content + question's content - * but not user responses. The deep copy should go only as far as default content (or author created content) - * already goes. ToolContentManager CONTRACT - * - * similar to public void removeToolContent(Long toolContentID) gets called by Container+Flash - * - */ + @Override public void copyToolContent(Long fromContentId, Long toContentId) { long defaultContentId = 0; if (fromContentId == null) { @@ -496,9 +499,7 @@ } - /** - * Will need an update on the core tool signature: reason : when qaContent is null throw an exception - */ + @Override public void removeToolContent(Long toolContentID, boolean removeSessionData) throws SessionDataExistsException, ToolException { if (toolContentID == null) { Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml =================================================================== diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision bb597b8155375e6ac4dfe280f630d323b6e5e575) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -109,6 +109,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -941,6 +941,15 @@ public String getToolContentTitle(Long toolContentId) { return getResourceByContentId(toolContentId).getTitle(); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Resource resource = resourceDao.getByContentId(toolContentId); + if (resource == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + resource.setDefineLater(false); + } public boolean isContentEdited(Long toolContentId) { return getResourceByContentId(toolContentId).isDefineLater(); Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -175,6 +175,16 @@ leaderselectionToolContentHandler); leaderselectionDAO.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Leaderselection content = leaderselectionDAO.getByContentId(toolContentId); + if (content == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + content.setDefineLater(false); + leaderselectionDAO.saveOrUpdate(content); + } @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, Fisheye: Tag 40eb54374e84591563d8b6a679ac719dbc85c8f7 refers to a dead (removed) revision in file `lams_tool_mindmap/.settings/org.eclipse.jdt.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -50,9 +50,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -374,6 +374,16 @@ return languageOutput; } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Mindmap mindmap = mindmapDAO.getByContentId(toolContentId); + if (mindmap == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + mindmap.setDefineLater(false); + mindmapDAO.saveOrUpdate(mindmap); + } public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -35,9 +35,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -617,6 +617,14 @@ } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + NoticeboardContent nbContent = getAndCheckIDandObject(toolContentId); + + nbContent.setDefineLater(false); + saveNoticeboard(nbContent); + } + /** @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long) */ public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml (.../notebookApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml (.../notebookApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -48,9 +48,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -182,7 +182,18 @@ Notebook toContent = Notebook.newInstance(fromContent, toContentId); notebookDAO.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Notebook notebook = notebookDAO.getByContentId(toolContentId); + if (notebook == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + notebook.setDefineLater(false); + notebookDAO.saveOrUpdate(notebook); + } + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml (.../pixlrApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml (.../pixlrApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -49,9 +49,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -257,6 +257,16 @@ } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Pixlr pixlr = pixlrDAO.getByContentId(toolContentId); + if (pixlr == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + pixlr.setDefineLater(false); + pixlrDAO.saveOrUpdate(pixlr); + } + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { // TODO Auto-generated method stub Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -176,11 +176,7 @@ coreNotebookService.updateEntry(notebookEntry); } - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, java.lang.Long) - */ + @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (toContentId == null) { throw new ToolException("Failed to create the SubmitFiles tool seession"); @@ -197,12 +193,18 @@ submitFilesContentDAO.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + SubmitFilesContent content = getSubmitFilesContent(toolContentId); + if (content == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + content.setDefineLater(false); + submitFilesContentDAO.saveOrUpdate(content); + } - /** - * @throws SessionDataExistsException - * - * @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long) - */ + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException { SubmitFilesContent submitFilesContent = submitFilesContentDAO.getContentByID(toolContentId); if (submitFilesContent != null) { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision bb597b8155375e6ac4dfe280f630d323b6e5e575) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -81,11 +81,10 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception - + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml =================================================================== diff -u -r4428202881c5551dd3973c9011d7a70e0a517060 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision 4428202881c5551dd3973c9011d7a70e0a517060) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -106,6 +106,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -rb3475a55da557582a76f6d09ee0a9f2bd109ee2e -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision b3475a55da557582a76f6d09ee0a9f2bd109ee2e) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -1608,7 +1608,17 @@ public String getToolContentTitle(Long toolContentId) { return getScratchieByContentId(toolContentId).getTitle(); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Scratchie scratchie = scratchieDao.getByContentId(toolContentId); + if (scratchie == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + scratchie.setDefineLater(false); + } + @Override public boolean isContentEdited(Long toolContentId) { return getScratchieByContentId(toolContentId).isDefineLater(); } Fisheye: Tag 40eb54374e84591563d8b6a679ac719dbc85c8f7 refers to a dead (removed) revision in file `lams_tool_scribe/.settings/org.eclipse.jdt.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml (.../scribeApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml (.../scribeApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -37,6 +37,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -201,6 +201,16 @@ Scribe toContent = Scribe.newInstance(fromContent, toContentId); scribeDAO.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Scribe scribe = scribeDAO.getByContentId(toolContentId); + if (scribe == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + scribe.setDefineLater(false); + scribeDAO.saveOrUpdate(scribe); + } public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -555,6 +555,7 @@ return new TreeMap(); } + @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (toContentId == null) { throw new ToolException("Failed to create the SharedSpreadsheetFiles tool seession"); @@ -579,11 +580,22 @@ public String getToolContentTitle(Long toolContentId) { return getSpreadsheetByContentId(toolContentId).getTitle(); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId); + if (spreadsheet == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + spreadsheet.setDefineLater(false); + } + @Override public boolean isContentEdited(Long toolContentId) { return getSpreadsheetByContentId(toolContentId).isDefineLater(); } + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId); @@ -598,6 +610,7 @@ spreadsheetDao.delete(spreadsheet); } + @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { if (log.isDebugEnabled()) { log.debug("Removing Spreadsheet contents for user ID " + userId + " and toolContentId " + toolContentId); @@ -625,6 +638,7 @@ } } + @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { SpreadsheetSession session = new SpreadsheetSession(); session.setSessionId(toolSessionId); @@ -634,6 +648,7 @@ spreadsheetSessionDao.saveObject(session); } + @Override public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { if (toolSessionId == null) { SpreadsheetServiceImpl.log.error("Fail to leave tool Session based on null tool session id."); @@ -657,44 +672,35 @@ return learnerService.completeToolSession(toolSessionId, learnerId); } + @Override public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException { return null; } + @Override public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException { return null; } + @Override public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { spreadsheetSessionDao.deleteBySessionId(toolSessionId); } - /** - * Get the tool output for the given tool output names. - * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, java.lang.Long, - * java.lang.Long) - */ + @Override public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { return new TreeMap(); } - /** - * Get the tool output for the given tool output name. - * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long, - * java.lang.Long) - */ + @Override public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } /* ===============Methods implemented from ToolContentImport102Manager =============== */ - /** - * Import the data for a 1.0.2 Noticeboard or HTMLNoticeboard - */ + @Override public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -101,6 +101,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED PROPAGATION_REQUIRED, -java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -724,10 +724,21 @@ return getSurveyByContentId(toolContentId).getTitle(); } + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Survey survey = surveyDao.getByContentId(toolContentId); + if (survey == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + survey.setDefineLater(false); + } + + @Override public boolean isContentEdited(Long toolContentId) { return getSurveyByContentId(toolContentId).isDefineLater(); } + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Survey survey = surveyDao.getByContentId(toolContentId); @@ -742,6 +753,7 @@ surveyDao.delete(survey); } + @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { if (log.isDebugEnabled()) { log.debug("Removing Survey answers for user ID " + userId + " and toolContentId " + toolContentId); @@ -767,6 +779,7 @@ } } + @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { SurveySession session = new SurveySession(); session.setSessionId(toolSessionId); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml =================================================================== diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml (.../surveyApplicationContext.xml) (revision bb597b8155375e6ac4dfe280f630d323b6e5e575) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml (.../surveyApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -104,6 +104,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -832,13 +832,12 @@ return getTaskListByContentId(toolContentId).getTitle(); } + @Override public boolean isContentEdited(Long toolContentId) { return getTaskListByContentId(toolContentId).isDefineLater(); } - /** - * {@inheritDoc} - */ + @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (toContentId == null) { throw new ToolException("Failed to create the SharedTaskListFiles tool seession"); @@ -869,10 +868,17 @@ } } } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + TaskList taskList = taskListDao.getByContentId(toolContentId); + if (taskList == null) { + throw new ToolException("No found tool content by given content ID:" + toolContentId); + } + taskList.setDefineLater(false); + } - /** - * {@inheritDoc} - */ + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { TaskList taskList = taskListDao.getByContentId(toolContentId); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -111,6 +111,7 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED, -java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Fisheye: Tag 40eb54374e84591563d8b6a679ac719dbc85c8f7 refers to a dead (removed) revision in file `lams_tool_videorecorder/.settings/org.eclipse.jdt.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -161,39 +161,32 @@ return null; } + @Override public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException { // TODO Auto-generated method stub return null; } + @Override public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { videoRecorderSessionDAO.deleteBySessionID(toolSessionId); // TODO check if cascade worked } - /** - * Get the tool output for the given tool output names. - * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, java.lang.Long, - * java.lang.Long) - */ + @Override public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { return getVideoRecorderOutputFactory().getToolOutput(names, this, toolSessionId, learnerId); } - /** - * Get the tool output for the given tool output name. - * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long, - * java.lang.Long) - */ + @Override public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getVideoRecorderOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } /* ************ Methods from ToolContentManager ************************* */ + @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (VideoRecorderService.logger.isDebugEnabled()) { @@ -230,6 +223,16 @@ VideoRecorder toContent = VideoRecorder.newInstance(fromContent, toContentId); videoRecorderDAO.saveOrUpdate(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); + if (videoRecorder == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + videoRecorder.setDefineLater(false); + videoRecorderDAO.saveOrUpdate(videoRecorder); + } public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml (.../videoRecorderApplicationContext.xml) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml (.../videoRecorderApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -51,6 +51,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -1073,21 +1073,19 @@ throw new ToolException(e); } } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + VoteContent voteContent = getVoteContent(toolContentId); + if (voteContent == null) { + VoteServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved voteContent is null."); + throw new DataMissingException("voteContent is missing"); + } + voteContent.setDefineLater(false); + saveVoteContent(voteContent); + } - /** - * Implemented as part of the tool contract. Gets called only in the Learner mode. All the learners in the same - * group have the same toolSessionID. - * - * @param toolSessionID - * the generated tool session id. - * @param toolSessionName - * the tool session name. - * @param toolContentID - * the tool content id specified. - * @throws ToolException - * if an error occurs e.g. defaultContent is missing. - * - */ + @Override public void createToolSession(Long toolSessionID, String toolSessionName, Long toolContentID) throws ToolException { if (toolSessionID == null) { @@ -1115,14 +1113,7 @@ } } - /** - * Implemented as part of the tool contract. - * - * @param toolSessionID - * @param toolContentID - * return - * @throws ToolException - */ + @Override public void removeToolSession(Long toolSessionID) throws DataMissingException, ToolException { if (toolSessionID == null) { VoteServicePOJO.logger.error("toolSessionID is null"); @@ -1150,15 +1141,7 @@ } } - /** - * Implemtented as part of the tool contract. - * - * @param toolSessionID - * @param learnerId - * return String - * @throws ToolException - * - */ + @Override public String leaveToolSession(Long toolSessionID, Long learnerId) throws DataMissingException, ToolException { if (learnerService == null) { @@ -1194,35 +1177,25 @@ return nextUrl; } - /** - * exportToolSession(Long toolSessionID) throws DataMissingException, ToolException - * - * @param toolSessionID - * return ToolSessionExportOutputData - * @throws ToolException - */ + @Override public ToolSessionExportOutputData exportToolSession(Long toolSessionID) throws DataMissingException, ToolException { throw new ToolException("not yet implemented"); } - /** - * exportToolSession(Long toolSessionID) throws DataMissingException, ToolException - * - * @param toolSessionIDs - * return ToolSessionExportOutputData - * @throws ToolException - */ + @Override public ToolSessionExportOutputData exportToolSession(List toolSessionIDs) throws DataMissingException, ToolException { throw new ToolException("not yet implemented"); } + @Override public IToolVO getToolBySignature(String toolSignature) { IToolVO tool = toolService.getToolBySignature(toolSignature); return tool; } + @Override public long getToolDefaultContentIdBySignature(String toolSignature) { long contentId = 0; contentId = toolService.getToolDefaultContentIdBySignature(toolSignature); @@ -1235,19 +1208,18 @@ return voteQueContent; } + @Override public List getToolSessionsForContent(VoteContent vote) { List listToolSessionIds = voteSessionDAO.getSessionsFromContent(vote); return listToolSessionIds; } + @Override public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } - /** - * Get the definitions for possible output for an activity, based on the toolContentId. Currently we have one - * definition, which is whether or not the user has selected a particular answer - */ + @Override public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) throws ToolException { VoteContent content = getVoteContent(toolContentId); @@ -1258,39 +1230,29 @@ return getVoteOutputFactory().getToolOutputDefinitions(content, definitionType); } + @Override public String getToolContentTitle(Long toolContentId) { return getVoteContent(toolContentId).getTitle(); } + @Override public boolean isContentEdited(Long toolContentId) { return getVoteContent(toolContentId).isDefineLater(); } - /** - * Get the tool output for the given tool output names. - * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, java.lang.Long, - * java.lang.Long) - */ + @Override public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { return voteOutputFactory.getToolOutput(names, this, toolSessionId, learnerId); } - /** - * Get the tool output for the given tool output name. - * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long, - * java.lang.Long) - */ + @Override public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return voteOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } /* ===============Methods implemented from ToolContentImport102Manager =============== */ - /** - * Import the data for a 1.0.2 Vote - */ + @Override public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { Date now = new Date(); VoteContent toolContentObj = new VoteContent(); @@ -1354,9 +1316,7 @@ voteContentDAO.saveVoteContent(toolContentObj); } - /** - * Set the description, throws away the title value as this is not supported in 2.0 - */ + @Override public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException, DataMissingException { @@ -1387,6 +1347,7 @@ } } + @Override public List getAllQuestionsSorted(final long voteContentId) { return voteQueContentDAO.getAllQuestionsSorted(voteContentId); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml (.../voteApplicationContext.xml) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml (.../voteApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -85,6 +85,7 @@ PROPAGATION_REQUIRED,-VoteApplicationException PROPAGATION_REQUIRED, -VoteApplicationException PROPAGATION_REQUIRED,-VoteApplicationException + PROPAGATION_REQUIRED,-VoteApplicationException PROPAGATION_REQUIRED,-VoteApplicationException PROPAGATION_REQUIRED,-VoteApplicationException PROPAGATION_REQUIRED,-VoteApplicationException Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -241,17 +241,14 @@ return getWikiByContentId(toolContentId).getTitle(); } + @Override public boolean isContentEdited(Long toolContentId) { return getWikiByContentId(toolContentId).isDefineLater(); } /* ************ Methods from ToolContentManager ************************* */ - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, java.lang.Long) - */ + @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (WikiService.logger.isDebugEnabled()) { @@ -276,12 +273,24 @@ insertUnsavedWikiContent(toContent); } + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Wiki wiki = wikiDAO.getByContentId(toolContentId); + if (wiki == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); + } + wiki.setDefineLater(false); + wikiDAO.saveOrUpdate(wiki); + } + @Override public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException { // TODO Auto-generated method stub } + @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { if (logger.isDebugEnabled()) { logger.debug("Removing Wiki contents for user ID " + userId + " and toolContentId " + toolContentId); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml (.../wikiApplicationContext.xml) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml (.../wikiApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -41,9 +41,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -322,12 +322,24 @@ } } - - public void removeToolContent(Long toolContentId, boolean removeSessionData) - throws SessionDataExistsException, ToolException { - // TODO Auto-generated method stub + + @Override + public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { + Wookie wookie = wookieDAO.getByContentId(toolContentId); + if (wookie == null) { + throw new ToolException("Could not find tool with toolContentID: " + toolContentId); } + wookie.setDefineLater(false); + wookieDAO.saveOrUpdate(wookie); + } + @Override + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, + ToolException { + // TODO Auto-generated method stub + } + + @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { if (logger.isDebugEnabled()) { logger.debug("Resetting Wookie completion flag for user ID " + userId + " and toolContentId " Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r40eb54374e84591563d8b6a679ac719dbc85c8f7 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml (.../wookieApplicationContext.xml) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml (.../wookieApplicationContext.xml) (revision 40eb54374e84591563d8b6a679ac719dbc85c8f7) @@ -50,9 +50,9 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED