mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-15 15:02:20 +00:00
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:
@@ -1484,8 +1484,8 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
* Get paged list of people optionally filtered and/or sorted using FTS
|
||||
*
|
||||
* @param pattern - String to search
|
||||
* @param pagingRequest
|
||||
* @return
|
||||
* @param pagingRequest PagingRequest
|
||||
* @return PagingResults<PersonInfo>
|
||||
*/
|
||||
private PagingResults<PersonInfo> getPeopleFts(String pattern, PagingRequest pagingRequest)
|
||||
{
|
||||
@@ -2015,9 +2015,9 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
* Determine if the updated properties constitute a valid user update.
|
||||
* Currently we only check for updates to the user firstname, lastname
|
||||
*
|
||||
* @param before
|
||||
* @param after
|
||||
* @return
|
||||
* @param before Map<QName, Serializable>
|
||||
* @param after Map<QName, Serializable>
|
||||
* @return boolean
|
||||
*/
|
||||
private boolean validUserUpdateEvent(Map<QName, Serializable> before, Map<QName, Serializable> after)
|
||||
{
|
||||
@@ -2035,8 +2035,8 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
/**
|
||||
* Publish new user event
|
||||
*
|
||||
* @param eventType
|
||||
* @param properties
|
||||
* @param eventType String
|
||||
* @param properties Map<QName, Serializable>
|
||||
*/
|
||||
private void publishEvent(String eventType, Map<QName, Serializable> properties)
|
||||
{
|
||||
|
Reference in New Issue
Block a user