mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
127483 aleahu: MNT-16224, RA-1093: Fixed compilation issue that occurred during merge (methods were already present in the 5.2.N branch) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -151,16 +151,6 @@ public class QuickShareServiceImpl implements QuickShareService,
|
|||||||
private String defaultEmailSender;
|
private String defaultEmailSender;
|
||||||
private ClientAppConfig clientAppConfig;
|
private ClientAppConfig clientAppConfig;
|
||||||
|
|
||||||
/**
|
|
||||||
* Spring configuration
|
|
||||||
*
|
|
||||||
* @param behaviourFilter the behaviourFilter to set
|
|
||||||
*/
|
|
||||||
public void setBehaviourFilter(BehaviourFilter behaviourFilter)
|
|
||||||
{
|
|
||||||
this.behaviourFilter = behaviourFilter;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring configuration
|
* Spring configuration
|
||||||
*
|
*
|
||||||
@@ -190,14 +180,6 @@ public class QuickShareServiceImpl implements QuickShareService,
|
|||||||
{
|
{
|
||||||
this.authorityService = authorityService;
|
this.authorityService = authorityService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Enable or disable this service.
|
|
||||||
*/
|
|
||||||
public void setEnabled(boolean enabled)
|
|
||||||
{
|
|
||||||
this.enabled = enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the attribute service
|
* Set the attribute service
|
||||||
|
Reference in New Issue
Block a user