Fisheye: Tag 8be2bc782a2c7066c8c33f5605962584df7a2f9b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentImport102Manager.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r6a20d28e700fd15a65dd6d6b1d5907052219926b -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 6a20d28e700fd15a65dd6d6b1d5907052219926b) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -28,7 +28,6 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -62,7 +61,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -113,8 +111,8 @@ /** * @author Andrey Balan */ -public class AssessmentServiceImpl implements IAssessmentService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, ToolRestManager { +public class AssessmentServiceImpl + implements IAssessmentService, ToolContentManager, ToolSessionManager, ToolRestManager { private static Logger log = Logger.getLogger(AssessmentServiceImpl.class.getName()); private AssessmentDAO assessmentDao; @@ -291,18 +289,18 @@ public List getUsersBySession(Long toolSessionID) { return assessmentUserDao.getBySessionID(toolSessionID); } - + @Override public List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, String searchString) { return assessmentUserDao.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString); } - + @Override public int getCountUsersBySession(Long sessionId, String searchString) { return assessmentUserDao.getCountUsersBySession(sessionId, searchString); } - + @Override public List getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page, int size, String sortBy, String sortOrder, String searchString) { @@ -426,12 +424,12 @@ public void setAttemptStarted(Assessment assessment, AssessmentUser assessmentUser, Long toolSessionId) { AssessmentResult lastResult = getLastAssessmentResult(assessment.getUid(), assessmentUser.getUserId()); if (lastResult != null) { - + // don't instantiate new attempt if the previous one wasn't finished and thus continue working with it if (lastResult.getFinishDate() == null) { return; - - // mark previous attempt as not the latest anymore + + // mark previous attempt as not the latest anymore } else { lastResult.setLatest(false); assessmentResultDao.saveObject(lastResult); @@ -775,7 +773,7 @@ public int getAssessmentResultCount(Long assessmentUid, Long userId) { return assessmentResultDao.getAssessmentResultCount(assessmentUid, userId); } - + @Override public AssessmentQuestionResult getAssessmentQuestionResultByUid(Long questionResultUid) { return assessmentQuestionResultDao.getAssessmentQuestionResultByUid(questionResultUid); @@ -861,7 +859,7 @@ public AssessmentQuestion getAssessmentQuestionByUid(Long questionUid) { return assessmentQuestionDao.getByUid(questionUid); } - + @Override public List getSessionDtos(Long contentId) { List sessionDtos = new ArrayList(); @@ -870,14 +868,14 @@ for (AssessmentSession session : sessionList) { Long sessionId = session.getSessionId(); SessionDTO sessionDto = new SessionDTO(sessionId, session.getSessionName()); - + //for statistics tab int countUsers = assessmentUserDao.getCountUsersBySession(sessionId, ""); sessionDto.setNumberLearners(countUsers); - + sessionDtos.add(sessionDto); } - + return sessionDtos; } @@ -992,13 +990,13 @@ return userSummary; } - + @Override public QuestionSummary getQuestionSummary(Long contentId, Long questionUid) { QuestionSummary questionSummary = new QuestionSummary(); AssessmentQuestion question = assessmentQuestionDao.getByUid(questionUid); questionSummary.setQuestion(question); - + return questionSummary; } @@ -1867,6 +1865,7 @@ return getAssessmentByContentId(toolContentId).isDefineLater(); } + @Override public boolean isReadOnly(Long toolContentId) { for (AssessmentSession session : assessmentSessionDao.getByContentId(toolContentId)) { if (!session.getAssessmentUsers().isEmpty()) { @@ -1876,31 +1875,6 @@ return false; } - /* ===============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) { - } - - /** - * 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 { - - Assessment toolContentObj = getAssessmentByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - } - - /* =================================================================================== */ - public IExportToolContentService getExportContentService() { return exportContentService; } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -rab2b6923490ce38dc647ea66d6768966fbc40cfd -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision ab2b6923490ce38dc647ea66d6768966fbc40cfd) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.Date; -import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Random; @@ -49,7 +48,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -73,19 +71,15 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; /** * An implementation of the IChatService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class ChatService - implements ToolSessionManager, ToolContentManager, ToolContentImport102Manager, IChatService, ToolRestManager { +public class ChatService implements ToolSessionManager, ToolContentManager, IChatService, ToolRestManager { private static Logger logger = Logger.getLogger(ChatService.class.getName()); @@ -763,63 +757,6 @@ coreNotebookService.updateEntry(notebookEntry); } - /* - * ===============Methods implemented from ToolContentImport102Manager =============== - */ - - /** - * Import the data for a 1.0.2 Chat - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Chat chat = new Chat(); - chat.setContentInUse(Boolean.FALSE); - chat.setCreateBy(new Long(user.getUserID().longValue())); - chat.setCreateDate(now); - chat.setDefineLater(Boolean.FALSE); - chat.setFilterKeywords(null); - chat.setFilteringEnabled(Boolean.FALSE); - chat.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - chat.setLockOnFinished(Boolean.FALSE); - chat.setReflectInstructions(null); - chat.setReflectOnActivity(Boolean.FALSE); - chat.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - chat.setToolContentId(toolContentId); - chat.setUpdateDate(now); - - try { - Boolean isReusable = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_REUSABLE); - chat.setLockOnFinished(isReusable != null ? !isReusable.booleanValue() : true); - } catch (WDDXProcessorConversionException e) { - ChatService.logger.error("Unable to content for activity " + chat.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + chat.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - chatDAO.saveOrUpdate(chat); - } - - /** - * 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 { - - Chat chat = getChatByContentId(toolContentId); - if (chat == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - chat.setReflectOnActivity(Boolean.TRUE); - chat.setReflectInstructions(description); - } - public ChatOutputFactory getChatOutputFactory() { return chatOutputFactory; } Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -33,7 +33,6 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -90,7 +89,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -103,10 +101,7 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; @@ -115,8 +110,7 @@ * @author Dapeng.Ni * */ -public class EadventureServiceImpl - implements IEadventureService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager { +public class EadventureServiceImpl implements IEadventureService, ToolContentManager, ToolSessionManager { static Logger log = Logger.getLogger(EadventureServiceImpl.class.getName()); private EadventureDAO eadventureDao; @@ -1078,7 +1072,7 @@ public boolean isContentEdited(Long toolContentId) { return getEadventureByContentId(toolContentId).isDefineLater(); } - + @Override public boolean isReadOnly(Long toolContentId) { for (EadventureSession session : eadventureSessionDao.getByContentId(toolContentId)) { @@ -1089,15 +1083,15 @@ return false; } - + @Override public void removeToolContent(Long toolContentId) throws ToolException { Eadventure eadventure = eadventureDao.getByContentId(toolContentId); if (eadventure == null) { EadventureServiceImpl.log .warn("Can not remove the tool content as it does not exist. ID: " + toolContentId); } - + for (EadventureSession session : eadventureSessionDao.getByContentId(toolContentId)) { List entries = coreNotebookService.getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, EadventureConstants.TOOL_SIGNATURE); @@ -1222,164 +1216,6 @@ // no actions required } - /* ===============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) { - Date now = new Date(); - Eadventure toolContentObj = new Eadventure(); - - try { - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - toolContentObj.setContentId(toolContentId); - toolContentObj.setContentInUse(Boolean.FALSE); - toolContentObj.setCreated(now); - toolContentObj.setDefineLater(Boolean.FALSE); - toolContentObj.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - toolContentObj.setUpdated(now); - toolContentObj.setReflectOnActivity(Boolean.FALSE); - toolContentObj.setReflectInstructions(null); - - Boolean bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_FILE); - bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_URL); - bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_URL); - toolContentObj.setLockWhenFinished(Boolean.FALSE); - - /* - * unused entries from 1.0.2 [directoryName=] no equivalent in 2.0 [runtimeSubmissionStaffFile=true] no - * equivalent in 2.0 [contentShowUser=false] no equivalent in 2.0 [isHTML=false] no equivalent in 2.0 - * [showbuttons=false] no equivalent in 2.0 [isReusable=false] not used in 1.0.2 (would be lock when - * finished) - */ - EadventureUser ruser = new EadventureUser(); - ruser.setUserId(new Long(user.getUserID().longValue())); - ruser.setFirstName(user.getFirstName()); - ruser.setLastName(user.getLastName()); - ruser.setLoginName(user.getLogin()); - createUser(ruser); - toolContentObj.setCreatedBy(ruser); - - // Eadventure Items. They are ordered on the screen by create date so they need to be saved in the right - // order. - // So read them all in first, then go through and assign the dates in the correct order and then save. - // TODO nos cargamos la parte de los items.... comprobar que se pase todo bien y no de ning�n problema - /* Vector urls = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_URL_URLS); - SortedMap items = new TreeMap(); - if (urls != null) { - Iterator iter = urls.iterator(); - while (iter.hasNext()) { - Hashtable urlMap = (Hashtable) iter.next(); - Integer itemOrder = WDDXProcessor.convertToInteger(urlMap, - ToolContentImport102Manager.CONTENT_URL_URL_VIEW_ORDER); - EadventureItem item = new EadventureItem(); - item.setTitle((String) urlMap.get(ToolContentImport102Manager.CONTENT_TITLE)); - item.setCreateBy(ruser); - item.setCreateByAuthor(true); - item.setHide(false); - - Vector instructions = (Vector) urlMap - .get(ToolContentImport102Manager.CONTENT_URL_URL_INSTRUCTION_ARRAY); - if (instructions != null && instructions.size() > 0) { - item.setItemInstructions(new HashSet()); - Iterator insIter = instructions.iterator(); - while (insIter.hasNext()) { - item.getItemInstructions().add(createInstruction((Hashtable) insIter.next())); - } - } - - String eadventureType = (String) urlMap.get(ToolContentImport102Manager.CONTENT_URL_URL_TYPE); - if (ToolContentImport102Manager.URL_RESOURCE_TYPE_URL.equals(eadventureType)) { - item.setType(EadventureConstants.RESOURCE_TYPE_URL); - item.setUrl((String) urlMap.get(ToolContentImport102Manager.CONTENT_URL_URL_URL)); - item.setOpenUrlNewWindow(false); - } else if (ToolContentImport102Manager.URL_RESOURCE_TYPE_WEBSITE.equals(eadventureType)) { - item.setType(EadventureConstants.RESOURCE_TYPE_WEBSITE); - } else if (ToolContentImport102Manager.URL_RESOURCE_TYPE_FILE.equals(eadventureType)) { - item.setType(EadventureConstants.RESOURCE_TYPE_FILE); - } else { - throw new ToolException("Invalid eadventure type. Type was " + eadventureType); - } - - items.put(itemOrder, item); - } - } - - Iterator iter = items.values().iterator(); - Date itemDate = null; - while (iter.hasNext()) { - if (itemDate != null) { - try { - Thread.sleep(1000); - } catch (Exception e) { - } - } - itemDate = new Date(); - - EadventureItem item = (EadventureItem) iter.next(); - item.setCreateDate(itemDate); - toolContentObj.getEadventureItems().add(item); - }*/ - - } catch (WDDXProcessorConversionException e) { - EadventureServiceImpl.log.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - eadventureDao.saveObject(toolContentObj); - - } - - // TODO comprobar que no hay problema por quitar esto - /*private EadventureItemInstruction createInstruction(Hashtable instructionEntry) - throws WDDXProcessorConversionException { - - Integer instructionOrder = WDDXProcessor.convertToInteger(instructionEntry, - ToolContentImport102Manager.CONTENT_URL_URL_VIEW_ORDER); - - // the description column in 1.0.2 was longer than 255 chars, so truncate. - String instructionText = (String) instructionEntry.get(ToolContentImport102Manager.CONTENT_URL_INSTRUCTION); - if (instructionText != null && instructionText.length() > 255) { - if (EadventureServiceImpl.log.isDebugEnabled()) { - EadventureServiceImpl.log - .debug("1.0.2 Import truncating Item Instruction to 255 characters. Original text was\'" - + instructionText + "\'"); - } - instructionText = instructionText.substring(0, 255); - } - - EadventureItemInstruction instruction = new EadventureItemInstruction(); - instruction.setDescription(instructionText); - instruction.setSequenceId(instructionOrder); - - return instruction; - }*/ - - /** 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 { - - Eadventure toolContentObj = getEadventureByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - - /* =================================================================================== */ - public IExportToolContentService getExportContentService() { return exportContentService; } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -30,7 +30,6 @@ import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -40,7 +39,6 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -72,7 +70,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -114,19 +111,15 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; /** * * @author Steve.Ni * * @version $Revision$ */ -public class ForumService - implements IForumService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager, ToolRestManager { +public class ForumService implements IForumService, ToolContentManager, ToolSessionManager, ToolRestManager { private static final Logger log = Logger.getLogger(ForumService.class); // DAO variables @@ -1205,144 +1198,12 @@ return MessageDTO.getMessageDTO(messageDao.getBySession(sessionID)); } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - /** - * Import the data for a 1.0.2 Forum - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Forum toolContentObj = new Forum(); - - try { - - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - - toolContentObj.setAllowAnonym(Boolean.FALSE); - toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value - toolContentObj.setAllowNewTopic(Boolean.TRUE); - toolContentObj.setAllowRichEditor(Boolean.FALSE); - toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value - toolContentObj.setAllowRateMessages(Boolean.FALSE); // this is the default value - toolContentObj.setContentId(toolContentId); - toolContentObj.setContentInUse(Boolean.FALSE); - toolContentObj.setCreated(now); - toolContentObj.setDefineLater(Boolean.FALSE); - toolContentObj.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - toolContentObj.setMaxCharacters(5000); // this is the default value - toolContentObj.setReflectOnActivity(Boolean.FALSE); - toolContentObj.setReflectInstructions(null); - - // lockOnFinsh = ! isReusable - Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_REUSABLE); - toolContentObj.setLockWhenFinished(bool != null ? !bool.booleanValue() : false); - toolContentObj.setMaximumReply(0); - toolContentObj.setMinimumReply(0); - toolContentObj.setUpdated(now); - - // unused entries from 1.0.2 - // isNewTopicAllowed - not actually used in 1.0.2 - // durationInDays - no equivalent in 2.0 - // isPostingModerated - no equivalent in 2.0 - // isPostingNotified - no equivalent in 2.0 - // contentShowUser - no equivalent in 2.0 - // isHTML - no equivalent in 2.0 - // terminationType=moderator - no equivalent in 2.0 - - ForumUser forumUser = new ForumUser(); - forumUser.setUserId(new Long(user.getUserID().longValue())); - forumUser.setFirstName(user.getFirstName()); - forumUser.setLastName(user.getLastName()); - forumUser.setLoginName(user.getLogin()); - createUser(forumUser); - toolContentObj.setCreatedBy(forumUser); - - // leave as empty, no need to set them to anything. - // toolContentObj.setAttachments(attachments); - forumDao.saveOrUpdate(toolContentObj); - - // topics in the XML file are ordered using the "number" field, not in their order in the vector. - TreeMap messageMaps = new TreeMap(); - Vector topics = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_MB_TOPICS); - Date msgDate = null; - if (topics != null) { - Iterator iter = topics.iterator(); - while (iter.hasNext()) { - Hashtable messageMap = (Hashtable) iter.next(); - Integer order = WDDXProcessor.convertToInteger(messageMap, - ToolContentImport102Manager.CONTENT_MB_TOPIC_NUMBER); - messageMaps.put(order, messageMap); - } - - iter = messageMaps.values().iterator(); - while (iter.hasNext()) { - - Map messageMap = (Map) iter.next(); - - Message message = new Message(); - message.setIsAuthored(true); - - // topics are ordered by date, so I need to try to assign each entry a different date. Won't work if - // this is too quick. - if (msgDate != null) { - try { - Thread.sleep(1000); - } catch (Exception e) { - } - } - msgDate = new Date(); - - message.setCreated(msgDate); - message.setCreatedBy(forumUser); - message.setUpdated(msgDate); - message.setLastReplyDate(msgDate); - message.setSubject((String) messageMap.get(ToolContentImport102Manager.CONTENT_TITLE)); - message.setBody(WebUtil.convertNewlines( - (String) messageMap.get(ToolContentImport102Manager.CONTENT_MB_TOPIC_MESSAGE))); - // ignore the old subject field - it wasn't updated by the old interface. - message.setHideFlag(Boolean.FALSE); - message.setIsAnonymous(Boolean.FALSE); - - createRootTopic(toolContentObj.getUid(), (ForumToolSession) null, message); - - } - } - - } catch (WDDXProcessorConversionException e) { - ForumService.log.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - } - - /** - * 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 { - - Forum toolContentObj = getForumByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - - /** * Sends marks straight to gradebook from a forum report * * @param user * @param toolSessionID */ - @SuppressWarnings("unchecked") public void sendMarksToGradebook(ForumUser user, Long toolSessionID) { List messages = getMessagesByUserUid(user.getUid(), toolSessionID); Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -27,7 +27,6 @@ import java.io.StringReader; import java.util.Date; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -47,7 +46,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -83,7 +81,7 @@ * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class GmapService implements ToolSessionManager, ToolContentManager, IGmapService, ToolContentImport102Manager { +public class GmapService implements ToolSessionManager, ToolContentManager, IGmapService { private static Logger logger = Logger.getLogger(GmapService.class.getName()); @@ -589,42 +587,6 @@ return toolService.isGroupedActivity(toolContentID); } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 Gmap - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Gmap gmap = new Gmap(); - gmap.setContentInUse(Boolean.FALSE); - gmap.setCreateBy(new Long(user.getUserID().longValue())); - gmap.setCreateDate(now); - gmap.setDefineLater(Boolean.FALSE); - gmap.setLockOnFinished(Boolean.TRUE); - gmap.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - gmap.setToolContentId(toolContentId); - gmap.setUpdateDate(now); - gmapDAO.saveOrUpdate(gmap); - } - - /** 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 { - - GmapService.logger.warn( - "Setting the reflective field on a gmap. This doesn't make sense as the gmap is for reflection and we don't reflect on reflection!"); - Gmap gmap = getGmapByContentId(toolContentId); - if (gmap == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - gmap.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -32,7 +32,6 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -61,7 +60,6 @@ import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.service.IRatingService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -102,8 +100,7 @@ /** * @author Andrey Balan */ -public class ImageGalleryServiceImpl - implements IImageGalleryService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager { +public class ImageGalleryServiceImpl implements IImageGalleryService, ToolContentManager, ToolSessionManager { private final static String MEDIUM_FILENAME_PREFIX = "medium_"; @@ -145,7 +142,7 @@ private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; - + private IRatingService ratingService; private IEventNotificationService eventNotificationService; @@ -210,12 +207,12 @@ public void saveOrUpdateImageGalleryItem(ImageGalleryItem image) { imageGalleryItemDao.saveObject(image); } - + @Override public void deleteImage(Long toolSessionId, Long imageUid) { ImageGallery imageGallery = getImageGalleryBySessionId(toolSessionId); ImageGalleryItem image = getImageGalleryItemByUid(imageUid); - + Set imageList = imageGallery.getImageGalleryItems(); imageList.remove(image); imageGallery.setImageGalleryItems(imageList); @@ -345,7 +342,7 @@ public void updateEntry(NotebookEntry notebookEntry) { coreNotebookService.updateEntry(notebookEntry); } - + @Override public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId) { @@ -355,30 +352,30 @@ return ratingCriteria; } - + @Override public List getRatingCriteriaDtos(Long contentId, Collection itemIds, boolean isCommentsByOtherUsersRequired, Long userId) { return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId); } - + @Override public int getCountItemsRatedByUser(Long toolContentId, Integer userId) { return ratingService.getCountItemsRatedByUser(toolContentId, userId); } - + @Override public List getRatingCriterias(Long toolContentId) { List ratingCriterias = ratingService.getCriteriasByToolContentId(toolContentId); return ratingCriterias; } - + @Override public void saveRatingCriterias(HttpServletRequest request, Collection oldCriterias, Long toolContentId) { ratingService.saveRatingCriterias(request, oldCriterias, toolContentId); } - + @Override public boolean isCommentsEnabled(Long toolContentId) { return ratingService.isCommentsEnabled(toolContentId); @@ -402,7 +399,7 @@ // one new group for one session. group = new ArrayList(); Set groupImages = getImagesForGroup(imageGallery, session.getSessionId()); - + List itemRatingDtos = null; if (imageGallery.isAllowRank()) { // create itemIds list @@ -468,15 +465,15 @@ for (ImageGallerySession session : sessionList) { // one new group for one session. group = new ArrayList(); -// Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId()); + // Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId()); List users = imageGalleryUserDao.getBySessionID(session.getSessionId()); for (ImageGalleryUser user : users) { - + //create UserContribution UserImageContributionDTO userContribution = new UserImageContributionDTO(session.getSessionName(), user); - + if (imageGallery.isAllowVote()) { int numberOfVotesForImage = imageVoteDao.getNumImageVotesByImageUid(image.getUid(), session.getSessionId()); @@ -496,11 +493,11 @@ // ImageRating rating = imageRatingDao.getImageRatingByImageAndUser(image.getUid(), // user.getUserId()); -// if (rating != null) { -// userContribution.setRating(rating.getRating()); -// } + // if (rating != null) { + // userContribution.setRating(rating.getRating()); + // } } - + group.add(userContribution); } @@ -566,10 +563,10 @@ List userContributionList = new ArrayList(); -// Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId()); -// UserImageContributionDTO userContribution = createUserContribution(image, user, session, ratingForGroup); -// userContribution.setImage(image); -// userContributionList.add(userContribution); + // Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId()); + // UserImageContributionDTO userContribution = createUserContribution(image, user, session, ratingForGroup); + // userContribution.setImage(image); + // userContributionList.add(userContribution); imageList.add(userContributionList); } @@ -589,16 +586,16 @@ dbImages.addAll(imageGallery.getImageGalleryItems()); for (ImageGalleryItem image : dbImages) { List userContributionList = new ArrayList(); -// Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId()); + // Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId()); -// List userList = imageGalleryUserDao.getBySessionID(imageSession.getSessionId()); -// for (ImageGalleryUser user : userList) { -// UserImageContributionDTO userContribution = createUserContribution(image, user, imageSession, -// ratingForGroup); -// userContribution.setImage(image); -// userContributionList.add(userContribution); -// } -// imageList.add(userContributionList); + // List userList = imageGalleryUserDao.getBySessionID(imageSession.getSessionId()); + // for (ImageGalleryUser user : userList) { + // UserImageContributionDTO userContribution = createUserContribution(image, user, imageSession, + // ratingForGroup); + // userContribution.setImage(image); + // userContributionList.add(userContribution); + // } + // imageList.add(userContributionList); } @@ -793,7 +790,7 @@ toolContentObj = ImageGallery.newInstance(toolContentObj, toolContentId); Set images = toolContentObj.getImageGalleryItems(); for (ImageGalleryItem image : images) { - + //convert file extension to lower case String fileName = image.getFileName(); String[] fileNameParts = fileName.split("\\."); @@ -837,7 +834,7 @@ try { // register version filter class exportContentService.registerImportVersionFilterClass(ImageGalleryImportContentVersionFilter.class); - + exportContentService.registerFileClassForImport(ImageGalleryAttachment.class.getName(), "fileUuid", "fileVersionId", "fileName", "fileType", null, null); @@ -926,15 +923,15 @@ } } } - + imageGalleryDao.saveObject(toContent); } @Override public String getToolContentTitle(Long toolContentId) { return getImageGalleryByContentId(toolContentId).getTitle(); } - + @Override public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { ImageGallery imageGallery = imageGalleryDao.getByContentId(toolContentId); @@ -948,18 +945,18 @@ public boolean isContentEdited(Long toolContentId) { return getImageGalleryByContentId(toolContentId).isDefineLater(); } - + @Override public boolean isReadOnly(Long toolContentId) { for (ImageGallerySession session : imageGallerySessionDao.getByContentId(toolContentId)) { if (!imageGalleryUserDao.getBySessionID(session.getSessionId()).isEmpty()) { return true; } } - + return false; } - + @Override public void removeToolContent(Long toolContentId) throws ToolException { ImageGallery imageGallery = imageGalleryDao.getByContentId(toolContentId); @@ -993,7 +990,7 @@ .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); return; } - + Iterator itemIterator = gallery.getImageGalleryItems().iterator(); while (itemIterator.hasNext()) { ImageGalleryItem item = itemIterator.next(); @@ -1035,7 +1032,7 @@ } } - + @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ImageGallerySession session = new ImageGallerySession(); @@ -1096,36 +1093,12 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return imageGalleryOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } - + @Override public void forceCompleteUser(Long toolSessionId, User user) { //no actions required } - /* ===============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) { - } - - /** 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 { - - ImageGallery toolContentObj = getImageGalleryByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - /* =================================================================================== */ public IExportToolContentService getExportContentService() { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -59,7 +58,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -80,7 +78,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeConfigItem; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem; -import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemInstruction; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemVisitLog; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeSession; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeUser; @@ -94,8 +91,6 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; @@ -104,8 +99,7 @@ * @author Andrey Balan * */ -public class CommonCartridgeServiceImpl - implements ICommonCartridgeService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager { +public class CommonCartridgeServiceImpl implements ICommonCartridgeService, ToolContentManager, ToolSessionManager { static Logger log = Logger.getLogger(CommonCartridgeServiceImpl.class.getName()); private CommonCartridgeDAO commonCartridgeDao; @@ -1084,54 +1078,6 @@ //no actions required } - /* ===============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) { - } - - private CommonCartridgeItemInstruction createInstruction(Hashtable instructionEntry) - throws WDDXProcessorConversionException { - - Integer instructionOrder = WDDXProcessor.convertToInteger(instructionEntry, - ToolContentImport102Manager.CONTENT_URL_URL_VIEW_ORDER); - - // the description column in 1.0.2 was longer than 255 chars, so truncate. - String instructionText = (String) instructionEntry.get(ToolContentImport102Manager.CONTENT_URL_INSTRUCTION); - if ((instructionText != null) && (instructionText.length() > 255)) { - if (CommonCartridgeServiceImpl.log.isDebugEnabled()) { - CommonCartridgeServiceImpl.log - .debug("1.0.2 Import truncating Item Instruction to 255 characters. Original text was\'" - + instructionText + "\'"); - } - instructionText = instructionText.substring(0, 255); - } - - CommonCartridgeItemInstruction instruction = new CommonCartridgeItemInstruction(); - instruction.setDescription(instructionText); - instruction.setSequenceId(instructionOrder); - - return instruction; - } - - /** 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 { - - CommonCartridge toolContentObj = getCommonCartridgeByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - /* =================================================================================== */ public IExportToolContentService getExportContentService() { Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -26,7 +26,6 @@ import java.sql.Timestamp; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -43,7 +42,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -84,8 +82,7 @@ * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class KalturaService - implements ToolSessionManager, ToolContentManager, IKalturaService, ToolContentImport102Manager { +public class KalturaService implements ToolSessionManager, ToolContentManager, IKalturaService { private static Logger logger = Logger.getLogger(KalturaService.class.getName()); @@ -652,30 +649,6 @@ return messageService.getMessage(key, args); } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 Kaltura - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - } - - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - KalturaService.logger.warn( - "Setting the reflective field on a kaltura. This doesn't make sense as the kaltura is for reflection and we don't reflect on reflection!"); - Kaltura kaltura = getKalturaByContentId(toolContentId); - if (kaltura == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - kaltura.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -rbcca58d5b7597693db2f6d01764f29a9145876a7 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision bcca58d5b7597693db2f6d01764f29a9145876a7) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -29,7 +29,6 @@ import java.util.Collections; import java.util.Date; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -38,7 +37,6 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; import javax.servlet.http.HttpSession; @@ -67,7 +65,6 @@ import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.IToolVO; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -104,10 +101,7 @@ import org.lamsfoundation.lams.util.ExcelUtil; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.dao.DataAccessException; @@ -119,8 +113,8 @@ * * @author Ozgur Demirtas */ -public class McServicePOJO implements IMcService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager, - ToolRestManager, McAppConstants { +public class McServicePOJO + implements IMcService, ToolContentManager, ToolSessionManager, ToolRestManager, McAppConstants { private static Logger logger = Logger.getLogger(McServicePOJO.class.getName()); private IMcContentDAO mcContentDAO; @@ -416,18 +410,18 @@ "Exception occured when lams is getting the mc QueUsr by uid." + e.getMessage(), e); } } - + @Override - public List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, - String searchString) { + public List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, + String sortOrder, String searchString) { return mcUserDAO.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString); } @Override public int getCountPagedUsersBySession(Long sessionId, String searchString) { return mcUserDAO.getCountPagedUsersBySession(sessionId, searchString); } - + @Override public String getLocalizedMessage(String key) { return messageService.getMessage(key); @@ -782,15 +776,15 @@ //update mark for one particular question userAttempt.setMark(newMark); mcUsrAttemptDAO.saveMcUsrAttempt(userAttempt); - + //update user's total mark McQueUsr user = userAttempt.getMcQueUsr(); user.setLastAttemptTotalMark(totalMark); updateMcQueUsr(user); // propagade changes to Gradebook gradebookService.updateActivityMark(new Double(totalMark), null, userId, toolSessionId, false); - + // record mark change with audit service auditService.logMarkChange(McAppConstants.MY_SIGNATURE, userAttempt.getMcQueUsr().getQueUsrId(), userAttempt.getMcQueUsr().getUsername(), "" + oldMark, "" + totalMark); @@ -1742,114 +1736,7 @@ this.mcOutputFactory = mcOutputFactory; } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 Chat - */ @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - McContent toolContentObj = new McContent(); - toolContentObj.setCreatedBy(user.getUserID().longValue()); - toolContentObj.setCreationDate(now); - toolContentObj.setDefineLater(false); - toolContentObj.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - toolContentObj.setReflect(false); - toolContentObj.setReflectionSubject(null); - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - - toolContentObj.setContent(null); - toolContentObj.setUpdateDate(now); - toolContentObj.setMcContentId(toolContentId); - toolContentObj.setQuestionsSequenced(false); - toolContentObj.setShowMarks(false); - toolContentObj.setRandomize(false); - toolContentObj.setUseSelectLeaderToolOuput(false); - toolContentObj.setPrefixAnswersWithLetters(true); - toolContentObj.setDisplayAnswers(false); - // I can't find a use for setShowReport anywhere - toolContentObj.setShowReport(false); - - try { - Boolean bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_Q_ALLOW_REDO); - toolContentObj.setRetries(bool != null ? bool : false); - - bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_Q_FEEDBACK); - // toolContentObj.setShowFeedback(bool!=null?bool:false); - - Integer minPassMark = WDDXProcessor.convertToInteger(importValues, - ToolContentImport102Manager.CONTENT_Q_MIN_PASSMARK); - toolContentObj.setPassMark(minPassMark != null ? minPassMark : new Integer(0)); - - // leave as empty, no need to set them to anything. - // setMcUploadedFiles(Set mcSessions); - // setMcSessions(Set mcSessions); - - mcContentDAO.saveMcContent(toolContentObj); - - // set up questions - Vector questions = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_Q_QUESTION_INFO); - if (questions != null) { - - Iterator iter = questions.iterator(); - while (iter.hasNext()) { - Hashtable questionMap = (Hashtable) iter.next(); - create102Question(questionMap, toolContentObj); - } - - } - - } catch (WDDXProcessorConversionException e) { - McServicePOJO.logger.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - mcContentDAO.saveMcContent(toolContentObj); - } - - private void create102Question(Hashtable questionMap, McContent toolContentObj) - throws WDDXProcessorConversionException { - McQueContent question = new McQueContent(); - question.setDisplayOrder( - WDDXProcessor.convertToInteger(questionMap, ToolContentImport102Manager.CONTENT_Q_ORDER)); - - question.setFeedback((String) questionMap.get(ToolContentImport102Manager.CONTENT_Q_FEEDBACK)); - question.setQuestion( - WebUtil.convertNewlines((String) questionMap.get(ToolContentImport102Manager.CONTENT_Q_QUESTION))); - - // In 1.0.2 all questions are implicitly assumed to be 1 and be of equal weight - question.setMark(new Integer(1)); - - String correctAnswer = (String) questionMap.get(ToolContentImport102Manager.CONTENT_Q_ANSWER); - - Vector candidates = (Vector) questionMap.get(ToolContentImport102Manager.CONTENT_Q_CANDIDATES); - if (candidates != null) { - Iterator candIterator = candidates.iterator(); - while (candIterator.hasNext()) { - Hashtable candidate = (Hashtable) candIterator.next(); - String optionText = (String) candidate.get(ToolContentImport102Manager.CONTENT_Q_ANSWER); - if ((optionText != null) && (optionText.length() > 0)) { - // 1.0.2 has a display order but 2.0 doesn't ToolContentImport102Manager.CONTENT_Q_ORDER - McOptsContent options = new McOptsContent(); - options.setCorrectOption((correctAnswer != null) && correctAnswer.equals(optionText)); - options.setMcQueOptionText(optionText); - options.setMcQueContent(question); - question.getMcOptionsContents().add(options); - } - } - } - - toolContentObj.getMcQueContents().add(question); - question.setMcContent(toolContentObj); - question.setMcContentId(toolContentObj.getUid()); - } - - @Override public List getReflectionList(McContent mcContent, Long userID) { List reflectionsContainerDTO = new LinkedList(); if (userID == null) { @@ -1903,25 +1790,7 @@ return reflectionsContainerDTO; } - /** 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 { - - McContent toolContentObj = null; - if (toolContentId != null) { - toolContentObj = getMcContent(toolContentId); - } - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflect(true); - toolContentObj.setReflectionSubject(description); - } - - @Override public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -61,7 +60,6 @@ import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.IToolVO; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -99,10 +97,7 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.dao.DataAccessException; @@ -113,8 +108,8 @@ * * @author Ozgur Demirtas */ -public class QaServicePOJO implements IQaService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager, - ToolRestManager, QaAppConstants { +public class QaServicePOJO + implements IQaService, ToolContentManager, ToolSessionManager, ToolRestManager, QaAppConstants { private static Logger logger = Logger.getLogger(QaServicePOJO.class.getName()); private IQaContentDAO qaDAO; @@ -1240,81 +1235,6 @@ this.exportContentService = exportContentService; } - /* - * ===============Methods implemented from ToolContentImport102Manager =============== - */ - - /** - * Import the data for a 1.0.2 Chat - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - QaContent toolContentObj = new QaContent(); - toolContentObj.setCreatedBy(user.getUserID().longValue()); - toolContentObj.setCreationDate(now); - toolContentObj.setDefineLater(false); - toolContentObj.setInstructions(null); - toolContentObj.setReflect(false); - toolContentObj.setReflectionSubject(null); - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - toolContentObj.setQaContentId(toolContentId); - toolContentObj.setUpdateDate(now); - toolContentObj.setQuestionsSequenced(false); // there is only 1 - // question - toolContentObj.setContent(null); - toolContentObj.setReportTitle(null); - toolContentObj.setMonitoringReportTitle(null); - // in LAMS 2.0 - toolContentObj.setLockWhenFinished(true); - toolContentObj.setNoReeditAllowed(false); - toolContentObj.setShowOtherAnswers(true); - toolContentObj.setAllowRateAnswers(false); - toolContentObj.setNotifyTeachersOnResponseSubmit(false); - - Boolean bool; - try { - bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_SHOW_USER); - toolContentObj.setUsernameVisible(bool != null ? bool : false); - } catch (WDDXProcessorConversionException e) { - QaServicePOJO.logger.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - // leave as empty, no need to set them to anything. - // setQaSessions(Set qaSessions); - - // set up question from body - QaQueContent question = new QaQueContent(); - String content = WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY)); - question.setQuestion(content); - question.setDisplayOrder(1); - question.setQaContent(toolContentObj); - toolContentObj.getQaQueContents().add(question); - - qaDAO.saveOrUpdateQa(toolContentObj); - - } - - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - QaContent qaContent = null; - if (toolContentId != null) { - qaContent = getQaContent(toolContentId.longValue()); - } - if (qaContent == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - qaContent.setReflect(true); - qaContent.setReflectionSubject(description); - } - // ========================================================================================= /** * @return Returns the coreNotebookService. Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -31,8 +31,6 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -41,9 +39,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -72,7 +68,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -108,18 +103,14 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; /** * @author Dapeng.Ni */ -public class ResourceServiceImpl implements IResourceService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, ToolRestManager { +public class ResourceServiceImpl implements IResourceService, ToolContentManager, ToolSessionManager, ToolRestManager { private static Logger log = Logger.getLogger(ResourceServiceImpl.class.getName()); private ResourceDAO resourceDao; @@ -583,14 +574,14 @@ } return userList; } - + @Override public List getPagedVisitLogsBySessionAndItem(Long sessionId, Long itemUid, int page, int size, String sortBy, String sortOrder, String searchString) { return resourceItemVisitDao.getPagedVisitLogsBySessionAndItem(sessionId, itemUid, page, size, sortBy, sortOrder, searchString); } - + @Override public int getCountVisitLogsBySessionAndItem(Long sessionId, Long itemUid, String searchString) { return resourceItemVisitDao.getCountVisitLogsBySessionAndItem(sessionId, itemUid, searchString); @@ -1116,169 +1107,7 @@ //no actions required } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Resource toolContentObj = new Resource(); - - try { - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - toolContentObj.setContentId(toolContentId); - toolContentObj.setContentInUse(Boolean.FALSE); - toolContentObj.setCreated(now); - toolContentObj.setDefineLater(Boolean.FALSE); - toolContentObj.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - 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); - toolContentObj.setAllowAddFiles(bool != null ? bool : Boolean.TRUE); - bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_URL); - toolContentObj.setAllowAddUrls(bool != null ? bool : Boolean.TRUE); - Integer minToComplete = WDDXProcessor.convertToInteger(importValues, - ToolContentImport102Manager.CONTENT_URL_MIN_NUMBER_COMPLETE); - toolContentObj.setMiniViewResourceNumber(minToComplete != null ? minToComplete.intValue() : 0); - bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_URL); - toolContentObj.setLockWhenFinished(Boolean.FALSE); - toolContentObj.setRunAuto(Boolean.FALSE); - - // leave as empty, no need to set them to anything. - // toolContentObj.setAttachments(attachments); - - /* - * unused entries from 1.0.2 [directoryName=] no equivalent in 2.0 [runtimeSubmissionStaffFile=true] no - * equivalent in 2.0 [contentShowUser=false] no equivalent in 2.0 [isHTML=false] no equivalent in 2.0 - * [showbuttons=false] no equivalent in 2.0 [isReusable=false] not used in 1.0.2 (would be lock when - * finished) - */ - ResourceUser ruser = new ResourceUser(); - ruser.setUserId(new Long(user.getUserID().longValue())); - ruser.setFirstName(user.getFirstName()); - ruser.setLastName(user.getLastName()); - ruser.setLoginName(user.getLogin()); - createUser(ruser); - toolContentObj.setCreatedBy(ruser); - - // Resource Items. They are ordered on the screen by create date so they need to be saved in the right - // order. - // So read them all in first, then go through and assign the dates in the correct order and then save. - Vector urls = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_URL_URLS); - SortedMap items = new TreeMap(); - if (urls != null) { - Iterator iter = urls.iterator(); - while (iter.hasNext()) { - Hashtable urlMap = (Hashtable) iter.next(); - Integer itemOrder = WDDXProcessor.convertToInteger(urlMap, - ToolContentImport102Manager.CONTENT_URL_URL_VIEW_ORDER); - ResourceItem item = new ResourceItem(); - item.setTitle((String) urlMap.get(ToolContentImport102Manager.CONTENT_TITLE)); - item.setCreateBy(ruser); - item.setCreateByAuthor(true); - item.setHide(false); - - Vector instructions = (Vector) urlMap - .get(ToolContentImport102Manager.CONTENT_URL_URL_INSTRUCTION_ARRAY); - if ((instructions != null) && (instructions.size() > 0)) { - item.setItemInstructions(new HashSet()); - Iterator insIter = instructions.iterator(); - while (insIter.hasNext()) { - item.getItemInstructions().add(createInstruction((Hashtable) insIter.next())); - } - } - - String resourceType = (String) urlMap.get(ToolContentImport102Manager.CONTENT_URL_URL_TYPE); - if (ToolContentImport102Manager.URL_RESOURCE_TYPE_URL.equals(resourceType)) { - item.setType(ResourceConstants.RESOURCE_TYPE_URL); - item.setUrl((String) urlMap.get(ToolContentImport102Manager.CONTENT_URL_URL_URL)); - item.setOpenUrlNewWindow(false); - } else if (ToolContentImport102Manager.URL_RESOURCE_TYPE_WEBSITE.equals(resourceType)) { - item.setType(ResourceConstants.RESOURCE_TYPE_WEBSITE); - } else if (ToolContentImport102Manager.URL_RESOURCE_TYPE_FILE.equals(resourceType)) { - item.setType(ResourceConstants.RESOURCE_TYPE_FILE); - item.setOpenUrlNewWindow(false); - } else { - throw new ToolException("Invalid shared resources type. Type was " + resourceType); - } - - items.put(itemOrder, item); - } - } - - Iterator iter = items.values().iterator(); - Date itemDate = null; - while (iter.hasNext()) { - if (itemDate != null) { - try { - Thread.sleep(1000); - } catch (Exception e) { - } - } - itemDate = new Date(); - - ResourceItem item = (ResourceItem) iter.next(); - item.setCreateDate(itemDate); - toolContentObj.getResourceItems().add(item); - } - - } catch (WDDXProcessorConversionException e) { - ResourceServiceImpl.log.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - resourceDao.saveObject(toolContentObj); - - } - - private ResourceItemInstruction createInstruction(Hashtable instructionEntry) - throws WDDXProcessorConversionException { - - Integer instructionOrder = WDDXProcessor.convertToInteger(instructionEntry, - ToolContentImport102Manager.CONTENT_URL_URL_VIEW_ORDER); - - // the description column in 1.0.2 was longer than 255 chars, so truncate. - String instructionText = (String) instructionEntry.get(ToolContentImport102Manager.CONTENT_URL_INSTRUCTION); - if ((instructionText != null) && (instructionText.length() > 255)) { - if (ResourceServiceImpl.log.isDebugEnabled()) { - ResourceServiceImpl.log - .debug("1.0.2 Import truncating Item Instruction to 255 characters. Original text was\'" - + instructionText + "\'"); - } - instructionText = instructionText.substring(0, 255); - } - - ResourceItemInstruction instruction = new ResourceItemInstruction(); - instruction.setDescription(instructionText); - instruction.setSequenceId(instructionOrder); - - return instruction; - } - - /** 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 { - - Resource toolContentObj = getResourceByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getResourceOutputFactory().getSupportedDefinitionClasses(definitionType); } Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.leaderselection.service; import java.util.Date; -import java.util.Hashtable; import java.util.List; import java.util.Set; import java.util.SortedMap; @@ -50,7 +49,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -77,8 +75,8 @@ * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class LeaderselectionService implements ToolSessionManager, ToolContentManager, ILeaderselectionService, - ToolContentImport102Manager, ToolRestManager { +public class LeaderselectionService + implements ToolSessionManager, ToolContentManager, ILeaderselectionService, ToolRestManager { private static Logger logger = Logger.getLogger(LeaderselectionService.class.getName()); @@ -232,7 +230,7 @@ } for (LeaderselectionSession session : (Set) selection.getLeaderselectionSessions()) { - if (session.getGroupLeader() != null && session.getGroupLeader().getUserId().equals(userId.longValue())) { + if ((session.getGroupLeader() != null) && session.getGroupLeader().getUserId().equals(userId.longValue())) { session.setGroupLeader(null); leaderselectionSessionDAO.update(session); } @@ -495,25 +493,6 @@ } } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - } - - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - Leaderselection leaderselection = getContentByContentId(toolContentId); - if (leaderselection == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - leaderselection.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -r3f3940c10223c3efeff9c25dc2b8315dfb190c30 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 3f3940c10223c3efeff9c25dc2b8315dfb190c30) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -46,7 +45,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -77,7 +75,6 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import com.thoughtworks.xstream.XStream; @@ -88,8 +85,7 @@ * An implementation of the IMindmapService interface. As a requirement, all LAMS tool's service bean must implement * ToolContentManager and ToolSessionManager. */ -public class MindmapService implements ToolSessionManager, ToolContentManager, IMindmapService, - ToolContentImport102Manager, ToolRestManager { +public class MindmapService implements ToolSessionManager, ToolContentManager, IMindmapService, ToolRestManager { private static Logger logger = Logger.getLogger(MindmapService.class.getName()); @@ -777,47 +773,6 @@ this.auditService = auditService; } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 Mindmap - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Mindmap mindmap = new Mindmap(); - mindmap.setContentInUse(Boolean.FALSE); - mindmap.setCreateBy(new Long(user.getUserID().longValue())); - mindmap.setCreateDate(now); - mindmap.setDefineLater(Boolean.FALSE); - mindmap.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - mindmap.setLockOnFinished(Boolean.TRUE); - mindmap.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - mindmap.setToolContentId(toolContentId); - mindmap.setUpdateDate(now); - // mindmap.setAllowRichEditor(Boolean.FALSE); - // leave as empty, no need to set them to anything. - // setMindmapSessions(Set mindmapSessions); - mindmapDAO.saveOrUpdate(mindmap); - } - - /** 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 { - - MindmapService.logger.warn( - "Setting the reflective field on a mindmap. This doesn't make sense as the mindmap is for reflection and we don't reflect on reflection!"); - Mindmap mindmap = getMindmapByContentId(toolContentId); - if (mindmap == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - mindmap.setInstructions(description); - } - // ========================================================================================= /* Used by Spring to "inject" the linked objects */ @@ -1067,6 +1022,7 @@ saveMindmapNode(null, rootMindmapNode, 3l, childNodeName2, "ffffff", null, content, null); } + @Override public XStream getXStream() { return xstream; } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.noticeboard.service; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.SortedMap; @@ -46,7 +45,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -64,9 +62,7 @@ import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; -import org.lamsfoundation.lams.util.WebUtil; /** * An implementation of the NoticeboardService interface. @@ -76,8 +72,8 @@ * @author mtruong * */ -public class NoticeboardServicePOJO implements INoticeboardService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, ToolRestManager { +public class NoticeboardServicePOJO + implements INoticeboardService, ToolContentManager, ToolSessionManager, ToolRestManager { private static Logger log = Logger.getLogger(NoticeboardServicePOJO.class); private ILearnerService learnerService; @@ -542,37 +538,6 @@ } @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - NoticeboardContent toolContentObj = new NoticeboardContent(); - String content = WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY)); - toolContentObj.setContent(content); - toolContentObj.setContentInUse(false); - toolContentObj.setCreatorUserId(user.getUserID().longValue()); - toolContentObj.setDateCreated(now); - toolContentObj.setDateUpdated(now); - toolContentObj.setDefineLater(false); - toolContentObj.setNbContentId(toolContentId); - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - toolContentObj.setReflectOnActivity(false); - nbContentDAO.saveNbContent(toolContentObj); - } - - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - NoticeboardContent toolContentObj = retrieveNoticeboard(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - - @Override public Long getToolDefaultContentIdBySignature(String toolSignature) { return toolService.getToolDefaultContentIdBySignature(toolSignature); } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -redba8c9898046064fc839e9840fea429272aff59 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision edba8c9898046064fc839e9840fea429272aff59) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.Date; -import java.util.Hashtable; import java.util.List; import java.util.Random; import java.util.Set; @@ -46,7 +45,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -69,7 +67,6 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; /** @@ -78,8 +75,7 @@ * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class NotebookService implements ToolSessionManager, ToolContentManager, INotebookService, - ToolContentImport102Manager, ToolRestManager { +public class NotebookService implements ToolSessionManager, ToolContentManager, INotebookService, ToolRestManager { private static Logger logger = Logger.getLogger(NotebookService.class.getName()); @@ -204,7 +200,7 @@ notebook.setDefineLater(false); notebookDAO.saveOrUpdate(notebook); } - + @Override public void removeToolContent(Long toolContentId) throws ToolException { Notebook notebook = notebookDAO.getByContentId(toolContentId); @@ -481,60 +477,24 @@ private String getLocalisedMessage(String key, Object[] args) { return messageService.getMessage(key, args); } - - public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString) { - return notebookUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, coreNotebookService); + + @Override + public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, + String searchString) { + return notebookUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, + coreNotebookService); } - + + @Override public int getCountUsersBySession(final Long sessionId, String searchString) { return notebookUserDAO.getCountUsersBySession(sessionId, searchString); } + @Override public List getStatisticsBySession(final Long contentId) { return notebookUserDAO.getStatisticsBySession(contentId); } - - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - /** - * Import the data for a 1.0.2 Notebook - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Notebook notebook = new Notebook(); - notebook.setContentInUse(Boolean.FALSE); - notebook.setCreateBy(new Long(user.getUserID().longValue())); - notebook.setCreateDate(now); - notebook.setDefineLater(Boolean.FALSE); - notebook.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - notebook.setLockOnFinished(Boolean.TRUE); - notebook.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - notebook.setToolContentId(toolContentId); - notebook.setUpdateDate(now); - notebook.setAllowRichEditor(Boolean.FALSE); - // leave as empty, no need to set them to anything. - // setNotebookSessions(Set notebookSessions); - notebookDAO.saveOrUpdate(notebook); - } - - /** 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 { - - NotebookService.logger.warn( - "Setting the reflective field on a notebook. This doesn't make sense as the notebook is for reflection and we don't reflect on reflection!"); - Notebook notebook = getNotebookByContentId(toolContentId); - if (notebook == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - notebook.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -27,8 +27,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.util.Date; -import java.util.Hashtable; import java.util.List; import java.util.SortedMap; @@ -41,7 +39,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -66,7 +63,6 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; /** @@ -75,8 +71,7 @@ * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class PixlrService - implements ToolSessionManager, ToolContentManager, IPixlrService, ToolContentImport102Manager { +public class PixlrService implements ToolSessionManager, ToolContentManager, IPixlrService { private static Logger logger = Logger.getLogger(PixlrService.class.getName()); @@ -592,51 +587,6 @@ pixlrConfigItemDAO.saveOrUpdate(item); } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 Pixlr - */ - @Override - @SuppressWarnings("unchecked") - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Pixlr pixlr = new Pixlr(); - pixlr.setContentInUse(Boolean.FALSE); - pixlr.setCreateBy(new Long(user.getUserID().longValue())); - pixlr.setCreateDate(now); - pixlr.setDefineLater(Boolean.FALSE); - pixlr.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - pixlr.setLockOnFinished(Boolean.TRUE); - pixlr.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - pixlr.setToolContentId(toolContentId); - pixlr.setUpdateDate(now); - pixlr.setReflectOnActivity(Boolean.FALSE); - // leave as empty, no need to set them to anything. - // setPixlrAttachments(Set pixlrAttachments); - // setPixlrSessions(Set pixlrSessions); - pixlrDAO.saveOrUpdate(pixlr); - } - - /** - * 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 { - - PixlrService.logger.warn( - "Setting the reflective field on a pixlr. This doesn't make sense as the pixlr is for reflection and we don't reflect on reflection!"); - Pixlr pixlr = getPixlrByContentId(toolContentId); - if (pixlr == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - pixlr.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -27,7 +27,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -56,7 +55,6 @@ import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -84,16 +82,16 @@ /** * @author Andrey Balan */ -public class PeerreviewServiceImpl implements IPeerreviewService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, ToolRestManager { +public class PeerreviewServiceImpl + implements IPeerreviewService, ToolContentManager, ToolSessionManager, ToolRestManager { private static Logger log = Logger.getLogger(PeerreviewServiceImpl.class.getName()); private PeerreviewDAO peerreviewDao; private PeerreviewUserDAO peerreviewUserDao; private PeerreviewSessionDAO peerreviewSessionDao; - + // tool service private PeerreviewToolContentHandler peerreviewToolContentHandler; @@ -110,15 +108,15 @@ private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; - + private IRatingService ratingService; private SortedSet creatingUsersForSessionIds; PeerreviewServiceImpl() { creatingUsersForSessionIds = Collections.synchronizedSortedSet(new TreeSet()); } - + // ******************************************************************************* // Service method // ******************************************************************************* @@ -185,7 +183,7 @@ public void saveOrUpdatePeerreviewSession(PeerreviewSession resSession) { peerreviewSessionDao.saveObject(resSession); } - + @Override public void markUserFinished(Long toolSessionId, Long userId) { PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndSessionID(userId, toolSessionId); @@ -260,13 +258,13 @@ return reflections; } - + @Override public List getUsersForTablesorter(final Long toolSessionId, final Long excludeUserId, int page, int size, int sorting) { return peerreviewUserDao.getUsersForTablesorter(toolSessionId, excludeUserId, page, size, sorting); - } - + } + @Override public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) { return peerreviewUserDao.getCountUsersBySession(toolSessionId, excludeUserId); @@ -298,17 +296,17 @@ public PeerreviewUser getUser(Long uid) { return (PeerreviewUser) peerreviewUserDao.getObject(PeerreviewUser.class, uid); } - + @Override public List getUsersBySession(Long toolSessionId) { return peerreviewUserDao.getBySessionID(toolSessionId); } - + @Override public List getUsersByContent(Long toolContentId) { return peerreviewUserDao.getByContentId(toolContentId); } - + @Override public boolean createUsersFromLesson(Long toolSessionId) throws Throwable { // can we change lesson's class? @@ -318,21 +316,21 @@ try { boolean wasNotInSetAlready = creatingUsersForSessionIds.add(toolSessionId); if (!wasNotInSetAlready) { -// log.debug("Peer Review: Already processing session " + toolSessionId); + // log.debug("Peer Review: Already processing session " + toolSessionId); return false; } -// log.debug("Peer Review: Processing session " + toolSessionId); + // log.debug("Peer Review: Processing session " + toolSessionId); long start = System.currentTimeMillis(); int usersAdded = 0; PeerreviewSession session = getPeerreviewSessionBySessionId(toolSessionId); Integer numberPotentialLearners = toolService.getCountUsersForActivity(toolSessionId); -// log.debug("Peer Review UserCreateThread " + toolSessionId + ": getCountUsersForActivity took: " -// + (System.currentTimeMillis() - start) + "ms. numLearners "+numberPotentialLearners); + // log.debug("Peer Review UserCreateThread " + toolSessionId + ": getCountUsersForActivity took: " + // + (System.currentTimeMillis() - start) + "ms. numLearners "+numberPotentialLearners); List sessionUserIds = peerreviewUserDao.getUserIdsBySessionID(toolSessionId); -// log.debug("Peer Review UserCreateThread " + toolSessionId + ": getUserIdsBySessionID took: " -// + (System.currentTimeMillis() - start) + "ms."); + // log.debug("Peer Review UserCreateThread " + toolSessionId + ": getUserIdsBySessionID took: " + // + (System.currentTimeMillis() - start) + "ms."); boolean needsUpdate = sessionUserIds.size() != numberPotentialLearners.intValue(); if (needsUpdate) { @@ -347,21 +345,21 @@ } } -// log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: " -// + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded); + // log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: " + // + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded); creatingUsersForSessionIds.remove(toolSessionId); return true; } catch (Throwable e) { creatingUsersForSessionIds.remove(toolSessionId); String message = e.getMessage() != null ? e.getMessage() : e.getClass().getName(); PeerreviewServiceImpl.log .error("Exception thrown creating Peer Review users for session " + toolSessionId + " user id: " - + (currentUser != null ? currentUser.getUserId().toString() : "null") + "; " + message, e); + + (currentUser != null ? currentUser.getUserId().toString() : "null") + "; " + message, e); e.printStackTrace(); throw (e); - } + } } - + // ***************************************************************************** // private methods // ***************************************************************************** @@ -393,7 +391,7 @@ public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } - + @Override public String getLocalisedMessage(String key, Object[] args) { return messageService.getMessage(key, args); @@ -446,11 +444,11 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); if (toolContentObj.getRatingCriterias() != null) { - for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { - criteria.setToolContentId(toolContentId); - } + for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { + criteria.setToolContentId(toolContentId); } - + } + // reset the user PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), toolContentId); @@ -523,15 +521,19 @@ List list = peerreviewSessionDao.getByContentId(toolContentId); Iterator iter = list.iterator(); while (iter.hasNext()) { - PeerreviewSession session = (PeerreviewSession) iter.next(); - if ( peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L) == 0) { - log.debug("Peer Review isReadOnly called. Returning true. Count of users for session id "+session.getSessionId()+" is "+peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L)); + PeerreviewSession session = iter.next(); + if (peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L) == 0) { + PeerreviewServiceImpl.log + .debug("Peer Review isReadOnly called. Returning true. Count of users for session id " + + session.getSessionId() + " is " + + peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L)); return true; } else { - log.debug("Peer Review isReadOnly called. Count of users for session id "+session.getSessionId()+" is 0"); + PeerreviewServiceImpl.log.debug("Peer Review isReadOnly called. Count of users for session id " + + session.getSessionId() + " is 0"); } } - log.debug("Peer Review isReadOnly called. Returning false."); + PeerreviewServiceImpl.log.debug("Peer Review isReadOnly called. Returning false."); return false; } @@ -618,23 +620,23 @@ } return learnerService.completeToolSession(toolSessionId, learnerId); } - + @Override public List getRatingCriterias(Long toolContentId) { return ratingService.getCriteriasByToolContentId(toolContentId); } - + @Override public void saveRatingCriterias(HttpServletRequest request, Collection oldCriterias, Long toolContentId) { ratingService.saveRatingCriterias(request, oldCriterias, toolContentId); } - + @Override public boolean isCommentsEnabled(Long toolContentId) { return ratingService.isCommentsEnabled(toolContentId); } - + @Override public int getCommentsMinWordsLimit(Long toolContentId) { return ratingService.getCommentsMinWordsLimit(toolContentId); @@ -645,30 +647,30 @@ boolean isCommentsByOtherUsersRequired, Long userId) { return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId); } - + @Override public ItemRatingDTO getRatingCriteriaDtoWithActualRatings(Long contentId, Long itemId) { return ratingService.getRatingCriteriaDtoWithActualRatings(contentId, itemId); } - + @Override public List getRatingCriteriaDtos(Long contentId, Collection itemIds, boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem) { List itemRatingDTOs = getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId); - + if (isCountUsersRatedEachItem) { Map itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, itemIds, userId.intValue()); - + for (ItemRatingDTO itemRatingDTO : itemRatingDTOs) { Long itemId = itemRatingDTO.getItemId(); - + int countUsersRatedEachItem = itemIdToRatedUsersCountMap.get(itemId).intValue(); itemRatingDTO.setCountUsersRatedEachItem(countUsersRatedEachItem); } } - + return itemRatingDTOs; } @@ -709,28 +711,7 @@ // no actions required } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - } - - /** 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 { - - Peerreview toolContentObj = getPeerreviewByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return null; } @@ -778,7 +759,7 @@ public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { this.coreNotebookService = coreNotebookService; } - + public void setRatingService(IRatingService ratingService) { this.ratingService = ratingService; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r1fdab2d1df4835bf09b88e2bb34e4016c43af73a -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 1fdab2d1df4835bf09b88e2bb34e4016c43af73a) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -72,7 +71,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -103,14 +101,13 @@ import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.springframework.dao.DataAccessException; /** * @author Manpreet Minhas */ -public class SubmitFilesService implements ToolContentManager, ToolSessionManager, ISubmitFilesService, - ToolContentImport102Manager, ToolRestManager { +public class SubmitFilesService + implements ToolContentManager, ToolSessionManager, ISubmitFilesService, ToolRestManager { private static Logger log = Logger.getLogger(SubmitFilesService.class); @@ -914,56 +911,7 @@ return toolService.isGroupedActivity(toolContentID); } - /* ===============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) { - Date now = new Date(); - SubmitFilesContent toolContentObj = new SubmitFilesContent(); - - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - toolContentObj.setContentID(toolContentId); - toolContentObj.setContentInUse(Boolean.FALSE); - toolContentObj.setCreated(now); - toolContentObj.setDefineLater(Boolean.FALSE); - toolContentObj.setInstruction( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - 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); - - // leave as empty, no need to set them to anything. - // toolContentObj.setInstructionFiles(attachments); - - submitFilesContentDAO.saveOrUpdate(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 { - - SubmitFilesContent toolContentObj = getSubmitFilesContent(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - - @Override public SubmitUser getUserByUid(Long learnerID) { return (SubmitUser) submitUserDAO.find(SubmitUser.class, learnerID); @@ -996,8 +944,8 @@ @Override public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString, boolean getNotebookEntries) { - return submitUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, - getNotebookEntries, coreNotebookService); + return submitUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, + coreNotebookService); } @Override @@ -1009,7 +957,7 @@ public List getStatisticsBySession(final Long contentId) { return submitUserDAO.getStatisticsBySession(contentId); } - + public SubmitUser createContentUser(Integer userId, String firstName, String lastName, String loginName, Long contentId) { SubmitUser author = submitUserDAO.getContentUser(contentId, userId); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r012f2ed99cee528b71b0ba249b4edd1e45abd442 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 012f2ed99cee528b71b0ba249b4edd1e45abd442) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -30,7 +30,6 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -59,7 +58,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -101,8 +99,8 @@ /** * @author Andrey Balan */ -public class ScratchieServiceImpl implements IScratchieService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, ToolRestManager { +public class ScratchieServiceImpl + implements IScratchieService, ToolContentManager, ToolSessionManager, ToolRestManager { private static Logger log = Logger.getLogger(ScratchieServiceImpl.class.getName()); private static final ExcelCell[] EMPTY_ROW = new ExcelCell[4]; @@ -1455,10 +1453,10 @@ ExcelCell[][] fourthPageData = rowList.toArray(new ExcelCell[][] {}); dataToExport.put(getMessage("label.spss.analysis"), fourthPageData); - + // ======================================================= Burning questions page // ======================================= - + if (scratchie.isBurningQuestionsEnabled()) { rowList = new LinkedList(); @@ -1473,7 +1471,7 @@ row = new ExcelCell[1]; row[0] = new ExcelCell(item.getTitle(), false); rowList.add(row); - + Map groupNameToBurningQuestion = burningQuestionDto.getGroupNameToBurningQuestion(); for (String groupName : groupNameToBurningQuestion.keySet()) { String burningQuestion = groupNameToBurningQuestion.get(groupName); @@ -1809,7 +1807,7 @@ return false; } - + @Override public void removeToolContent(Long toolContentId) throws ToolException { Scratchie scratchie = scratchieDao.getByContentId(toolContentId); @@ -1942,30 +1940,6 @@ // need to copyAnswersFromLeader() } - /* ===============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) { - } - - /** 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 { - - Scratchie toolContentObj = getScratchieByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - /* =================================================================================== */ public IExportToolContentService getExportContentService() { Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -26,7 +26,6 @@ import java.util.Date; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -47,7 +46,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -70,18 +68,14 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; -import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; /** * An implementation of the IScribeService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class ScribeService implements ToolSessionManager, ToolContentManager, ToolContentImport102Manager, - ToolRestManager, IScribeService { +public class ScribeService implements ToolSessionManager, ToolContentManager, ToolRestManager, IScribeService { private static Logger logger = Logger.getLogger(ScribeService.class.getName()); @@ -571,72 +565,6 @@ } } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 Scribe - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Scribe scribe = new Scribe(); - scribe.setContentInUse(Boolean.FALSE); - scribe.setCreateBy(new Long(user.getUserID().longValue())); - scribe.setCreateDate(now); - scribe.setDefineLater(Boolean.FALSE); - scribe.setInstructions(null); - scribe.setReflectInstructions(null); - scribe.setReflectOnActivity(Boolean.FALSE); - scribe.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - scribe.setToolContentId(toolContentId); - scribe.setUpdateDate(now); - scribe.setAutoSelectScribe(true); - - try { - Boolean isReusable = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_REUSABLE); - scribe.setLockOnFinished(isReusable != null ? !isReusable.booleanValue() : true); - } catch (WDDXProcessorConversionException e) { - ScribeService.logger.error("Unable to content for activity " + scribe.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + scribe.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - String headingList = (String) importValues.get(ToolContentImport102Manager.CONTENT_BODY); - if ((headingList != null) && (headingList.length() > 0)) { - String[] headings = headingList.split("\\^"); - Set set = new HashSet(); - for (int i = 0; i < headings.length; i++) { - ScribeHeading sHeading = new ScribeHeading(); - sHeading.setDisplayOrder(i); - sHeading.setHeadingText(WebUtil.convertNewlines(headings[i])); - sHeading.setScribe(scribe); - set.add(sHeading); - } - scribe.setScribeHeadings(set); - } - - // leave as empty, no need to set them to anything. - // setScribeSessions(Set scribeSessions); - scribeDAO.saveOrUpdate(scribe); - } - - /** 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 { - - Scribe scribe = getScribeByContentId(toolContentId); - if (scribe == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - scribe.setReflectOnActivity(Boolean.TRUE); - scribe.setReflectInstructions(description); - } - // ========================================================================================= public void setScribeHeadingDAO(IScribeHeadingDAO scribeHeadingDAO) { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Set; @@ -42,7 +41,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -77,8 +75,7 @@ * @author Andrey Balan * */ -public class SpreadsheetServiceImpl - implements ISpreadsheetService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager { +public class SpreadsheetServiceImpl implements ISpreadsheetService, ToolContentManager, ToolSessionManager { private static Logger log = Logger.getLogger(SpreadsheetServiceImpl.class.getName()); private SpreadsheetDAO spreadsheetDao; private SpreadsheetUserDAO spreadsheetUserDao; @@ -311,7 +308,7 @@ return spreadsheetUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, coreNotebookService); } - + @Override public int getCountUsersBySession(Long sessionId, String searchString) { return spreadsheetUserDao.getCountUsersBySession(sessionId, searchString); @@ -739,26 +736,6 @@ //no actions required } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - } - - /** Set the description, throws away the title value as this is not supported in 2.0 */ - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - Spreadsheet toolContentObj = getSpreadsheetByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - /* =================================================================================== */ public IExportToolContentService getExportContentService() { Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r0012f4c60038db0a2c4754b641f95c24ddd0d84a -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 0012f4c60038db0a2c4754b641f95c24ddd0d84a) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -29,7 +29,6 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -38,9 +37,7 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; @@ -55,7 +52,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -89,15 +85,11 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; /** * @author Dapeng.Ni */ -public class SurveyServiceImpl implements ISurveyService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, ToolRestManager { +public class SurveyServiceImpl implements ISurveyService, ToolContentManager, ToolSessionManager, ToolRestManager { private static Logger log = Logger.getLogger(SurveyServiceImpl.class.getName()); // DAO @@ -265,11 +257,13 @@ return map; } + @Override public List getUserReflectionsForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString) { - return surveyUserDao.getUserReflectionsForTablesorter(sessionId, page, size, sorting, searchString, coreNotebookService); + return surveyUserDao.getUserReflectionsForTablesorter(sessionId, page, size, sorting, searchString, + coreNotebookService); } - + @Override public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText) { @@ -335,8 +329,8 @@ } @Override - public List getQuestionAnswersForTablesorter(Long sessionId, Long questionId, - int page, int size, int sorting, String searchString) { + public List getQuestionAnswersForTablesorter(Long sessionId, Long questionId, int page, int size, + int sorting, String searchString) { return surveyUserDao.getUsersForTablesorter(sessionId, questionId, page, size, sorting, searchString); } @@ -345,7 +339,7 @@ public int getCountUsersBySession(final Long sessionId, String searchString) { return surveyUserDao.getCountUsersBySession(sessionId, searchString); } - + @Override public void updateAnswerList(List answerList) { for (SurveyAnswer ans : answerList) { @@ -374,7 +368,7 @@ } Integer numFreeChoice = null; - if ( answerDto.isAppendText() || (answerDto.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY) ) { + if (answerDto.isAppendText() || (answerDto.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)) { numFreeChoice = getCountResponsesBySessionAndQuestion(sessionId, questionUid); numberAnswers += numFreeChoice; } @@ -400,7 +394,6 @@ return answerDto; } - @Override public List getOpenResponsesForTablesorter(final Long qaSessionId, final Long questionId, int page, int size, int sorting) { @@ -438,12 +431,12 @@ @Override public SortedMap getStatistic(Long contentId) { SortedMap result = new TreeMap(new SurveySessionComparator()); - + List stats = surveyUserDao.getStatisticsBySession(contentId); - for ( Object[] stat : stats) { + for (Object[] stat : stats) { SurveySession session = (SurveySession) stat[0]; Integer numUsers = (Integer) stat[1]; - result.put(session,numUsers); + result.put(session, numUsers); } return result; @@ -890,164 +883,6 @@ //no actions required } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /* - * Sample content for import: content 34.0 1.0 Sample Multiple choice - only one response allowed? simpleChoice 1.0 Option 1 - * 2.0 Option 2 - * 3.0 Option 3 - * 2.0 Sample Multiple choice - multiple - * response allowed? choiceMultiple 1.0 Option 1 2.0 Option 2 3.0 Option 3 - * 3.0 Sample Free text question? textEntry - * Put instructions - * here. Thank you for your participation! xxxxxxxxxx - * Put Title Here Survey - * Questions surveycontent 31.0 - */ - - /** - * Import the data for a 1.0.2 Noticeboard or HTMLNoticeboard - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Survey toolContentObj = new Survey(); - - try { - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - toolContentObj.setContentId(toolContentId); - toolContentObj.setContentInUse(Boolean.FALSE); - toolContentObj.setCreated(now); - toolContentObj.setDefineLater(Boolean.FALSE); - toolContentObj.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - toolContentObj.setUpdated(now); - - Boolean isReusable = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_REUSABLE); - toolContentObj.setLockWhenFinished(isReusable != null ? !isReusable.booleanValue() : true); - - SurveyUser ruser = new SurveyUser(); - ruser.setUserId(new Long(user.getUserID().longValue())); - ruser.setFirstName(user.getFirstName()); - ruser.setLastName(user.getLastName()); - ruser.setLoginName(user.getLogin()); - createUser(ruser); - toolContentObj.setCreatedBy(ruser); - - // survey questions - toolContentObj.setQuestions(new HashSet()); - - Vector questions = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTIONS); - if (questions != null) { - int dummySequenceNumber = questions.size(); // dummy number in case we can't convert question order - Iterator iter = questions.iterator(); - while (iter.hasNext()) { - Hashtable questionMap = (Hashtable) iter.next(); - - SurveyQuestion item = new SurveyQuestion(); - item.setCreateDate(now); - item.setCreateBy(ruser); - - // try to set the type from the map. if that doesn't work then assume it is a text entry - String surveyType = (String) questionMap - .get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTION_TYPE); - if (ToolContentImport102Manager.CONTENT_SURVEY_TYPE_SINGLE.equals(surveyType)) { - item.setType((short) 1); - item.setAllowMultipleAnswer(false); - } else if (ToolContentImport102Manager.CONTENT_SURVEY_TYPE_MULTIPLE.equals(surveyType)) { - item.setType((short) 2); - item.setAllowMultipleAnswer(true); - } else { - item.setType((short) 3); - item.setAllowMultipleAnswer(false); - } - - Integer order = WDDXProcessor.convertToInteger(questionMap, - ToolContentImport102Manager.CONTENT_SURVEY_ORDER); - item.setSequenceId(order != null ? order.intValue() : dummySequenceNumber++); - - item.setDescription(WebUtil.convertNewlines( - (String) questionMap.get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTION))); - - // completion message purposely not supported in 2.0, so value can be dropped. - - Boolean appendText = WDDXProcessor.convertToBoolean(questionMap, - ToolContentImport102Manager.CONTENT_SURVEY_TEXTBOX_ENABLED); - item.setAppendText(appendText != null ? appendText.booleanValue() : false); - - Boolean isOptional = WDDXProcessor.convertToBoolean(questionMap, - ToolContentImport102Manager.CONTENT_SURVEY_OPTIONAL); - item.setOptional(isOptional != null ? isOptional.booleanValue() : false); - - Vector candidates = (Vector) questionMap.get(ToolContentImport102Manager.CONTENT_SURVEY_CANDIDATES); - if ((candidates != null) && (candidates.size() > 0)) { - item.setOptions(new HashSet()); - int dummyCandidateOrder = candidates.size(); // dummy number in case we can't convert - // question order - Iterator candIter = candidates.iterator(); - while (candIter.hasNext()) { - Hashtable candidateEntry = (Hashtable) candIter.next(); - String candidateText = (String) candidateEntry - .get(ToolContentImport102Manager.CONTENT_SURVEY_ANSWER); - Integer candidateOrder = WDDXProcessor.convertToInteger(candidateEntry, - ToolContentImport102Manager.CONTENT_SURVEY_ORDER); - - SurveyOption option = new SurveyOption(); - option.setDescription(candidateText); - option.setSequenceId( - candidateOrder != null ? candidateOrder.intValue() : dummyCandidateOrder++); - item.getOptions().add(option); - } - } - - toolContentObj.getQuestions().add(item); - } - } - - } catch (WDDXProcessorConversionException e) { - SurveyServiceImpl.log.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - surveyDao.saveObject(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 { - - Survey toolContentObj = getSurveyByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); - } - // ***************************************************************************** // set methods for Spring Bean // ***************************************************************************** Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -rdef4291c38fd0644305ee8a76ec6569ce391bc83 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision def4291c38fd0644305ee8a76ec6569ce391bc83) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -49,7 +48,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -93,8 +91,7 @@ * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.service.ITaskListService */ -public class TaskListServiceImpl - implements ITaskListService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager { +public class TaskListServiceImpl implements ITaskListService, ToolContentManager, ToolSessionManager { private static Logger log = Logger.getLogger(TaskListServiceImpl.class.getName()); private TaskListDAO taskListDao; private TaskListItemDAO taskListItemDao; @@ -220,7 +217,7 @@ public TaskListItem getTaskListItemByUid(Long itemUid) { return taskListItemDao.getByUid(itemUid); } - + @Override public List getSessionsByContentId(Long contentId) { return taskListSessionDao.getByContentId(contentId); @@ -300,17 +297,18 @@ } } } - + @Override public Collection getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, String searchString) { return taskListUserDao.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString); } - + @Override - public Collection getPagedUsersBySessionAndItem(Long sessionId, Long taskListItemUid, int page, int size, String sortBy, - String sortOrder, String searchString) { - return taskListUserDao.getPagedUsersBySessionAndItem(sessionId, taskListItemUid, page, size, sortBy, sortOrder, searchString); + public Collection getPagedUsersBySessionAndItem(Long sessionId, Long taskListItemUid, int page, + int size, String sortBy, String sortOrder, String searchString) { + return taskListUserDao.getPagedUsersBySessionAndItem(sessionId, taskListItemUid, page, size, sortBy, sortOrder, + searchString); } @Override @@ -338,7 +336,8 @@ TaskListItem item = itemList.get(j); // retreiving TaskListItemVisitLog for current taskList and user - visitNumbers[j] = taskListItemVisitDao.getCountCompletedTasksBySessionAndItem(toolSessionId, item.getUid()); + visitNumbers[j] = taskListItemVisitDao.getCountCompletedTasksBySessionAndItem(toolSessionId, + item.getUid()); } SessionDTO summary = new SessionDTO(toolSessionId, session.getSessionName(), itemList, visitNumbers); @@ -432,7 +431,7 @@ return itemSummary; } - + @Override public NotebookEntry getEntry(Long sessionId, Integer userId) { List list = coreNotebookService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, @@ -443,7 +442,7 @@ return list.get(0); } } - + @Override public List getReflectList(Long contentId) { List reflectList = new LinkedList(); @@ -617,7 +616,7 @@ public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } - + @Override public String getMessage(String key) { return messageService.getMessage(key); @@ -1018,28 +1017,6 @@ //no actions required } - // ******************************************************************************* - // Methods implementing ToolContentImport102Manager - // ******************************************************************************* - - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - } - - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - TaskList toolContentObj = getTaskListByContentId(toolContentId); - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflectOnActivity(Boolean.TRUE); - toolContentObj.setReflectInstructions(description); - } - // ***************************************************************************** // Private methods // ***************************************************************************** Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -25,8 +25,6 @@ package org.lamsfoundation.lams.tool.videoRecorder.service; import java.util.ArrayList; -import java.util.Date; -import java.util.Hashtable; import java.util.List; import java.util.Set; import java.util.SortedMap; @@ -40,7 +38,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -71,16 +68,14 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; /** * An implementation of the IVideoRecorderService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class VideoRecorderService - implements ToolSessionManager, ToolContentManager, IVideoRecorderService, ToolContentImport102Manager { +public class VideoRecorderService implements ToolSessionManager, ToolContentManager, IVideoRecorderService { private static Logger logger = Logger.getLogger(VideoRecorderService.class.getName()); @@ -385,7 +380,7 @@ return true; } } - + return false; } @@ -591,44 +586,6 @@ return videoRecorderUser; } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - - /** - * Import the data for a 1.0.2 VideoRecorder - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - VideoRecorder videoRecorder = new VideoRecorder(); - videoRecorder.setContentInUse(Boolean.FALSE); - videoRecorder.setCreateBy(new Long(user.getUserID().longValue())); - videoRecorder.setCreateDate(now); - videoRecorder.setDefineLater(Boolean.FALSE); - videoRecorder.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - videoRecorder.setLockOnFinished(Boolean.TRUE); - videoRecorder.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - videoRecorder.setToolContentId(toolContentId); - videoRecorder.setUpdateDate(now); - videoRecorderDAO.saveOrUpdate(videoRecorder); - } - - /** 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 { - - VideoRecorderService.logger.warn( - "Setting the reflective field on a videoRecorder. This doesn't make sense as the videoRecorder is for reflection and we don't reflect on reflection!"); - VideoRecorder videoRecorder = getVideoRecorderByContentId(toolContentId); - if (videoRecorder == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - videoRecorder.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -35,7 +34,6 @@ import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -59,7 +57,6 @@ import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.SimpleURL; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -93,10 +90,7 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.dao.DataAccessException; @@ -107,8 +101,8 @@ * * @author Ozgur Demirtas */ -public class VoteServicePOJO implements IVoteService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager, VoteAppConstants, ToolRestManager { +public class VoteServicePOJO + implements IVoteService, ToolContentManager, ToolSessionManager, VoteAppConstants, ToolRestManager { private static Logger logger = Logger.getLogger(VoteServicePOJO.class.getName()); private IVoteContentDAO voteContentDAO; @@ -1510,88 +1504,7 @@ } - /* ===============Methods implemented from ToolContentImport102Manager =============== */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - VoteContent toolContentObj = new VoteContent(); - toolContentObj.setCreatedBy(user.getUserID().longValue()); - toolContentObj.setCreationDate(now); - toolContentObj.setDefineLater(false); - toolContentObj.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - toolContentObj.setReflectionSubject(null); - toolContentObj.setReflect(false); - toolContentObj.setUseSelectLeaderToolOuput(false); - toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - - toolContentObj.setContent(null); - toolContentObj.setUpdateDate(now); - toolContentObj.setVoteContentId(toolContentId); - toolContentObj.setLockOnFinish(false); - toolContentObj.setShowResults(true); - - try { - Boolean bool = WDDXProcessor.convertToBoolean(importValues, - ToolContentImport102Manager.CONTENT_VOTE_ALLOW_POLL_NOMINATIONS); - toolContentObj.setAllowText(bool != null ? bool : false); - - bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_REUSABLE); - toolContentObj.setLockOnFinish(bool != null ? bool : true); - - Integer maxCount = WDDXProcessor.convertToInteger(importValues, - ToolContentImport102Manager.CONTENT_VOTE_MAXCHOOSE); - toolContentObj.setMaxNominationCount(maxCount != null ? maxCount.toString() : "1"); - - Integer minCount = WDDXProcessor.convertToInteger(importValues, - ToolContentImport102Manager.CONTENT_VOTE_MINCHOOSE); - toolContentObj.setMinNominationCount(minCount != null ? minCount.toString() : "1"); - - } catch (WDDXProcessorConversionException e) { - VoteServicePOJO.logger.error("Unable to content for activity " + toolContentObj.getTitle() - + "properly due to a WDDXProcessorConversionException.", e); - throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle() - + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); - } - - // leave as empty, no need to set them to anything. - // setVoteSessions(Set voteSessions); - - // set up question from body - Vector nominations = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_VOTE_NOMINATIONS); - if (nominations != null) { - Iterator iter = nominations.iterator(); - int order = 1; - while (iter.hasNext()) { - String element = (String) iter.next(); - VoteQueContent nomination = new VoteQueContent(element, toolContentObj); - nomination.setDisplayOrder(order++); - toolContentObj.getVoteQueContents().add(nomination); - } - } - - voteContentDAO.saveVoteContent(toolContentObj); - } - - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - VoteContent toolContentObj = null; - if (toolContentId != null) { - toolContentObj = getVoteContent(toolContentId); - } - if (toolContentObj == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - toolContentObj.setReflect(Boolean.TRUE.booleanValue()); - toolContentObj.setReflectionSubject(description); - } - - @Override public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -27,7 +27,6 @@ import java.util.Arrays; import java.util.Date; import java.util.HashSet; -import java.util.Hashtable; import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -49,7 +48,6 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -78,15 +76,13 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; /** * An implementation of the IWikiService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class WikiService - implements ToolSessionManager, ToolContentManager, IWikiService, ToolContentImport102Manager, ToolRestManager { +public class WikiService implements ToolSessionManager, ToolContentManager, IWikiService, ToolRestManager { private static Logger logger = Logger.getLogger(WikiService.class.getName()); @@ -880,56 +876,6 @@ return adds; } - /* - * ===============Methods implemented from ToolContentImport102Manager =============== - */ - - /** - * Import the data for a 1.0.2 Wiki - */ - @Override - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Wiki wiki = new Wiki(); - wiki.setContentInUse(Boolean.FALSE); - wiki.setCreateBy(new Long(user.getUserID().longValue())); - wiki.setCreateDate(now); - wiki.setDefineLater(Boolean.FALSE); - wiki.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - wiki.setLockOnFinished(Boolean.TRUE); - wiki.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - wiki.setToolContentId(toolContentId); - wiki.setUpdateDate(now); - wiki.setAllowLearnerAttachImages(Boolean.TRUE); - wiki.setAllowLearnerCreatePages(Boolean.TRUE); - wiki.setAllowLearnerInsertLinks(Boolean.TRUE); - wiki.setReflectOnActivity(Boolean.FALSE); - wiki.setReflectInstructions(null); - wiki.setMaximumEdits(0); - wiki.setMinimumEdits(0); - - wikiDAO.saveOrUpdate(wiki); - } - - /** - * 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 { - - WikiService.logger.warn( - "Setting the reflective field on a wiki. This doesn't make sense as the wiki is for reflection and we don't reflect on reflection!"); - Wiki wiki = getWikiByContentId(toolContentId); - if (wiki == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - wiki.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r8be2bc782a2c7066c8c33f5605962584df7a2f9b --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) @@ -24,8 +24,6 @@ package org.lamsfoundation.lams.tool.wookie.service; -import java.util.Date; -import java.util.Hashtable; import java.util.List; import java.util.SortedMap; @@ -39,7 +37,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -64,16 +61,14 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; /** * An implementation of the IWookieService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class WookieService - implements ToolSessionManager, ToolContentManager, IWookieService, ToolContentImport102Manager { +public class WookieService implements ToolSessionManager, ToolContentManager, IWookieService { private static Logger logger = Logger.getLogger(WookieService.class.getName()); @@ -603,51 +598,6 @@ return messageService.getMessage(key); } - /* - * ===============Methods implemented from ToolContentImport102Manager - * =============== - */ - - /** - * Import the data for a 1.0.2 Wookie - */ - @Override - @SuppressWarnings("unchecked") - public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { - Date now = new Date(); - Wookie wookie = new Wookie(); - wookie.setContentInUse(Boolean.FALSE); - wookie.setCreateBy(user.getUserID()); - wookie.setCreateDate(now); - wookie.setDefineLater(Boolean.FALSE); - wookie.setInstructions( - WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY))); - wookie.setLockOnFinished(Boolean.TRUE); - wookie.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); - wookie.setToolContentId(toolContentId); - wookie.setUpdateDate(now); - wookie.setReflectOnActivity(Boolean.FALSE); - wookieDAO.saveOrUpdate(wookie); - } - - /** - * 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 { - - WookieService.logger.warn( - "Setting the reflective field on a wookie. This doesn't make sense as the wookie is for reflection and we don't reflect on reflection!"); - Wookie wookie = getWookieByContentId(toolContentId); - if (wookie == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - wookie.setInstructions(description); - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */