Merged 5.2.N (5.2.1) to HEAD (5.2)

128510 mmuller: Fixed some javadoc errors. REPO-466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 13:56:54 +00:00
parent 58cb56c7c9
commit d73d4e1a71
19 changed files with 7 additions and 38 deletions

View File

@@ -507,7 +507,6 @@ public class ContentStreamer implements ResourceLoaderAware
* @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)
{

View File

@@ -145,7 +145,6 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon
* Sets the map of content transformer worker bean names to
* message formatting labels
*
* @param knownWorkerBeanLabels Map<String, String>
*/
public void setKnownWorkerBeanLabels(Map<String, String> knownWorkerBeanLabels)
{
@@ -305,4 +304,4 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon
return knownWorkers.get(ctw);
}
}
}