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

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/repo/CifsHelper.java

@@ -165,12 +165,12 @@ public class CifsHelper
     public void setReadOnlyFlagOnFolders(boolean setReadOnlyFlagOnFolders)
     {
         this.isReadOnlyFlagOnFolders = setReadOnlyFlagOnFolders;
-    }
-
-    /**
-     * @param nodeRef
-     * @return Returns true if the node is a subtype of {@link ContentModel#TYPE_FOLDER folder}
-     * @throws AlfrescoRuntimeException if the type is neither related to a folder or content
+    }
+
+    /**
+     * @param nodeRef
+     * @return Returns true if the node is a subtype of {@link ContentModel#TYPE_FOLDER folder}
+     * @throws AlfrescoRuntimeException if the type is neither related to a folder or content
      */
     public boolean isDirectory(NodeRef nodeRef)
     {
@@ -208,7 +208,7 @@ public class CifsHelper
              * Perform a set of commands as a unit of transactional work.
              *
              * @return              Return the result of the unit of work
-             * @throws Throwable    This can be anything and will guarantee either a retry or a rollback
+             * @throws IOException
              */
             public ContentFileInfo execute() throws IOException
             {
@@ -244,7 +244,7 @@ public class CifsHelper
              * Perform a set of commands as a unit of transactional work.
              *
              * @return              Return the result of the unit of work
-             * @throws Throwable    This can be anything and will guarantee either a retry or a rollback
+             * @throws IOException
              */
             public ContentFileInfo execute() throws IOException
             {
@@ -481,13 +481,13 @@ public class CifsHelper
      * <p>
      * If the directory path doesn't exist, then all the parent directories will be created.
      * If the file path is <code>null</code>, then the file will not be created
-     * 
-     * @param rootNodeRef the root node of the path
-     * @param path the path to a node
-     * @param typeQName type of fole
-     * @return Returns a newly created file or folder node
-     * @throws FileExistsException if the file or folder already exists
-     */
+     * 
+     * @param rootNodeRef the root node of the path
+     * @param path the path to a node
+     * @param typeQName type of fole
+     * @return Returns a newly created file or folder node
+     * @throws FileExistsException if the file or folder already exists
+     */
     public NodeRef createNode(NodeRef rootNodeRef, String path, QName typeQName) throws FileExistsException
     {
         // split the path up into its constituents
@@ -623,13 +623,13 @@ public class CifsHelper
      * Examples of the path are:
      * <ul>
      *   <li>\New Folder\New Text Document.txt</li>
-     *   <li>\New Folder\Sub Folder</li>
-     * </ul>
-     * 
-     * @param pathRootNodeRef the node from which to start the path search
-     * @param path the search path to either a folder or file
-     * @return Returns references to all matching nodes
-     */
+     *   <li>\New Folder\Sub Folder</li>
+     * </ul>
+     * 
+     * @param pathRootNodeRef the node from which to start the path search
+     * @param path the search path to either a folder or file
+     * @return Returns references to all matching nodes
+     */
     public List<NodeRef> getNodeRefs(NodeRef pathRootNodeRef, String path)
     {
         // tokenize the path and push into a stack in reverse order so that
@@ -708,16 +708,16 @@ public class CifsHelper
         return nodeRef;
     }
 
-    /**
-     * Relink the content data from a new node to an existing node to preserve the version history.
-     * 
-     * @param tempNodeRef temp nodeRef
-     * @param nodeToMoveRef NodeRef
-     * @param newParentNodeRef NodeRef
-     * @param newName new name
-     */
-    public void relinkNode(NodeRef tempNodeRef, NodeRef nodeToMoveRef, NodeRef newParentNodeRef, String newName)
-            throws FileNotFoundException, FileExistsException
+    /**
+     * Relink the content data from a new node to an existing node to preserve the version history.
+     * 
+     * @param tempNodeRef temp nodeRef
+     * @param nodeToMoveRef NodeRef
+     * @param newParentNodeRef NodeRef
+     * @param newName new name
+     */
+    public void relinkNode(NodeRef tempNodeRef, NodeRef nodeToMoveRef, NodeRef newParentNodeRef, String newName)
+            throws FileNotFoundException, FileExistsException
     {
         // Get the properties for the old and new nodes
         org.alfresco.service.cmr.model.FileInfo tempFileInfo = fileFolderService.getFileInfo(tempNodeRef);
@@ -837,7 +837,7 @@ public class CifsHelper
              * Perform a set of commands as a unit of transactional work.
              *
              * @return              Return the result of the unit of work
-             * @throws Throwable    This can be anything and will guarantee either a retry or a rollback
+             * @throws IOException
              */
             public String execute() throws IOException
             {
@@ -853,7 +853,6 @@ public class CifsHelper
      * 
      * @param node NodeRef
      * @return String
-     * @throws FileNotFoundException
      */
     public String getFileNameImpl(NodeRef node)
     {