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/repo/web/scripts/content/ContentGet.java

@@ -60,7 +60,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
     private ContentService contentService;
 
     /**
-     * @param 
+     * @param servletContext ServletContext
      */
     public void setServletContext(ServletContext servletContext)
     {
@@ -68,7 +68,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
     }
 
     /**
-     * @param dictionaryService
+     * @param dictionaryService DictionaryService
      */
     public void setDictionaryService(DictionaryService dictionaryService)
     {
@@ -76,7 +76,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
     }
 
     /**
-     * @param namespaceService
+     * @param namespaceService NamespaceService
      */
     public void setNamespaceService(NamespaceService namespaceService)
     {
@@ -84,7 +84,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
     }
     
     /**
-     * @param contentService
+     * @param contentService ContentService
      */
     public void setContentService(ContentService contentService)
     {

source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java

@@ -78,7 +78,7 @@ public class ContentStreamer implements ResourceLoaderAware
         protected EventPublisher eventPublisher;
         protected SiteService siteService;
         /**
-         * @param mimetypeService
+         * @param mimetypeService MimetypeService
          */
         public void setMimetypeService(MimetypeService mimetypeService)
         {
@@ -86,7 +86,7 @@ public class ContentStreamer implements ResourceLoaderAware
         }
 
         /**
-         * @param nodeService
+         * @param nodeService NodeService
          */
         public void setNodeService(NodeService nodeService)
         {
@@ -116,7 +116,7 @@ public class ContentStreamer implements ResourceLoaderAware
         }
         
         /**
-         * @param contentService
+         * @param contentService ContentService
          */
         public void setContentService(ContentService contentService)
     
@@ -433,10 +433,10 @@ public class ContentStreamer implements ResourceLoaderAware
     /**
      * Set attachment header
      * 
-     * @param req
-     * @param res
-     * @param attach
-     * @param attachFileName
+     * @param req WebScriptRequest
+     * @param res WebScriptResponse
+     * @param attach boolean
+     * @param attachFileName String
      */
     public void setAttachment(WebScriptRequest req, WebScriptResponse res, boolean attach, String attachFileName)
     {
@@ -478,9 +478,10 @@ public class ContentStreamer implements ResourceLoaderAware
     /**
      * Set the cache settings on the response
      * 
-     * @param res
-     * @param modified
-     * @param eTag
+     * @param res WebScriptResponse
+     * @param modified Date
+     * @param eTag String
+     * @param model Map<String, Object>
      */
     protected void setResponseCache(WebScriptResponse res, Date modified, String eTag, Map<String, Object> model)
     {

source/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java

@@ -138,7 +138,7 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon
      * Sets the map of content transformer worker bean names to
      * message formatting labels
      * 
-     * @param knownWorkerBeanLabels
+     * @param knownWorkerBeanLabels Map<String, String>
      */
     public void setKnownWorkerBeanLabels(Map<String, String> knownWorkerBeanLabels)
     {
@@ -252,8 +252,8 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon
     
     /**
      * Gets the display label for complex transformers
-     * 
-     * @param cct
+     *
+     * @param cct ComplexContentTransformer
      * @return the transformer display label
      */
     protected String getComplexTransformerLabel(ComplexContentTransformer cct)
@@ -268,7 +268,7 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon
     /**
      * Gets the display label for proxy content transformers
      * 
-     * @param pct
+     * @param pct ProxyContentTransformer
      * @return the transformer display label
      */
     protected String getProxyTransformerLabel(ProxyContentTransformer pct)
@@ -290,7 +290,7 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon
      * <p>
      * In the future ContentTransformerWorker may be made bean name aware.
      * 
-     * @param ctw
+     * @param ctw ContentTransformerWorker
      * @return the bean name
      */
     protected String getWorkerBeanName(ContentTransformerWorker ctw)

source/java/org/alfresco/repo/web/scripts/content/StreamContent.java

@@ -66,14 +66,14 @@ public class StreamContent extends AbstractWebScript
     protected Repository repository;
     
     /**
-     * @param mimetypeService
+     * @param mimetypeService MimetypeService
      */
     public void setMimetypeService(MimetypeService mimetypeService)
     {
         this.mimetypeService = mimetypeService; 
     }
       /**
-     * @param permissionService
+     * @param permissionService PermissionService
      */
     public void setPermissionService(PermissionService permissionService)
     {
@@ -81,7 +81,7 @@ public class StreamContent extends AbstractWebScript
     }
 
     /**
-     * @param nodeService
+     * @param nodeService NodeService
      */
     public void setNodeService(NodeService nodeService)
     {
@@ -89,7 +89,7 @@ public class StreamContent extends AbstractWebScript
     }
     
     /**
-     * @param delegate
+     * @param delegate ContentStreamer
      */
     public void setDelegate(ContentStreamer delegate)
     {
@@ -97,7 +97,7 @@ public class StreamContent extends AbstractWebScript
     }
     
     /**
-     * @param repository
+     * @param repository Repository
      */
     public void setRepository(Repository repository)
     {
@@ -199,9 +199,9 @@ public class StreamContent extends AbstractWebScript
     /**
      * Set attachment header
      * 
-     * @param res
-     * @param attach
-     * @param attachFileName
+     * @param res WebScriptResponse
+     * @param attach boolean
+     * @param attachFileName String
      */
     protected void setAttachment(WebScriptResponse res, boolean attach, String attachFileName)
     {