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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-27 23:00:01 +00:00
parent 8109be0920
commit a4a7c5f8e7
492 changed files with 4135 additions and 4255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java
View File

@@ -37,7 +37,7 @@ public class BaseScopableProcessorExtension extends BaseProcessorExtension imple
/**
* Set the Scriptable global scope
*
* @param script relative global scope
* @param scope relative global scope
*/
public void setScope(Scriptable scope)
{

16
source/java/org/alfresco/repo/jscript/Classification.java
View File

@@ -194,16 +194,12 @@ public final class Classification extends BaseScopableProcessorExtension
}
return qname;
}
/**
* Tag class returned from getCategoryUsage().
*
* @param CategoryNode
* @param frequency
* @return
*/
public final class Tag
{
/**
* Tag class returned from getCategoryUsage().
*/
public final class Tag
{
private CategoryNode categoryNode;
private int frequency = 0;

3
source/java/org/alfresco/repo/jscript/People.java
View File

@@ -1134,8 +1134,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi
* Gets the members (people) of a group (including all sub-groups)
*
* @param group the group to retrieve members for
* @param recurse recurse into sub-groups
*
*
* @return members of the group as a JavaScript array
*/
public Scriptable getMembers(ScriptNode group)

2
source/java/org/alfresco/repo/jscript/Scopeable.java
View File

@@ -33,7 +33,7 @@ public interface Scopeable
/**
* Set the Scriptable global scope
*
* @param script relative global scope
* @param scope relative global scope
*/
void setScope(Scriptable scope);
}

34
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -1735,7 +1735,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
* <p>
* Once created the file should have content set using the <code>content</code> property.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param name Name of the file to create
*
@@ -1751,7 +1751,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
* <p>
* Once created the file should have content set using the <code>content</code> property.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param name Name of the file to create
* @param type Type of the file to create (if null, defaults to ContentModel.TYPE_CONTENT)
@@ -1776,7 +1776,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Create a new folder (cm:folder) node as a child of this node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param name Name of the folder to create
*
@@ -1790,7 +1790,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Create a new folder (cm:folder) node as a child of this node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param name Name of the folder to create
* @param type Type of the folder to create (if null, defaults to ContentModel.TYPE_FOLDER)
@@ -1853,7 +1853,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Create a new Node of the specified type as a child of this node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param name Name of the node to create (can be null for a node without a 'cm:name' property)
* @param type QName type (fully qualified or short form such as 'cm:content')
@@ -1870,7 +1870,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Create a new Node of the specified type as a child of this node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param name Name of the node to create (can be null for a node without a 'cm:name' property)
* @param type QName type (fully qualified or short form such as 'cm:content')
@@ -1922,7 +1922,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
* Creates a new secondary association between the current node and the specified child node.
* The association is given the same name as the child node's primary association.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param node node to add as a child of this node
*/
@@ -1942,7 +1942,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
* The child node will be cascade deleted if one of the associations was the
* primary association, i.e. the one with which the child node was created.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param node child node to remove
*/
@@ -1956,7 +1956,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Create an association between this node and the specified target node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param target Destination node for the association
* @param assocType Association type qname (short form or fully qualified)
@@ -1974,7 +1974,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Remove an association between this node and the specified target node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param target Destination node on the end of the association
* @param assocType Association type qname (short form or fully qualified)
@@ -1991,7 +1991,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Remove this node. Any references to this Node or its NodeRef should be discarded!
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
*/
public boolean remove()
@@ -2068,7 +2068,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
* This node must have the cm:versionable aspect. It will be checked out if required
* but will be checked in after the call.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param history Version history note
* @param majorVersion True to save as a major version increment, false for minor version.
@@ -2113,7 +2113,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Move this Node to a new parent destination.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param destination Node
*
@@ -2135,7 +2135,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Move this Node from specified parent to a new parent destination.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param source Node
* @param destination Node
@@ -2175,7 +2175,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Add an aspect to the Node. As no properties are provided in this call, it can only be used to add aspects that do not require any mandatory properties.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
* @param type Type name of the aspect to add
*
* @return true if the aspect was added successfully, false if an error occured.
@@ -2188,7 +2188,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Add an aspect to the Node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param type Type name of the aspect to add
* @param props ScriptableObject (generally an assocative array) providing the named properties for the aspect
@@ -2272,7 +2272,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
/**
* Remove aspect from the node.
*
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link save()} first.
* Beware: Any unsaved property changes will be lost when this is called. To preserve property changes call {@link #save()} first.
*
* @param type the aspect type
*

4
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -354,7 +354,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
* Execute a Lucene search (sorted)
*
* @param search Lucene search string to execute
* @param sortKey property name to sort on
* @param sortColumn column to sort on
* @param asc true => ascending sort
*
* @return JavaScript array of Node results from the search - can be empty but not null
@@ -379,7 +379,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
*
* @param store Store reference to search against i.e. workspace://SpacesStore
* @param search Lucene search string to execute
* @param sortKey property name to sort on
* @param sortColumn column to sort on
* @param asc true => ascending sort
*
* @return JavaScript array of Node results from the search - can be empty but not null

2
source/java/org/alfresco/repo/jscript/app/IgnorePropertyDecorator.java
View File

@@ -33,7 +33,7 @@ import org.json.simple.JSONAware;
public class IgnorePropertyDecorator extends BasePropertyDecorator
{
/**
* @see org.alfresco.repo.jscript.app.PropertyDecorator#decorate(org.alfresco.service.cmr.repository.NodeRef, java.io.Serializable)
* @see org.alfresco.repo.jscript.app.PropertyDecorator#decorate(QName, org.alfresco.service.cmr.repository.NodeRef, java.io.Serializable)
*/
public JSONAware decorate(QName propertyName, NodeRef nodeRef, Serializable value)
{

2
source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
View File

@@ -375,7 +375,7 @@ public class JSONConversionComponent
/**
*
* @param nodeRef
* @param map
* @param properties
* @param useShortQNames
* @return
* @throws JSONException

2
source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
View File

@@ -46,7 +46,7 @@ public class UsernamePropertyDecorator extends BasePropertyDecorator
}
/**
* @see org.alfresco.repo.jscript.app.PropertyDecorator#decorate(org.alfresco.service.cmr.repository.NodeRef, java.io.Serializable)
* @see org.alfresco.repo.jscript.app.PropertyDecorator#decorate(QName, org.alfresco.service.cmr.repository.NodeRef, java.io.Serializable)
*/
@SuppressWarnings("unchecked")
public JSONAware decorate(QName propertyName, NodeRef nodeRef, Serializable value)