Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java,v diff -u -r1.6 -r1.6.8.1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 31 Oct 2008 05:57:38 -0000 1.6 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 2 Jul 2009 12:59:51 -0000 1.6.8.1 @@ -58,7 +58,7 @@ * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object) */ @Override - public SortedMap getToolOutputDefinitions(Object toolContentObject) + public SortedMap getToolOutputDefinitions(Object toolContentObject, int definitionType) throws ToolException { SortedMap definitionMap = new TreeMap(); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.99.4.3.2.3 -r1.99.4.3.2.4 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 10 Jun 2009 20:31:27 -0000 1.99.4.3.2.3 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 2 Jul 2009 12:59:51 -0000 1.99.4.3.2.4 @@ -864,12 +864,13 @@ * * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition */ - public SortedMap getToolOutputDefinitions(Long toolContentId) throws ToolException { + public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) + throws ToolException { Forum forum = getForumByContentId(toolContentId); if (forum == null) { forum = getDefaultForum(); } - return getForumOutputFactory().getToolOutputDefinitions(forum); + return getForumOutputFactory().getToolOutputDefinitions(forum, definitionType); } /** Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.78.4.2 -r1.78.4.2.2.1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 1 May 2009 06:13:54 -0000 1.78.4.2 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 2 Jul 2009 13:00:51 -0000 1.78.4.2.2.1 @@ -183,8 +183,7 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, - * java.lang.Long) + * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, java.lang.Long) */ public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (toContentId == null) { @@ -226,9 +225,8 @@ } /** - * If the toolContentID does not exist, then get default tool content id - * from tool core and initialize a emtpy SubmitFilesContent - * return. + * If the toolContentID does not exist, then get default tool content id from tool core and initialize a emtpy + * SubmitFilesContent return. * * @param toolContentId * @return @@ -293,8 +291,7 @@ } /** - * Export the XML fragment for the tool's content, along with any files - * needed for the content. + * Export the XML fragment for the tool's content, along with any files needed for the content. * * @throws ExportToolContentException */ @@ -359,16 +356,15 @@ } /** - * Get the definitions for possible output for an activity, based on the - * toolContentId. These may be definitions 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 + * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions + * 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 + * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition */ - public SortedMap getToolOutputDefinitions(Long toolContentId) throws ToolException { + public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) + throws ToolException { return new TreeMap(); } @@ -411,12 +407,11 @@ } /** - * This method verifies the credentials of the SubmitFiles Tool and gives it - * the Ticket to login and access the Content Repository. + * This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket to login and + * access the Content Repository. * - * A valid ticket is needed in order to access the content from the - * repository. This method would be called evertime the tool needs to - * upload/download files from the content repository. + * A valid ticket is needed in order to access the content from the repository. This method would be called evertime + * the tool needs to upload/download files from the content repository. * * @return ITicket The ticket for repostory access * @throws SubmitFilesException @@ -437,8 +432,8 @@ } /** - * This method deletes the content with the given uuid and - * versionID from the content repository + * This method deletes the content with the given uuid and versionID from the content + * repository * * @param uuid * The uuid of the node to be deleted @@ -582,8 +577,8 @@ /** * Get the tool output for the given tool output names. * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, - * java.lang.Long, java.lang.Long) + * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, java.lang.Long, + * java.lang.Long) */ public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { return new TreeMap(); @@ -592,8 +587,8 @@ /** * Get the tool output for the given tool output name. * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, - * java.lang.Long, java.lang.Long) + * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long, + * java.lang.Long) */ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; @@ -602,8 +597,7 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolSessionManager# - * uploadFileToContent(Long,FormFile ) + * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToContent(Long,FormFile ) */ public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType) throws SubmitFilesException { @@ -625,8 +619,7 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolSessionManager# - * uploadFileToSession(Long,FormFile,String,Long ) + * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long ) */ public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID) throws SubmitFilesException { @@ -718,9 +711,8 @@ } /** - * This method save SubmissionDetails list into a map container: key is user - * id, value is a list container, which contains all - * FileDetailsDTO object belong to this user. + * This method save SubmissionDetails list into a map container: key is user id, value is a list container, which + * contains all FileDetailsDTO object belong to this user. */ public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale) { List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID); @@ -871,8 +863,8 @@ @SuppressWarnings("unchecked") public void sendMarksToGradebook(SubmitUser user, Long toolSessionID) { submissionDetailsDAO.getSubmissionDetailsBySession(toolSessionID); - List detailsList = (List) submissionDetailsDAO.getBySessionAndLearner( - toolSessionID, user.getUserID()); + List detailsList = submissionDetailsDAO.getBySessionAndLearner(toolSessionID, user + .getUserID()); if (detailsList != null) { Float totalMark = null; for (SubmissionDetails details : detailsList) { @@ -984,8 +976,7 @@ } /** - * Set the description, throws away the title value as this is not supported - * in 2.0 + * 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 { @@ -1049,9 +1040,9 @@ return submitUserDAO.getContentUser(contentId, userID); } - /*************************************************************************** + /******************************************************************************************************************* * Property Injection Methods - **************************************************************************/ + ******************************************************************************************************************/ /** * @param submitFilesContentDAO