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/content/caching/ContentCache.java

@@ -47,7 +47,7 @@ public interface ContentCache
      * into the cache, it does not mean that the disk item is guaranteed to be there. The temp file
      * clean-up process, for example, may have removed it.
      * <p>
-     * @param contentUrl
+     * @param contentUrl String
      * @return true if the URL exists in the in-memory cache. It <em>may</em> therefore be cached on disk.
      */
     boolean contains(String contentUrl);
@@ -55,7 +55,7 @@ public interface ContentCache
     /**
      * Retrieve a ContentReader for the cached content specified by URL.
      * 
-     * @param contentUrl
+     * @param contentUrl String
      * @return ContentReader
      * @throws org.alfresco.repo.content.caching.CacheMissException
      *         If the cache does not contain the specified content.
@@ -68,8 +68,8 @@ public interface ContentCache
      * 
      * Empty content will NOT be cached - in which case false is returned.
      * 
-     * @param contentUrl
-     * @param reader
+     * @param contentUrl String
+     * @param reader ContentReader
      * @return true if the content was cached, false otherwise.
      */
     boolean put(String contentUrl, ContentReader reader);
@@ -79,7 +79,7 @@ public interface ContentCache
      * the actual cached content (file) - this should be left to the clean-up process or can
      * be deleted with {@link #deleteFile(String)}.
      * 
-     * @param contentUrl
+     * @param contentUrl String
      */
     void remove(String contentUrl);
 
@@ -87,16 +87,16 @@ public interface ContentCache
      * Deletes the cached content file for the specified URL. To remove the item from the
      * lookup table also, use {@link #remove(String)} after calling this method.
      * 
-     * @param url
+     * @param url String
      */
     void deleteFile(String url);
 
     /**
-     * Retrieve a ContentWriter to write content to a cache file. Upon closing the stream
-     * a listener will add the new content file to the in-memory lookup table.
-     * 
-     * @param url url
-     * @return ContentWriter
-     */
-    ContentWriter getWriter(String url);
+     * Retrieve a ContentWriter to write content to a cache file. Upon closing the stream
+     * a listener will add the new content file to the in-memory lookup table.
+     * 
+     * @param url url
+     * @return ContentWriter
+     */
+    ContentWriter getWriter(String url);
 }