Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 99482: Merged DEV to 5.0.N (5.0.1) 99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc typo in project alfresco-jlan 99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project alfresco-jlan 99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project core 99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project data-model 99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project file-transfer-receiver 99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project legacy-lucene 99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project qa-share 99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project remote-api 99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc in project Repository, letters S..Z 99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc in project Repository, letters A..R 99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project share-po 99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc typo in project slingshot 99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project slingshot 99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr 99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr4 99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr-client 99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project web-client 99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project web-framework-commons git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-10-15 15:02:20 +00:00 · 2015-03-27 23:00:01 +00:00
parent 8109be0920
commit a4a7c5f8e7
492 changed files with 4135 additions and 4255 deletions
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
@@ -205,13 +205,13 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
    private NodeMonitorFactory m_nodeMonitorFactory;
    
    
-    /**
-     * Class constructor
-     * 
-     * @param serviceRegistry to connect to the repository services
-     */
-    public ContentDiskDriver(CifsHelper cifsHelper)
-    {
+    /**
+     * Class constructor
+     * 
+     * @param cifsHelper to connect to the repository services
+     */
+    public ContentDiskDriver(CifsHelper cifsHelper)
+    {
        this.cifsHelper = cifsHelper;
    }
    
@@ -313,14 +313,12 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
    public final PermissionService getPermissionService() {
    	return this.permissionService;
    }
-
-    /**
-     * Return the node archive service
-     * 
-     * @param NodeArchiveService
-     */
-    public final NodeArchiveService getNodeArchiveService() {
-    	return nodeArchiveService;
+
+    /**
+     * Return the node archive service
+     */
+    public final NodeArchiveService getNodeArchiveService() {
+    	return nodeArchiveService;
    }
    
    /**
@@ -466,13 +464,13 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
    	m_nodeMonitorFactory = nodeMonitorFactory;
    }
    
-    /**
-     * Set the node archive service
-     * 
-     * @param NodeArchiveService nodeArchiveService
-     */
-    public void setNodeArchiveService(NodeArchiveService nodeArchiveService) {
-    	this.nodeArchiveService = nodeArchiveService;
+    /**
+     * Set the node archive service
+     * 
+     * @param nodeArchiveService nodeArchiveService
+     */
+    public void setNodeArchiveService(NodeArchiveService nodeArchiveService) {
+    	this.nodeArchiveService = nodeArchiveService;
    }
    
    /**
@@ -645,13 +643,12 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
     * of the shared device. The same DeviceInterface implementation may be used for multiple
     * shares.
     * 
-     * WARNING: side effect, will commit or roll back current user transaction context.
-     * 
-     * @param ctx the context
-     * @param serverConfig ServerConfigurationBean
-     * @exception DeviceContextException
-     */
-    //  MER TODO - transaction handling in registerContext needs changing
+     * WARNING: side effect, will commit or roll back current user transaction context.
+     * 
+     * @param ctx the context
+     * @exception DeviceContextException
+     */
+    //  MER TODO - transaction handling in registerContext needs changing
    @Override
    public void registerContext(DeviceContext ctx) throws DeviceContextException
    {
@@ -860,15 +857,15 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
        return isReadOnly;
    }
    
-    /**
-     * Get the file information for the specified file.
-     * 
-     * @param sess Server session
-     * @param tree Tree connection
-     * @param name File name/path that information is required for.
-     * @return File information if valid, else null
-     * @exception java.io.IOException The exception description.
-     */
+    /**
+     * Get the file information for the specified file.
+     * 
+     * @param session Server session
+     * @param tree Tree connection
+     * @param path File name/path that information is required for.
+     * @return File information if valid, else null
+     * @exception java.io.IOException The exception description.
+     */
    public FileInfo getFileInformation(SrvSession session, TreeConnection tree, String path) throws IOException
    {
        if(logger.isDebugEnabled())
@@ -1106,13 +1103,13 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
     * Start a new search on the filesystem using the specified searchPath that may contain
     * wildcards.
     * 
-     * @param sess Server session
-     * @param tree Tree connection
-     * @param searchPath File(s) to search for, may include wildcards.
-     * @param attrib Attributes of the file(s) to search for, see class SMBFileAttribute.
-     * @return SearchContext
-     * @exception java.io.FileNotFoundException If the search could not be started.
-     */
+     * @param sess Server session
+     * @param tree Tree connection
+     * @param searchPath File(s) to search for, may include wildcards.
+     * @param attributes Attributes of the file(s) to search for, see class SMBFileAttribute.
+     * @return SearchContext
+     * @exception java.io.FileNotFoundException If the search could not be started.
+     */
    public SearchContext startSearch(SrvSession sess, TreeConnection tree, String searchPath, int attributes) throws FileNotFoundException
    {
        // Access the device context
@@ -2507,13 +2504,13 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter

    /**
     * Close the file.
-     * 
-     * @param sess Server session
-     * @param tree Tree connection.
-     * @param param Network file context.
-     * @exception java.io.IOException If an error occurs.
-     */
-    public void closeFile(SrvSession sess, TreeConnection tree, final NetworkFile file) throws IOException
+     * 
+     * @param sess Server session
+     * @param tree Tree connection.
+     * @param file Network file context.
+     * @exception java.io.IOException If an error occurs.
+     */
+    public void closeFile(SrvSession sess, TreeConnection tree, final NetworkFile file) throws IOException
    {  
        if (logger.isDebugEnabled())
        {
@@ -2877,13 +2874,13 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter

    /**
     * Delete the specified file.
-     * 
-     * @param sess Server session
-     * @param tree Tree connection
-     * @param file NetworkFile
-     * @exception java.io.IOException The exception description.
-     */
-    public void deleteFile(final SrvSession sess, final TreeConnection tree, final String name) throws IOException
+     * 
+     * @param sess Server session
+     * @param tree Tree connection
+     * @param name NetworkFile
+     * @exception java.io.IOException The exception description.
+     */
+    public void deleteFile(final SrvSession sess, final TreeConnection tree, final String name) throws IOException
    {
        // Get the device context
        
@@ -3820,16 +3817,16 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
    /**
     * Read a block of data from the specified file.
     * 
-     * @param sess Session details
-     * @param tree Tree connection
-     * @param file Network file
-     * @param buf Buffer to return data to
-     * @param bufPos Starting position in the return buffer
-     * @param siz Maximum size of data to return
-     * @param filePos File offset to read data
-     * @return Number of bytes read
-     * @exception java.io.IOException The exception description.
-     */
+     * @param sess Session details
+     * @param tree Tree connection
+     * @param file Network file
+     * @param buffer Buffer to return data to
+     * @param bufferPosition Starting position in the return buffer
+     * @param size Maximum size of data to return
+     * @param fileOffset File offset to read data
+     * @return Number of bytes read
+     * @exception java.io.IOException The exception description.
+     */
    public int readFile(
            SrvSession sess, TreeConnection tree, NetworkFile file,
            byte[] buffer, int bufferPosition, int size, long fileOffset) throws IOException
@@ -3903,16 +3900,16 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
    /**
     * Write a block of data to the file.
     * 
-     * @param sess Server session
-     * @param tree Tree connection
-     * @param file Network file details
-     * @param buf byte[] Data to be written
-     * @param bufoff Offset within the buffer that the data starts
-     * @param siz int Data length
-     * @param fileoff Position within the file that the data is to be written.
-     * @return Number of bytes actually written
-     * @exception java.io.IOException The exception description.
-     */
+     * @param sess Server session
+     * @param tree Tree connection
+     * @param file Network file details
+     * @param buffer byte[] Data to be written
+     * @param bufferOffset Offset within the buffer that the data starts
+     * @param size int Data length
+     * @param fileOffset Position within the file that the data is to be written.
+     * @return Number of bytes actually written
+     * @exception java.io.IOException The exception description.
+     */
    public int writeFile(SrvSession sess, TreeConnection tree, NetworkFile file,
            byte[] buffer, int bufferOffset, int size, long fileOffset) throws IOException
    {