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

@@ -184,12 +184,12 @@ public class InviteHelper implements InitializingBean
/**
* Returns an InviteInfo instance for the given startInvite task
* (used for rendering the response).
*
* @param startInviteTask startInvite task to get invite info properties from
* @return InviteInfo instance containing invite information
*/
public InviteInfo getPendingInviteInfo(WorkflowTask startInviteTask)
* (used for rendering the response).
*
* @param startInviteTask startInvite task to get invite info properties from
* @return InviteInfo instance containing invite information
*/
public InviteInfo getPendingInviteInfo(WorkflowTask startInviteTask)
{
Map<QName, Serializable> taskProps = startInviteTask.getProperties();
// get the inviter, invitee, role and site short name
@@ -230,13 +230,13 @@ public class InviteHelper implements InitializingBean
/**
* Add Invitee to Site with the site role that the inviter "started" the invite process with
* @param invitee
* @param siteName
* @param role
* @param runAsUser
* @param overrideExisting
*/
public void addSiteMembership(final String invitee, final String siteName, final String role, final String runAsUser, final boolean overrideExisting)
* @param invitee String
* @param siteName String
* @param role String
* @param runAsUser String
* @param overrideExisting boolean
*/
public void addSiteMembership(final String invitee, final String siteName, final String role, final String runAsUser, final boolean overrideExisting)
{
AuthenticationUtil.runAs(new RunAsWork<Void>()
{
@@ -256,12 +256,12 @@ public class InviteHelper implements InitializingBean
* Clean up invitee user account and person node when no longer in use.
* They are deemed to no longer be in use when the invitee user account
* is still disabled and there are no outstanding pending invites for that invitee.
*
* @param inviteeUserName
* @param currentInviteId TODO
*/
public void deleteAuthenticationIfUnused(final String inviteeUserName, final String currentInviteId)
{
*
* @param inviteeUserName String
* @param currentInviteId String
*/
public void deleteAuthenticationIfUnused(final String inviteeUserName, final String currentInviteId)
{
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
public Object doWork() throws Exception
@@ -302,9 +302,11 @@ public class InviteHelper implements InitializingBean
}
}, AuthenticationUtil.getSystemUserName());
}
/**
* @param executionVariables
*
* @param executionVariables Map<String, Object>
* @param currentInviteId String
*/
public void cancelInvitation(Map<String, Object> executionVariables, String currentInviteId)
{
@@ -366,7 +368,7 @@ public class InviteHelper implements InitializingBean
}
/**
* @param vars
* @param vars Map<String, Object>
*/
public void rejectModeratedInvitation(Map<String, Object> vars)
{