Index: lams_build/lib/lams/lams-gradebook.jar =================================================================== diff -u -rf494ac5c2f49f92be600b6392d9c85c291df7bb7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java (.../ToolOutput.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java (.../ToolOutput.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -32,6 +32,11 @@ private String name; private String description; private ToolOutputValue value; + + /** + * User Id. Used when tool returns multiple tool outputs for different users. + */ + private Integer userId; /** * Create a ToolOutput based on a Boolean. This will create a value of type OUTPUT_BOOLEAN @@ -190,4 +195,12 @@ public void setValue(ToolOutputValue value) { this.value = value; } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java (.../ToolSessionManager.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java (.../ToolSessionManager.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -143,6 +143,18 @@ * Note: the learnerId may not be the userId of the current user as the current user may be a staff member. */ ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId); + + /** + * Returns outputs for all learners that left responses required for this output. Returns nothing for the learners + * that haven't started the activity or haven't provided required results. Method is useful when tool should provide + * results for all users at once rather than on one-by-one basis. + * + * @param name + * tool output name + * @param toolContentId + * @return + */ + List getToolOutputs(String name, Long toolContentId); /** * Notifies tool that the user is force completed. Currently it's been utilized only by leader aware tools, which Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -219,6 +219,18 @@ * @throws ToolException */ ToolOutput getOutputFromTool(String conditionName, ToolSession toolSession, Integer learnerId) throws ToolException; + + /** + * Returns tool outputs for the entire activity. Note, some tools don't support this functionality and will always + * return empty list. + * + * @param conditionName + * @param toolActivity + * @return + * @throws ToolException + */ + List getOutputsFromTool(String conditionName, ToolActivity toolActivity) + throws ToolException; /** * Ask a tool for a set of ToolOutputs, based on the given toolSessionId. Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -486,7 +486,40 @@ throw new ToolException(message, e); } } + + @Override + public List getOutputsFromTool(String conditionName, ToolActivity toolActivity) + throws ToolException { + if (toolActivity == null) { + String error = "The toolActivity is null. Unable to get tool outputs"; + LamsCoreToolService.log.error(error); + throw new DataMissingException(error); + } + + Tool tool = toolActivity.getTool(); + if (tool == null) { + String error = "The tool for toolActivity " + toolActivity.getActivityId() + " is missing."; + LamsCoreToolService.log.error(error); + throw new DataMissingException(error); + } + + try { + ToolSessionManager sessionManager = (ToolSessionManager) findToolService(tool); + return sessionManager.getToolOutputs(conditionName, toolActivity.getToolContentId()); + } catch (NoSuchBeanDefinitionException e) { + String message = "A tool which is defined in the database appears to missing from the classpath. Unable to grt the tol output. toolActivity " + + toolActivity.getActivityId(); + LamsCoreToolService.log.error(message, e); + throw new ToolException(message, e); + } catch (java.lang.AbstractMethodError e) { + String message = "Tool " + tool.getToolDisplayName() + + " doesn't support the getToolOutput(name, toolSessionId, learnerId) method so no output definitions can be accessed."; + LamsCoreToolService.log.error(message, e); + throw new ToolException(message, e); + } + } + @Override public void forceCompleteActivity(ToolSession toolSession, User learner) throws ToolException { Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -75,8 +75,6 @@ private static final String LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID = "leader.user.id"; private IActivityDAO activityDAO; - private ILessonDAO lessonDAO; - private ILearnerProgressDAO learnerProgressDAO; private IToolDAO toolDAO; private IToolSessionDAO toolSessionDAO; private IToolContentDAO toolContentDAO; @@ -187,7 +185,7 @@ // Get the first (only) ActivityEvaluation if it exists ActivityEvaluation activityEvaluation; - boolean isToolOutputDefinitionChanged = false; + boolean isToolOutputDefinitionChanged = true; if (activityEvaluations.isEmpty()) { activityEvaluation = new ActivityEvaluation(); activityEvaluation.setActivity(toolActivity); @@ -210,13 +208,7 @@ //update gradebook marks if required if (isToolOutputDefinitionChanged) { - Lesson lesson = lessonDAO.getLessonForActivity(toolActivity.getActivityId()); - List users = learnerProgressDAO.getLearnersCompletedActivity(toolActivity); - - //update for all users in activity - for (User user : users) { - gradebookService.updateUserActivityGradebookMark(lesson, toolActivity, user); - } + gradebookService.updateUserMarksForActivity(toolActivity); } } @@ -338,14 +330,6 @@ this.activityDAO = activityDAO; } - public void setLearnerProgressDAO(ILearnerProgressDAO learnerProgressDAO) { - this.learnerProgressDAO = learnerProgressDAO; - } - - public void setLessonDAO(ILessonDAO lessonDAO) { - this.lessonDAO = lessonDAO; - } - public void setToolSessionDAO(IToolSessionDAO toolSessionDAO) { this.toolSessionDAO = toolSessionDAO; } Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml =================================================================== diff -u -rf494ac5c2f49f92be600b6392d9c85c291df7bb7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision f494ac5c2f49f92be600b6392d9c85c291df7bb7) +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -80,8 +80,6 @@ - - Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml =================================================================== diff -u -r9357467901bacb28df24a695ec35e99434ebbea9 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml (.../gradebookApplicationContext.xml) (revision 9357467901bacb28df24a695ec35e99434ebbea9) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml (.../gradebookApplicationContext.xml) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -19,6 +19,7 @@ + Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -66,6 +66,7 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; +import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputValue; @@ -105,6 +106,7 @@ private ILamsCoreToolService toolService; private IGradebookDAO gradebookDAO; private ILearnerProgressDAO learnerProgressDAO; + private ILessonDAO lessonDAO; private ILessonService lessonService; private IUserManagementService userService; private IBaseDAO baseDAO; @@ -439,7 +441,55 @@ } } + @Override + public void updateUserMarksForActivity(Activity activity) { + Long activityId = activity.getActivityId(); + Lesson lesson = lessonDAO.getLessonForActivity(activityId); + + if ((lesson == null) || (activity == null) || !(activity instanceof ToolActivity) + || (((ToolActivity) activity).getActivityEvaluations() == null) + || ((ToolActivity) activity).getActivityEvaluations().isEmpty()) { + return; + } + ToolActivity toolActivity = (ToolActivity) activity; + + // Getting the first activity evaluation + ActivityEvaluation eval = toolActivity.getActivityEvaluations().iterator().next(); + String toolOutputDefinition = eval.getToolOutputDefinition(); + + Map userToGradebookUserActivityMap = getUserToGradebookUserActivityMap(activity, + null); + Map userToGradebookUserLessonMap = getUserToGradebookUserLessonMap(lesson, null); + List toolOutputs = toolService.getOutputsFromTool(toolOutputDefinition, toolActivity); + + //update for all users in activity + List users = learnerProgressDAO.getLearnersCompletedActivity(activity); + for (User user : users) { + //find according toolOutput + ToolOutput toolOutput = null; + for (ToolOutput toolOutputIter : toolOutputs) { + if (toolOutputIter.getUserId().equals(user.getUserId())) { + toolOutput = toolOutputIter; + } + } + + //in case of toolOutput == null (which means no results in the tool but user nonetheless has finished activity), assign 0 as a result + Double outputDouble = (toolOutput == null || toolOutput.getValue() == null) ? null + : toolOutput.getValue().getDouble(); + + GradebookUserActivity gradebookUserActivity = userToGradebookUserActivityMap.get(user.getUserId()); + GradebookUserLesson gradebookUserLesson = userToGradebookUserLessonMap.get(user.getUserId()); + + // Only set the mark if it hasnt previously been set by a teacher + if ((gradebookUserActivity == null) || !gradebookUserActivity.getMarkedInGradebook()) { + updateUserActivityGradebookMark(lesson, user, toolActivity, outputDouble, false, false, + gradebookUserActivity, gradebookUserLesson); + } + } + } + + @Override public void updateUserActivityGradebookMark(Lesson lesson, Activity activity, User learner) { ToolSession toolSession = toolService.getToolSessionByLearner(learner, activity); @@ -482,50 +532,55 @@ @Override public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark, Boolean markedInGradebook, boolean isAuditLogRequired) { + + GradebookUserActivity gradebookUserActivity = gradebookDAO + .getGradebookUserDataForActivity(activity.getActivityId(), learner.getUserId()); + + GradebookUserLesson gradebookUserLesson = gradebookDAO.getGradebookUserDataForLesson(lesson.getLessonId(), + learner.getUserId()); + + updateUserActivityGradebookMark(lesson, learner, activity, mark, markedInGradebook, isAuditLogRequired, + gradebookUserActivity, gradebookUserLesson); + } + + /** + * It's the same method as above, it only also accepts gradebookUserActivity and gradebookUserLesson as parameters. + */ + private void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark, + Boolean markedInGradebook, boolean isAuditLogRequired, GradebookUserActivity gradebookUserActivity, + GradebookUserLesson gradebookUserLesson) { if ((lesson != null) && (activity != null) && (learner != null) && activity.isToolActivity()) { // First, update the mark for the activity - GradebookUserActivity gradebookUserActivity = gradebookDAO - .getGradebookUserDataForActivity(activity.getActivityId(), learner.getUserId()); - if (gradebookUserActivity == null) { gradebookUserActivity = new GradebookUserActivity((ToolActivity) activity, learner); } String oldMark = (gradebookUserActivity.getMark() == null) ? "-" : gradebookUserActivity.getMark().toString(); + Double oldActivityMark = gradebookUserActivity.getMark(); gradebookUserActivity.setMark(mark); gradebookUserActivity.setUpdateDate(new Date()); gradebookUserActivity.setMarkedInGradebook(markedInGradebook); gradebookDAO.insertOrUpdate(gradebookUserActivity); // Now update the lesson mark - GradebookUserLesson gradebookUserLesson = gradebookDAO.getGradebookUserDataForLesson(lesson.getLessonId(), - learner.getUserId()); if (gradebookUserLesson == null) { gradebookUserLesson = new GradebookUserLesson(); gradebookUserLesson.setLearner(learner); gradebookUserLesson.setLesson(lesson); } - // In order to calculate lesson's mark correctly we need to flush the session beforehand. This is required - // as change to gradebookUserActivity isn't synchronized with the DB at this point due to the current transaction isn't - // committed yet - gradebookDAO.flush(); + aggregateTotalMarkForLesson(gradebookUserLesson, mark, oldActivityMark); - // Calculates a lesson's total mark and saves it - Double totalMark = gradebookDAO.getGradebookUserActivityMarkSum( - gradebookUserLesson.getLesson().getLessonId(), gradebookUserLesson.getLearner().getUserId()); - gradebookUserLesson.setMark(totalMark); - gradebookDAO.insertOrUpdate(gradebookUserLesson); - // audit log changed gradebook mark if (isAuditLogRequired) { UserDTO monitorUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + String markStr = mark == null ? "" : mark.toString(); String[] args = new String[] { learner.getLogin() + "(" + learner.getUserId() + ")", activity.getActivityId().toString(), lesson.getLessonId().toString(), oldMark.toString(), - mark.toString() }; + markStr }; String message = messageService.getMessage("audit.activity.change.mark", args); auditService.log(monitorUser, GradebookConstants.MODULE_NAME, message); } @@ -1363,9 +1418,17 @@ * * @param gradebookUserLesson */ - private void aggregateTotalMarkForLesson(GradebookUserLesson gradebookUserLesson) { - Double totalMark = gradebookDAO.getGradebookUserActivityMarkSum(gradebookUserLesson.getLesson().getLessonId(), - gradebookUserLesson.getLearner().getUserId()); + private void aggregateTotalMarkForLesson(GradebookUserLesson gradebookUserLesson, Double newActivityMark, Double oldActivityMark) { + newActivityMark = newActivityMark == null ? 0 : newActivityMark; + + Double totalMark; + if (oldActivityMark == null || gradebookUserLesson.getMark() == null) { + totalMark = gradebookDAO.getGradebookUserActivityMarkSum(gradebookUserLesson.getLesson().getLessonId(), + gradebookUserLesson.getLearner().getUserId()); + } else { + totalMark = gradebookUserLesson.getMark() - oldActivityMark + newActivityMark; + } + gradebookUserLesson.setMark(totalMark); gradebookDAO.insertOrUpdate(gradebookUserLesson); } @@ -1693,6 +1756,10 @@ this.learnerProgressDAO = learnerProgressDAO; } + public void setLessonDAO(ILessonDAO lessonDAO) { + this.lessonDAO = lessonDAO; + } + public ILessonService getLessonService() { return lessonService; } Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (.../IGradebookService.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (.../IGradebookService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -117,6 +117,13 @@ String sortOrder, String searchString); int getCountUsersByOrganisation(Integer orgId, String searchString); + + /** + * Updates all user marks in specified activity. It recalculates all UserActivityGradebooks and UserLessonGradebooks. + * + * @param activity + */ + void updateUserMarksForActivity(Activity activity); /** * Updates a user's lesson mark, this will make it desynchronised with the aggregated marks from the activities Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java =================================================================== diff -u -rd14a9d149e4d52c0214fc67260381b2ace04df6c -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision d14a9d149e4d52c0214fc67260381b2ace04df6c) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -30,6 +30,7 @@ import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -151,6 +152,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.chat.service; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; @@ -193,6 +194,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getChatOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -651,6 +651,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return dacoOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java =================================================================== diff -u -r3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision 3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -23,6 +23,7 @@ /* $$Id$$ */ package org.eucm.lams.tool.eadventure.service; +import java.util.ArrayList; import java.util.List; import java.util.SortedMap; @@ -71,6 +72,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -1165,6 +1165,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return forumOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.gmap.service; import java.io.StringReader; +import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -171,6 +172,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -1039,6 +1039,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return imageGalleryOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r2bef59c032438311b6dfadac874b0a7ee4cb72de -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 2bef59c032438311b6dfadac874b0a7ee4cb72de) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -953,6 +953,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.kaltura.service; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.LinkedList; @@ -170,6 +171,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getKalturaOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -1037,6 +1037,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getResourceOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.leaderselection.service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; @@ -153,6 +154,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getLeaderselectionOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -166,6 +166,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getMindmapOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.noticeboard.service; +import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -531,6 +532,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.notebook.service; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; @@ -159,6 +160,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getNotebookOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -27,6 +27,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; import java.util.SortedMap; @@ -155,6 +156,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getPixlrOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -692,6 +692,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -530,6 +530,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getSubmitFilesOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -1945,6 +1945,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getScratchieOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.scribe.service; +import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -153,6 +154,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -645,6 +645,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -847,6 +847,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return getSurveyOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -862,6 +862,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return taskListOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java =================================================================== diff -u -r1b8e236ea17be319274b3a8d2196ae798964b363 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.videoRecorder.service; +import java.util.ArrayList; import java.util.List; import java.util.SortedMap; @@ -123,6 +124,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -1563,6 +1563,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return voteOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.wiki.service; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.HashSet; @@ -217,6 +218,11 @@ } return wikiOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) { Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java =================================================================== diff -u -r0110ae0b586fbdc8a3c3f7046007a712660f2f4f -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision 0110ae0b586fbdc8a3c3f7046007a712660f2f4f) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.wookie.service; +import java.util.ArrayList; import java.util.List; import java.util.SortedMap; @@ -124,6 +125,11 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } + + @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } @Override public void forceCompleteUser(Long toolSessionId, User user) {