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

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

View File

@@ -67,13 +67,13 @@ public interface NodeDAO extends NodeBulkLoader
/*
* Transaction
*/
/**
* @param forceNew <tt>true</tt> to ensure that a new transaction entry is created
* if the current transaction does not have one.
* @return Returns the ID of the current transaction entry or <tt>null</tt> if
* there have not been any modifications to nodes registered in the
*/
/**
* @param ensureNew <tt>true</tt> to ensure that a new transaction entry is created
* if the current transaction does not have one.
* @return Returns the ID of the current transaction entry or <tt>null</tt> if
* there have not been any modifications to nodes registered in the
* transaction and <tt>forceNew</tt> is <tt>false</tt>
*/
public Long getCurrentTransactionId(boolean ensureNew);
@@ -349,13 +349,13 @@ public interface NodeDAO extends NodeBulkLoader
/**
* Pull the <b>cm:modified</b> up to the current time without changing any other
* <b>cm:auditable</b> properties. The change may be done in the current transaction
* or in a later transaction.
*
* @param nodeId the node to change
* @param modifiedDate the date to set for <b>cm:modified</b>
* @return Returns <tt>true</tt> if the <b>cm:modified</b> property was actually set
* @deprecated Use {@link #setModifiedProperties(Long, Date, String)} to also change the <b>cm:modifier</b> property
*/
* or in a later transaction.
*
* @param nodeId the node to change
* @param date the date to set for <b>cm:modified</b>
* @return Returns <tt>true</tt> if the <b>cm:modified</b> property was actually set
* @deprecated Use {@link #setModifiedProperties(Long, Date, String)} to also change the <b>cm:modifier</b> property
*/
public boolean setModifiedDate(Long nodeId, Date date);
/**
@@ -419,13 +419,15 @@ public interface NodeDAO extends NodeBulkLoader
*/
public void setNodeAssocIndex(Long id, int assocIndex);
/**
* Remove a specific node association
*
* @param assocId the node association ID to remove
* @return Returns the number of associations removed
*/
public int removeNodeAssoc(Long sourceNodeId, Long targetNodeId, QName assocTypeQName);
/**
* Remove a specific node association
*
* @param sourceNodeId the source node ID
* @param targetNodeId the target node id
* @param assocTypeQName the node association QName
* @return Returns the number of associations removed
*/
public int removeNodeAssoc(Long sourceNodeId, Long targetNodeId, QName assocTypeQName);
/**
* Remove all node associations of given IDs
@@ -530,13 +532,13 @@ public interface NodeDAO extends NodeBulkLoader
* Sets the association index ordering.
*
* @param parentNodeId the parent node ID
* @param childNodeId the child node ID
* @param assocTypeQName the association type
* @param assocQName the association path qualified name
* @param newIndex the new index
* @return Returns the number of associations modified
*/
public int setChildAssocIndex(
* @param childNodeId the child node ID
* @param assocTypeQName the association type
* @param assocQName the association path qualified name
* @param index the new index
* @return Returns the number of associations modified
*/
public int setChildAssocIndex(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
@@ -721,13 +723,13 @@ public interface NodeDAO extends NodeBulkLoader
/**
* Build the paths for a node.
*
* When searching for <code>primaryOnly == true</code>, checks that there is exactly
* one path.
*
* @param currentNodePair the leave or child node to start with
* @param primaryOnly <tt>true</tt> to follow only primary parent associations
*/
public List<Path> getPaths(Pair<Long, NodeRef> nodePair, boolean primaryOnly) throws InvalidNodeRefException;
* When searching for <code>primaryOnly == true</code>, checks that there is exactly
* one path.
*
* @param nodePair the leave or child node to start with
* @param primaryOnly <tt>true</tt> to follow only primary parent associations
*/
public List<Path> getPaths(Pair<Long, NodeRef> nodePair, boolean primaryOnly) throws InvalidNodeRefException;
/**
* Perform a check for cyclic relationships