Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java 7 Jan 2006 14:15:40 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java 13 Jan 2006 16:20:49 -0000 1.2 @@ -33,6 +33,9 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; +import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; /** *

Persistent object/bean that defines the content for the MCQ tool. @@ -175,8 +178,9 @@ * @param newContentId the new mc content id. * @return the new mc content object. */ - public static McContent newInstance(McContent mc, - Long newContentId, HttpServletRequest request) + public static McContent newInstance(IToolContentHandler toolContentHandler, McContent mc, + Long newContentId) + throws ItemNotFoundException, RepositoryCheckedException { McContent newContent = new McContent( newContentId, @@ -205,7 +209,7 @@ new TreeSet() ); newContent.setMcQueContents(mc.deepCopyMcQueContent(newContent)); - newContent.setMcAttachments(mc.deepCopyMcAttachments(newContent, request)); + newContent.setMcAttachments(mc.deepCopyMcAttachments(toolContentHandler, newContent)); @@ -240,16 +244,17 @@ * @param newMcContent * @return Set */ - public Set deepCopyMcAttachments(McContent newMcContent, HttpServletRequest request) + public Set deepCopyMcAttachments(IToolContentHandler toolContentHandler,McContent newMcContent) + throws ItemNotFoundException, RepositoryCheckedException { Set newMcQueContent = new TreeSet(); for (Iterator i = this.getMcAttachments().iterator(); i.hasNext();) { McUploadedFile mcUploadedFile = (McUploadedFile) i.next(); if (mcUploadedFile.getMcContent() != null) { - McUploadedFile newMcUploadedFile=McUploadedFile.newInstance(mcUploadedFile, - newMcContent, request); + McUploadedFile newMcUploadedFile=McUploadedFile.newInstance(toolContentHandler, mcUploadedFile, + newMcContent); newMcQueContent.add(newMcUploadedFile); } }