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
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -45,8 +45,8 @@ public class LoggingTransferProgressMonitorImpl implements TransferProgressMonit
}
/**
* @param transferId
* @return
* @param transferId String
* @return TransferProgress
* @throws TransferException
* @see org.alfresco.repo.transfer.TransferProgressMonitor#getProgress(java.lang.String)
*/
@@ -56,9 +56,9 @@ public class LoggingTransferProgressMonitorImpl implements TransferProgressMonit
}
/**
* @param transferId
* @param obj
* @param ex
* @param transferId String
* @param obj Object
* @param ex Throwable
* @throws TransferException
* @see org.alfresco.repo.transfer.TransferProgressMonitor#logException(java.lang.String, java.lang.Object, java.lang.Throwable)
*/
@@ -69,8 +69,8 @@ public class LoggingTransferProgressMonitorImpl implements TransferProgressMonit
}
/**
* @param transferId
* @param obj
* @param transferId String
* @param obj Object
* @throws TransferException
* @see org.alfresco.repo.transfer.TransferProgressMonitor#logComment(java.lang.String, java.lang.Object)
*/
@@ -110,9 +110,9 @@ public class LoggingTransferProgressMonitorImpl implements TransferProgressMonit
}
/**
* @param transferId
* @param currPos
* @param endPos
* @param transferId String
* @param currPos int
* @param endPos int
* @throws TransferException
* @see org.alfresco.repo.transfer.TransferProgressMonitor#updateProgress(java.lang.String, int, int)
*/
@@ -126,8 +126,8 @@ public class LoggingTransferProgressMonitorImpl implements TransferProgressMonit
}
/**
* @param transferId
* @param currPos
* @param transferId String
* @param currPos int
* @throws TransferException
* @see org.alfresco.repo.transfer.TransferProgressMonitor#updateProgress(java.lang.String, int)
*/
@@ -141,8 +141,8 @@ public class LoggingTransferProgressMonitorImpl implements TransferProgressMonit
}
/**
* @param transferId
* @param status
* @param transferId String
* @param status Status
* @throws TransferException
* @see org.alfresco.repo.transfer.TransferProgressMonitor#updateStatus(java.lang.String, org.alfresco.service.cmr.transfer.TransferProgress.Status)
*/