Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java,v diff -u -r1.2 -r1.3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java 27 Jul 2005 05:04:46 -0000 1.2 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java 7 Sep 2005 07:13:48 -0000 1.3 @@ -77,7 +77,7 @@ * Get the ticket to access the repository. If the workspace/credential * hasn't been set up, then it will be set up automatically. * - * @forceLogin set to true if tried to do something and got access denied. This may happen + * @param forceLogin set to true if tried to do something and got access denied. This may happen * if the repository loses the ticket. * @return the repository ticket */ Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java,v diff -u -r1.5 -r1.6 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java 27 Jul 2005 05:04:47 -0000 1.5 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java 7 Sep 2005 07:13:48 -0000 1.6 @@ -160,7 +160,7 @@ * Get the ticket to access the repository. If the workspace/credential * hasn't been set up, then it will be set up automatically. * - * @forceLogin set to true if tried to do something and got access denied. This may happen + * @param forceLogin set to true if tried to do something and got access denied. This may happen * if the repository loses the ticket. * @return the repository ticket */ Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java,v diff -u -r1.3 -r1.4 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java 6 Jul 2005 00:25:00 -0000 1.3 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java 7 Sep 2005 07:13:48 -0000 1.4 @@ -48,7 +48,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; @@ -60,7 +60,9 @@ throws FileException; /** - * 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/file/FileDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java,v diff -u -r1.4 -r1.5 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java 6 Jul 2005 00:25:00 -0000 1.4 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java 7 Sep 2005 07:13:48 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java,v diff -u -r1.5 -r1.6 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java 5 Jul 2005 03:24:59 -0000 1.5 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java 7 Sep 2005 07:13:48 -0000 1.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java,v diff -u -r1.1 -r1.2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java 18 Apr 2005 00:01:49 -0000 1.1 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java 7 Sep 2005 07:13:48 -0000 1.2 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java,v diff -u -r1.2 -r1.3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java 5 Jul 2005 03:24:59 -0000 1.2 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java 7 Sep 2005 07:13:48 -0000 1.3 @@ -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()) );