inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-27 23:00:01 +00:00
parent 8109be0920
commit a4a7c5f8e7
492 changed files with 4135 additions and 4255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/usage/ContentUsageImpl.java
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 userName
* @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
*/
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
* @param currentQuota
*/
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)
{