Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (.../AuthoringController.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -61,7 +61,7 @@ import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.security.ISecurityService; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutputDefinition; import org.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO; @@ -336,7 +336,7 @@ } // get title from tool content - IToolVO tool = toolService.getToolByID(toolID); + Tool tool = toolService.getToolByID(toolID); if (learningLibraryID == null) { // if learning library ID is not set explicitly, derive it from tool learningLibraryID = tool.getLearningLibraryId(); Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java =================================================================== diff -u -r33829c670fd8c90447d62ea3300498a103905e7a -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java (.../HelpTag.java) (revision 33829c670fd8c90447d62ea3300498a103905e7a) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java (.../HelpTag.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -34,7 +34,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.util.CentralConstants; import org.lamsfoundation.lams.util.HelpUtil; @@ -51,6 +51,7 @@ * @author Fiona Malikoff */ public class HelpTag extends TagSupport { + private static final long serialVersionUID = -4529242646662173012L; private static final Logger log = Logger.getLogger(HelpTag.class); private String module = null; @@ -95,7 +96,7 @@ // retrieve help URL for tool ILamsToolService toolService = (ILamsToolService) getContext() .getBean(CentralConstants.TOOL_SERVICE_BEAN_NAME); - IToolVO tool = toolService.getToolBySignature(toolSignature); + Tool tool = toolService.getToolBySignature(toolSignature); String fullURL = HelpUtil.constructToolURL(tool.getHelpUrl(), toolSignature, module, languageCode); Fisheye: Tag f95c86fefb27fbad60e46af80e1a487bae53561a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f95c86fefb27fbad60e46af80e1a487bae53561a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f95c86fefb27fbad60e46af80e1a487bae53561a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== diff -u -rcbe532f585efe39250986f20d58cbef855115cf3 -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision cbe532f585efe39250986f20d58cbef855115cf3) +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -351,14 +351,6 @@ return new HashCodeBuilder().append(getToolId()).toHashCode(); } - public IToolVO createBasicToolVO() { - IToolVO vo = new BasicToolVO(toolId, learnerUrl, learnerPreviewUrl, learnerProgressUrl, authorUrl, monitorUrl, - helpUrl, defaultToolContentId, learningLibraryId, toolSignature, toolDisplayName, description, - serviceName, createDateTime, groupingSupportTypeId, toolIdentifier, toolVersion, languageFile, - extLmsId); - return vo; - } - public String getPedagogicalPlannerUrl() { return pedagogicalPlannerUrl; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -29,7 +29,6 @@ import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.learning.service.LearnerServiceException; import org.lamsfoundation.lams.learningdesign.ToolActivity; -import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolSession; @@ -46,9 +45,9 @@ public interface ILamsToolService { public static final String LEADER_SELECTION_TOOL_SIGNATURE = "lalead11"; - IToolVO getToolByID(Long toolId); + Tool getToolByID(Long toolId); - IToolVO getToolBySignature(final String toolSignature); + Tool getToolBySignature(final String toolSignature); long getToolDefaultContentIdBySignature(final String toolSignature); @@ -91,7 +90,7 @@ * in case of problems. */ String completeToolSession(Long toolSessionId, Long learnerId); - + /** * Method for updating an activity mark that tools can call * @@ -116,10 +115,10 @@ * @return */ Boolean isGroupedActivity(long toolContentID); - + /** * Audit log the teacher has started editing activity in monitor. - * + * * @param toolContentID */ void auditLogStartEditingActivityInMonitor(long toolContentID); @@ -158,10 +157,10 @@ * @return */ Long getLeaderUserId(Long toolSessionId, Integer learnerId); - + /** * Returns all leaders available in the nearest leader selection tool (that is all leaders in all sessions). - * + * * @param toolSessionId * @param learnerId * @return @@ -172,21 +171,25 @@ * Returns leaders' userIds for all tool sessions from the given Leader Selection Tool. */ Set getLeaderUserId(Long leaderSelectionActivityId); - + /** * Returns all activities that precede specified activity and produce confidence levels. - * - * @param toolContentId toolContentId of the specified activity + * + * @param toolContentId + * toolContentId of the specified activity * @return */ Set getPrecedingConfidenceLevelsActivities(Long toolContentId); - + /** - * Returns confidence levels from the specified activity. - * - * @param activityUiid activityUiid of the activity with confidence levels - * @param requestorUserId userId of the requesting user. we need it in order to get confidence level providing tool's sessionId - * @param requestorToolSessionId toolSessionId of the activity that calls this method + * Returns confidence levels from the specified activity. + * + * @param activityUiid + * activityUiid of the activity with confidence levels + * @param requestorUserId + * userId of the requesting user. we need it in order to get confidence level providing tool's sessionId + * @param requestorToolSessionId + * toolSessionId of the activity that calls this method * @return */ List getConfidenceLevelsByActivity(Integer confidenceLevelActivityUiid, Integer requestorUserId, Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -32,7 +32,6 @@ import java.util.TreeSet; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.hibernate.Hibernate; import org.hibernate.proxy.HibernateProxy; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -50,7 +49,6 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolSession; @@ -70,8 +68,6 @@ * @author Ozgur Demirtas 24/06/2005 */ public class LamsToolService implements ILamsToolService { - private static Logger log = Logger.getLogger(LamsToolService.class); - // Leader selection tool Constants private static final String LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID = "leader.user.id"; @@ -91,15 +87,13 @@ private IDataFlowDAO dataFlowDAO; @Override - public IToolVO getToolByID(Long toolId) { - Tool tool = toolDAO.getToolByID(toolId); - return tool.createBasicToolVO(); + public Tool getToolByID(Long toolId) { + return toolDAO.getToolByID(toolId); } @Override - public IToolVO getToolBySignature(final String toolSignature) { - Tool tool = toolDAO.getToolBySignature(toolSignature); - return tool.createBasicToolVO(); + public Tool getToolBySignature(final String toolSignature) { + return toolDAO.getToolBySignature(toolSignature); } @Override @@ -137,12 +131,12 @@ public ToolSession getToolSession(Long toolSessionId) { return toolSessionDAO.getToolSession(toolSessionId); } - + @Override public String completeToolSession(Long toolSessionId, Long learnerId) { return learnerService.completeToolSession(toolSessionId, learnerId); } - + @Override public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, Boolean markedInGradebook) { @@ -154,7 +148,6 @@ gradebookService.removeActivityMark(userID, toolSessionID); } - @SuppressWarnings("unchecked") @Override public Boolean isGroupedActivity(long toolContentID) { ToolActivity toolActivity = activityDAO.getToolActivityByToolContentId(toolContentID); @@ -206,11 +199,10 @@ } } - + @Override public ToolOutput getToolInput(Long requestingToolContentId, Integer assigmentId, Integer learnerId) { - DataFlowObject dataFlowObject = dataFlowDAO.getAssignedDataFlowObject(requestingToolContentId, - assigmentId); + DataFlowObject dataFlowObject = dataFlowDAO.getAssignedDataFlowObject(requestingToolContentId, assigmentId); User learner = (User) userManagementService.findById(User.class, learnerId); Activity activity = dataFlowObject.getDataTransition().getFromActivity(); String outputName = dataFlowObject.getName(); @@ -463,7 +455,7 @@ ToolSession session = toolSessionDAO.getToolSession(toolSessionId); return session.getLearners().size(); } - + // --------------------------------------------------------------------- // Inversion of Control Methods - Method injection // --------------------------------------------------------------------- @@ -509,19 +501,19 @@ public void setLessonService(ILessonService lessonService) { this.lessonService = lessonService; } - + public void setLearnerService(ILearnerService learnerService) { this.learnerService = learnerService; } - + /** * @param userService * User Management Service */ public void setUserManagementService(IUserManagementService userService) { this.userManagementService = userService; } - + public void setDataFlowDAO(IDataFlowDAO dataFlowDAO) { this.dataFlowDAO = dataFlowDAO; } Index: lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java (.../LamsAuthoringFinishController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java (.../LamsAuthoringFinishController.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -33,7 +33,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -81,7 +81,7 @@ ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false); String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID); String notifyCloseURL = (String) request.getSession().getAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL); - Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); // clear session according to the ToolAccessMode. clearSession(cSessionID, request.getSession(), mode); @@ -95,7 +95,7 @@ contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true); // check whether it use on define it later page - IToolVO tool = lamsToolService.getToolBySignature(signature); + Tool tool = lamsToolService.getToolBySignature(signature); //add reeditUrl parameter String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(), @@ -167,7 +167,7 @@ */ private Object findToolService(ApplicationContext applicationContext, String signature) throws NoSuchBeanDefinitionException { - IToolVO tool = lamsToolService.getToolBySignature(signature); + Tool tool = lamsToolService.getToolBySignature(signature); return applicationContext.getBean(tool.getServiceName()); } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -27,7 +27,7 @@ import java.util.Set; import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -87,7 +87,7 @@ void saveUserAttempt(McQueUsr user, List answerDtos); void updateMcUsrAttempt(McUsrAttempt mcUsrAttempt) throws McApplicationException; - + /** * Count how many attempts done to this option * @@ -114,7 +114,7 @@ McQueContent getQuestionByUid(Long uid); McQueUsr getMcUserByUID(Long uid) throws McApplicationException; - + McQueUsr getMcUserByContentId(Long userId, Long contentId); List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, @@ -141,7 +141,7 @@ void updateMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException; McUsrAttempt getUserAttemptByQuestion(Long queUsrUid, Long mcQueContentId); - + List getLearnerMarksByContentId(Long toolContentId); void copyToolContent(Long fromContentId, Long toContentId) throws ToolException; @@ -158,7 +158,7 @@ ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException; - IToolVO getToolBySignature(String toolSignature) throws McApplicationException; + Tool getToolBySignature(String toolSignature) throws McApplicationException; long getToolDefaultContentIdBySignature(String toolSignature) throws McApplicationException; @@ -183,10 +183,10 @@ * @return */ boolean isGroupedActivity(long toolContentID); - + /** * Audit log the teacher has started editing activity in monitor. - * + * * @param toolContentID */ void auditLogStartEditingActivityInMonitor(long toolContentID); @@ -196,11 +196,11 @@ * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created * for a particular activity such as the answer to the third question contains the word Koala and hence the need for * the toolContentId - * + * * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition */ String getActivityEvaluation(Long toolContentId); - + void setActivityEvaluation(Long toolContentId, String toolOutputDefinition); /** @@ -246,34 +246,37 @@ * @return */ List getReflectionList(McContent mcContent, Long userID); - - /** + + /** * Gets the basic statistics for the grades for the Leaders when an Assessment is done using * Group Leaders. So the averages, etc are for the whole Assessment, not for a Group. + * * @param contentId * @return */ LeaderResultsDTO getLeaderResultsDTOForLeaders(Long contentId); - - /** + + /** * Prepares data for the marks summary graph on the statistics page + * * @param assessment * @param sessionDtos * @return */ List getMarksArray(Long sessionId); - /** - * Prepares data for the marks summary graph on the statistics page, using the grades for the Leaders + /** + * Prepares data for the marks summary graph on the statistics page, using the grades for the Leaders * when an Assessment is done using Group Leaders. So the grades are for the whole Assessment, not for a Group. + * * @param assessment * @param sessionDtos * @return */ List getMarksArrayForLeaders(Long contentId); - /** - * Contains the session id and name for a session. If includeStatistics is true also includes the number of + /** + * Contains the session id and name for a session. If includeStatistics is true also includes the number of * learners, max min and average of marks for the session. */ List getSessionDtos(Long contentId, boolean includeStatistics); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -62,7 +62,7 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -1593,8 +1593,8 @@ } @Override - public IToolVO getToolBySignature(String toolSignature) throws McApplicationException { - IToolVO tool = toolService.getToolBySignature(toolSignature); + public Tool getToolBySignature(String toolSignature) throws McApplicationException { + Tool tool = toolService.getToolBySignature(toolSignature); return tool; } @@ -1925,7 +1925,8 @@ mcq.setShowMarks(JsonUtil.optBoolean(toolContentJSON, "showMarks", Boolean.FALSE)); mcq.setPrefixAnswersWithLetters(JsonUtil.optBoolean(toolContentJSON, "prefixAnswersWithLetters", Boolean.TRUE)); mcq.setPassMark(JsonUtil.optInt(toolContentJSON, "passMark", 0)); - mcq.setEnableConfidenceLevels(JsonUtil.optBoolean(toolContentJSON, RestTags.ENABLE_CONFIDENCE_LEVELS, Boolean.FALSE)); + mcq.setEnableConfidenceLevels( + JsonUtil.optBoolean(toolContentJSON, RestTags.ENABLE_CONFIDENCE_LEVELS, Boolean.FALSE)); // submissionDeadline is set in monitoring createMc(mcq); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -30,7 +30,7 @@ import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.rating.ToolRatingManager; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.qa.QaCondition; @@ -210,7 +210,7 @@ */ String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException; - IToolVO getToolBySignature(String toolSignature); + Tool getToolBySignature(String toolSignature); long getToolDefaultContentIdBySignature(String toolSignature); @@ -251,10 +251,10 @@ * @return */ boolean isGroupedActivity(long toolContentID); - + /** * Audit log the teacher has started editing activity in monitor. - * + * * @param toolContentID */ void auditLogStartEditingActivityInMonitor(long toolContentID); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -53,7 +53,7 @@ import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -944,8 +944,8 @@ } @Override - public IToolVO getToolBySignature(String toolSignature) { - IToolVO tool = toolService.getToolBySignature(toolSignature); + public Tool getToolBySignature(String toolSignature) { + Tool tool = toolService.getToolBySignature(toolSignature); return tool; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== diff -u -r879fb356ece6075603479b01215a6b05465a59c8 -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision 879fb356ece6075603479b01215a6b05465a59c8) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -33,7 +33,7 @@ import org.lamsfoundation.lams.learningdesign.DataFlowObject; import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.exception.DataMissingException; @@ -222,7 +222,7 @@ ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException; - IToolVO getToolBySignature(String toolSignature); + Tool getToolBySignature(String toolSignature); long getToolDefaultContentIdBySignature(String toolSignature); @@ -243,7 +243,7 @@ NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID); void updateEntry(NotebookEntry notebookEntry); - + void removeQuestionsFromCache(VoteContent voteContent); void removeVoteContentFromCache(VoteContent voteContent); @@ -263,10 +263,10 @@ * @return */ boolean isGroupedActivity(long toolContentID); - + /** * Audit log the teacher has started editing activity in monitor. - * + * * @param toolContentID */ void auditLogStartEditingActivityInMonitor(long toolContentID); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java =================================================================== diff -u -r374f1e3729c3892074184bbd480ae87bce110cfd -rf95c86fefb27fbad60e46af80e1a487bae53561a --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 374f1e3729c3892074184bbd480ae87bce110cfd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision f95c86fefb27fbad60e46af80e1a487bae53561a) @@ -56,8 +56,8 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.SimpleURL; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -1537,8 +1537,8 @@ } @Override - public IToolVO getToolBySignature(String toolSignature) { - IToolVO tool = toolService.getToolBySignature(toolSignature); + public Tool getToolBySignature(String toolSignature) { + Tool tool = toolService.getToolBySignature(toolSignature); return tool; }