+ * Used to validate file nodes. */ public boolean fileExists(Long uuid, Long versionId ) throws FileException; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java =================================================================== diff -u -r12315777fce60950a53e92b6c992e602531dea8b -r8fe03be36398979de21121946d3ce1139dd39680 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java (.../FileDAO.java) (revision 12315777fce60950a53e92b6c992e602531dea8b) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java (.../FileDAO.java) (revision 8fe03be36398979de21121946d3ce1139dd39680) @@ -180,7 +180,7 @@ /** Delete a file from the repository. If this makes the directory * empty, then the directory should be deleted. - * @returns 1 if deleted okay, 0 if file not found, -1 if file found but a delete error occured. + * @return 1 if deleted okay, 0 if file not found, -1 if file found but a delete error occured. */ public int delete(Long uuid, Long versionId) throws FileException { @@ -222,7 +222,9 @@ } /** - * Is there a file on disk? Used to validate file nodes + * Is there a file on disk? + *
+ * Used to validate file nodes */ public boolean fileExists(Long uuid, Long versionId ) throws FileException { Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java =================================================================== diff -u -r1492a6385b0f6e855ce08f2fe7570b4af8b53b21 -r8fe03be36398979de21121946d3ce1139dd39680 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java (.../NodeDAO.java) (revision 1492a6385b0f6e855ce08f2fe7570b4af8b53b21) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java (.../NodeDAO.java) (revision 8fe03be36398979de21121946d3ce1139dd39680) @@ -68,7 +68,7 @@ * more efficient. But as the repository doesn't keep the session * open, the lazy loading can't occur! So load manually. * - * @param workspaceId + * @param parentNodeVersion * @return Set of CrNodes that are child nodes of this node/version */ public List findChildNodes(CrNodeVersion parentNodeVersion) { @@ -96,7 +96,9 @@ * more efficient. But as the repository doesn't keep the session * open, the lazy loading can't occur! So load manually. * - * @param workspaceId + * @param parentNodeVersion + * @param relPath relative path of the file, based on the main page + * from the parent node. * @return Set of CrNodes that are child nodes of this node/version */ public CrNode findChildNode(CrNodeVersion parentNodeVersion, String relPath) { Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java =================================================================== diff -u -raaabbf7372c53eca0a6b1854633729753f56ba4f -r8fe03be36398979de21121946d3ce1139dd39680 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java (.../IRepositoryAdmin.java) (revision aaabbf7372c53eca0a6b1854633729753f56ba4f) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java (.../IRepositoryAdmin.java) (revision 8fe03be36398979de21121946d3ce1139dd39680) @@ -36,8 +36,9 @@ throws RepositoryCheckedException, WorkspaceNotFoundException; /** Is this ticket acceptable to the repository? + *
* Only the interceptor for an IRepositoryAdmin should call this!!!!!! - * + *
* Do NOT declare this method as a transaction otherwise we will * end up with an endless loop of forever trying to check if * the ticket is okay as this method would end up getting Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java =================================================================== diff -u -r1492a6385b0f6e855ce08f2fe7570b4af8b53b21 -r8fe03be36398979de21121946d3ce1139dd39680 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision 1492a6385b0f6e855ce08f2fe7570b4af8b53b21) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision 8fe03be36398979de21121946d3ce1139dd39680) @@ -350,7 +350,6 @@ /* ********** Node related methods, requiring ticket for access ****/ /** Is this ticket okay? - * @see org.lamsfoundation.lams.contentrepository.IRepository#addFileItem(org.lamsfoundation.lams.contentrepository.ITicket, java.io.InputStream, java.lang.String, java.lang.String, java.lang.String) */ public boolean isTicketOkay(ITicket ticket) { return ( ticket != null && ticketIdSet.contains(ticket.getTicketId()) );