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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
View File

@@ -60,7 +60,6 @@ import org.json.JSONObject;
*/
public class PreferenceServiceImpl implements PreferenceService
{
private static final String SHARE_SITES_PREFERENCE_KEY = "org.alfresco.share.sites.favourites.";
private static final int SHARE_SITES_PREFERENCE_KEY_LEN = SHARE_SITES_PREFERENCE_KEY.length();
private static final String EXT_SITES_PREFERENCE_KEY = "org.alfresco.ext.sites.favourites.";
@@ -70,6 +69,8 @@ public class PreferenceServiceImpl implements PreferenceService
private ContentService contentService;
private PersonService personService;
private PermissionService permissionService;
/** Authentication Service */
private AuthenticationContext authenticationContext;
private AuthorityService authorityService;
@@ -87,7 +88,7 @@ public class PreferenceServiceImpl implements PreferenceService
{
this.contentService = contentService;
}
/**
* Set the person service
*
@@ -505,7 +506,7 @@ public class PreferenceServiceImpl implements PreferenceService
// Remove the prefs that match the filter
List<String> removeKeys = new ArrayList<String>(10);
@SuppressWarnings("unchecked")
Iterator<String> keys = jsonPrefs.keys();
Iterator<String> keys = jsonPrefs.keys();
while (keys.hasNext())
{
final String key = (String) keys.next();
@@ -548,7 +549,7 @@ public class PreferenceServiceImpl implements PreferenceService
+ " does not have sufficient permissions to update the preferences of the user " + userName);
}
}
/**
* Helper to encapsulate the test for whether the currently authenticated user can write to the
* preferences objects for the given username and person node reference.