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

@@ -188,9 +188,6 @@ public class PreferenceServiceImpl implements PreferenceService
return preferenceValue;
}
/**
* @see org.alfresco.repo.person.PersonService#getPreferences(java.lang.String, java.lang.String)
*/
@SuppressWarnings({ "unchecked" })
public Map<String, Serializable> getPreferences(String userName, String preferenceFilter)
{
@@ -357,10 +354,6 @@ public class PreferenceServiceImpl implements PreferenceService
return result;
}
/**
* @see org.alfresco.repo.person.PersonService#setPreferences(java.lang.String,
* java.util.HashMap)
*/
public void setPreferences(final String userName, final Map<String, Serializable> preferences)
{
// Get the user node reference
@@ -469,10 +462,6 @@ public class PreferenceServiceImpl implements PreferenceService
clearPreferences(userName, null);
}
/**
* @see org.alfresco.repo.person.PersonService#clearPreferences(java.lang.String,
* java.lang.String)
*/
public void clearPreferences(final String userName, final String preferenceFilter)
{
// Get the user node reference