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

@@ -577,9 +577,10 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
* Note - Changes here likely need to be replicated to the {@link #updateSite(SiteInfo)}
* method too, as that also has to deal with Site Permissions.
*
* @param siteNodeRef
* @param shortName
* @param visibility
* @param siteNodeRef NodeRef
* @param shortName String
* @param visibility SiteVisibility
* @param memberships Map<String, Set<String>>
*/
private void setupSitePermissions(
final NodeRef siteNodeRef, final String shortName, final SiteVisibility visibility, final Map<String, Set<String>> memberships)
@@ -704,7 +705,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
/**
* Gets a map containing the site's custom properties
*
* @return Map<QName, Serializable> map containing the custom properties of the site
* @return map containing the custom properties of the site
*/
private Map<QName, Serializable> getSiteCustomProperties(Map<QName, Serializable> properties)
{
@@ -724,7 +725,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
/**
* Gets a map containing the site's custom properties
*
* @return Map<QName, Serializable> map containing the custom properties of the site
* @return map containing the custom properties of the site
*/
private Map<QName, Serializable> getSiteCustomProperties(NodeRef siteNodeRef)
{
@@ -1326,8 +1327,8 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
/**
* Get the site implementation given a short name
*
* @param shortName
* @return
* @param shortName String
* @return SiteInfo
*/
private SiteInfo getSiteImpl(String shortName)
{
@@ -2102,9 +2103,9 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
* One of the user's firstname or lastname must match at least
* one of the filters given.
*
* @param nameFilters
* @param username
* @return
* @param nameFilters String[]
* @param username String
* @return boolean
*/
private boolean matchPerson(final String[] nameFilters, final String username)
{
@@ -2631,7 +2632,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
* </ul>
* If the containingSite is <code>null</code> then the targetNode's current containing site is used.
*
* @param targetNode
* @param targetNode NodeRef
* @param containingSite the site which the site is a member of. If <code>null</code>, it will be calculated.
*/
@Override
@@ -2907,7 +2908,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
*
* @param userName user name
* @param role role
* @return
* @return String
*/
private String getActivityUserData(String userName, String role)
{
@@ -2979,9 +2980,9 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
/**
* Helper to check that we are not removing the last Site Manager from a site
*
* @param shortName
* @param authorityName
* @param role
* @param shortName String
* @param authorityName String
* @param role String
*/
private void checkLastManagerRemoval(final String shortName, final String authorityName, final String role)
{