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 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/site/script/Site.java
View File

@@ -252,7 +252,7 @@ public class Site implements Serializable
/**
* Gets a map of role name mapping to associated group name.
*
* @return ScriptableMap<String, String> map of role to group name
* @return map of role to group name
*/
public ScriptableHashMap<String, String> getSitePermissionGroups()
{
@@ -358,7 +358,7 @@ public class Site implements Serializable
* @param nameFilter user name filter
* @param roleFilter user role filter
*
* @return ScriptableHashMap<String, String> list of members of site with their roles
* @return list of members of site with their roles
* @deprecated Use {@link #listMembers(String, String, int, boolean)} instead
*/
public ScriptableHashMap<String, String> listMembers(String nameFilter, String roleFilter)
@@ -378,7 +378,7 @@ public class Site implements Serializable
* @param roleFilter user role filter
* @param size max results size crop if >0
*
* @return ScriptableHashMap<String, String> list of members of site with their roles
* @return list of members of site with their roles
* @deprecated Use {@link #listMembers(String, String, int, boolean)} instead
*/
public ScriptableHashMap<String, String> listMembers(String nameFilter, String roleFilter, int size)
@@ -400,7 +400,7 @@ public class Site implements Serializable
* @param size max results size crop if >0
* @param collapseGroups true if collapse member groups into user list, false otherwise
*
* @return ScriptableHashMap<String, String> list of members of site with their roles
* @return list of members of site with their roles
*/
public ScriptableHashMap<String, String> listMembers(String nameFilter, String roleFilter, int size, boolean collapseGroups)
{
@@ -498,7 +498,7 @@ public class Site implements Serializable
/**
* Gets (or creates) the "container" folder for the specified component id
*
* @param componentId
* @param componentId String
* @return node representing the "container" folder (or null, if for some reason
* the container can not be created - probably due to permissions)
*/
@@ -733,7 +733,7 @@ public class Site implements Serializable
/**
* Determine if the "container" folder for the specified component exists
*
* @param componentId
* @param componentId String
* @return true => "container" folder exists
*/
public boolean hasContainer(String componentId)
@@ -856,7 +856,7 @@ public class Site implements Serializable
/**
* Get a map of the sites custom properties
*
* @return ScriptableQNameMap<String, Serializable> map of names and values
* @return map of names and values
*/
public ScriptableQNameMap<String, CustomProperty> getCustomProperties()
{