mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +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:
@@ -171,7 +171,7 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Register a property decorator;
|
||||
*
|
||||
* @param propertyDecorator
|
||||
* @param propertyDecorator PropertyDecorator
|
||||
*/
|
||||
public void registerPropertyDecorator(PropertyDecorator propertyDecorator)
|
||||
{
|
||||
@@ -219,10 +219,9 @@ public class JSONConversionComponent
|
||||
|
||||
/**
|
||||
*
|
||||
* @param nodeInfo
|
||||
* @param rootJSONObject
|
||||
* @param useShortQNames
|
||||
* @throws JSONException
|
||||
* @param nodeInfo FileInfo
|
||||
* @param rootJSONObject JSONObject
|
||||
* @param useShortQNames boolean
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
protected void setRootValues(final FileInfo nodeInfo, final JSONObject rootJSONObject, final boolean useShortQNames)
|
||||
@@ -277,9 +276,8 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Handles the work of converting node permissions to JSON.
|
||||
*
|
||||
* @param nodeRef
|
||||
* @return
|
||||
* @throws JSONException
|
||||
* @param nodeRef NodeRef
|
||||
* @return JSONObject
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
protected JSONObject permissionsToJSON(final NodeRef nodeRef)
|
||||
@@ -297,8 +295,8 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Handles the work of converting user permissions to JSON.
|
||||
*
|
||||
* @param nodeRef
|
||||
* @return
|
||||
* @param nodeRef NodeRef
|
||||
* @return JSONObject
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
protected JSONObject userPermissionsToJSON(final NodeRef nodeRef)
|
||||
@@ -315,10 +313,10 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Handles the work of converting values to JSON.
|
||||
*
|
||||
* @param nodeRef
|
||||
* @param propertyName
|
||||
* @param key
|
||||
* @param value
|
||||
* @param nodeRef NodeRef
|
||||
* @param propertyName QName
|
||||
* @param key String
|
||||
* @param value Serializable
|
||||
* @return the JSON value
|
||||
*/
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
@@ -374,11 +372,10 @@ public class JSONConversionComponent
|
||||
|
||||
/**
|
||||
*
|
||||
* @param nodeRef
|
||||
* @param properties
|
||||
* @param useShortQNames
|
||||
* @return
|
||||
* @throws JSONException
|
||||
* @param nodeRef NodeRef
|
||||
* @param properties Map<QName, Serializable>
|
||||
* @param useShortQNames boolean
|
||||
* @return JSONObject
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
protected JSONObject propertiesToJSON(NodeRef nodeRef, Map<QName, Serializable> properties, boolean useShortQNames)
|
||||
@@ -408,10 +405,9 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Handles the work of converting aspects to JSON.
|
||||
*
|
||||
* @param nodeRef
|
||||
* @param useShortQNames
|
||||
* @return
|
||||
* @throws JSONException
|
||||
* @param nodeRef NodeRef
|
||||
* @param useShortQNames boolean
|
||||
* @return JSONArray
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
protected JSONArray apsectsToJSON(NodeRef nodeRef, boolean useShortQNames)
|
||||
@@ -430,8 +426,8 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Handles the work of converting all set permissions to JSON.
|
||||
*
|
||||
* @param nodeRef
|
||||
* @return
|
||||
* @param nodeRef NodeRef
|
||||
* @return JSONArray
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
protected JSONArray allSetPermissionsToJSON(NodeRef nodeRef)
|
||||
@@ -455,8 +451,8 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Convert a qname to a string - either full or short prefixed named.
|
||||
*
|
||||
* @param qname
|
||||
* @param isShortName
|
||||
* @param qname QName
|
||||
* @param isShortName boolean
|
||||
* @return qname string.
|
||||
*/
|
||||
private String nameToString(final QName qname, final boolean isShortName)
|
||||
@@ -485,8 +481,8 @@ public class JSONConversionComponent
|
||||
/**
|
||||
* Return true if the node is locked.
|
||||
*
|
||||
* @param nodeRef
|
||||
* @return
|
||||
* @param nodeRef NodeRef
|
||||
* @return boolean
|
||||
*/
|
||||
private boolean isLocked(final NodeRef nodeRef)
|
||||
{
|
||||
|
Reference in New Issue
Block a user