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

@@ -396,13 +396,13 @@ public class ContentUsageImpl implements ContentUsageService,
recordDelete(nodeRef);
}
}
}
}
/*
* Called after an <b>cm:ownable</b> aspect has been added to a node
*
* @param nodeRef the node to which the aspect was added
}
}
/*
* Called after an <b>cm:ownable</b> aspect has been added to a node
*
* @param nodeRef the node to which the aspect was added
* @param aspectTypeQName the type of the aspect
*/
/* NOTE: now handled via onUpdateProperties as expected
@@ -498,13 +498,13 @@ public class ContentUsageImpl implements ContentUsageService,
}
}
/**
* Set user's usage. Should only be called by background (collapse) job !
*
* @param personNodeRef person nodeRef
* @param currentUsage
*/
public void setUserStoredUsage(NodeRef personNodeRef, long currentUsage)
/**
* Set user's usage. Should only be called by background (collapse) job !
*
* @param personNodeRef person nodeRef
* @param currentUsage long
*/
public void setUserStoredUsage(NodeRef personNodeRef, long currentUsage)
{
if (personNodeRef != null)
{
@@ -565,15 +565,15 @@ public class ContentUsageImpl implements ContentUsageService,
return currentUsage;
}
/**
* Set user's current quota.
* Usually called by Web Client (Admin Console) if admin is changing/setting a user's quota.
*
* @param userName user name
* @param currentQuota User's new quota (in bytes)
*/
public void setUserQuota(String userName, long currentQuota)
{
/**
* Set user's current quota.
* Usually called by Web Client (Admin Console) if admin is changing/setting a user's quota.
*
* @param userName user name
* @param currentQuota User's new quota (in bytes)
*/
public void setUserQuota(String userName, long currentQuota)
{
NodeRef personNodeRef = getPerson(userName);
if (personNodeRef != null)
{