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

@@ -187,14 +187,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
public int hashCode()
{
return uuid.hashCode();
}
/**
* Registers the node policies as well as node indexing behaviour if the
* {@link #setIndexer(Indexer) indexer} is present.
*/
public void init()
{
}
/**
* Registers the node policies as well as node indexing behaviour
*/
public void init()
{
// Register the various policies
beforeCreateStoreDelegate = policyComponent.registerClassPolicy(NodeServicePolicies.BeforeCreateStorePolicy.class);
onCreateStoreDelegate = policyComponent.registerClassPolicy(NodeServicePolicies.OnCreateStorePolicy.class);
@@ -301,13 +300,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
// execute policy for node type and aspects
NodeServicePolicies.OnCreateNodePolicy policy = onCreateNodeDelegate.get(childNodeRef, qnames);
policy.onCreateNode(childAssocRef);
}
/**
* @see NodeServicePolicies.BeforeMoveNodePolicy#onMoveNode(ChildAssociationRef, NodeRef)
*/
protected void invokeBeforeMoveNode(ChildAssociationRef oldChildAssocRef, NodeRef newParentRef)
{
}
/**
* @see NodeServicePolicies.BeforeMoveNodePolicy#beforeMoveNode(ChildAssociationRef, NodeRef)
*/
protected void invokeBeforeMoveNode(ChildAssociationRef oldChildAssocRef, NodeRef newParentRef)
{
NodeRef childNodeRef = oldChildAssocRef.getChildRef();
if (ignorePolicy(childNodeRef))
@@ -407,13 +406,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
// execute policy for node type and aspects
NodeServicePolicies.BeforeSetNodeTypePolicy policy = beforeSetNodeTypeDelegate.get(nodeRef, qnames);
policy.beforeSetNodeType(nodeRef, oldType, newType);
}
/**
* @see NodeServicePolicies.OnUpdateProperties#onUpdatePropertiesPolicy(NodeRef, Map, Map)
*/
protected void invokeOnUpdateProperties(
NodeRef nodeRef,
}
/**
* @see NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(NodeRef, Map, Map)
*/
protected void invokeOnUpdateProperties(
NodeRef nodeRef,
Map<QName, Serializable> before,
Map<QName, Serializable> after)
{
@@ -480,13 +479,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
// execute policy for node type and aspects
NodeServicePolicies.BeforeDeleteNodePolicy policy = beforeDeleteNodeDelegate.get(nodeRef, qnames);
policy.beforeDeleteNode(nodeRef);
}
/**
* @see NodeServicePolicies.BeforeAr
*/
protected void invokeBeforeArchiveNode(NodeRef nodeRef)
{
}
/**
* @see NodeServicePolicies.BeforeArchiveNodePolicy
*/
protected void invokeBeforeArchiveNode(NodeRef nodeRef)
{
if (ignorePolicy(nodeRef))
{
return;
@@ -497,13 +496,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
// execute policy for node type and aspects
NodeServicePolicies.BeforeArchiveNodePolicy policy = beforeArchiveNodeDelegate.get(nodeRef, qnames);
policy.beforeArchiveNode(nodeRef);
}
/**
* @see NodeServicePolicies.OnDeleteNodePolicy#onDeleteNode(ChildAssociationRef)
*/
protected void invokeOnDeleteNode(ChildAssociationRef childAssocRef, QName childNodeTypeQName, Set<QName> childAspectQnames, boolean isArchivedNode)
{
}
/**
* @see NodeServicePolicies.OnDeleteNodePolicy#onDeleteNode(ChildAssociationRef, boolean)
*/
protected void invokeOnDeleteNode(ChildAssociationRef childAssocRef, QName childNodeTypeQName, Set<QName> childAspectQnames, boolean isArchivedNode)
{
NodeRef childNodeRef = childAssocRef.getChildRef();
Set<QName> qnames = null;
@@ -531,13 +530,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
NodeServicePolicies.OnDeleteNodePolicy policy = onDeleteNodeDelegate.get(childAssocRef.getChildRef(), qnames);
policy.onDeleteNode(childAssocRef, isArchivedNode);
}
}
/**
* @see NodeServicePolicies.OnRestoreNodePolicy#onDeleteNode(ChildAssociationRef)
*/
protected void invokeOnRestoreNode(ChildAssociationRef childAssocRef)
{
}
/**
* @see NodeServicePolicies.OnRestoreNodePolicy#onRestoreNode(ChildAssociationRef)
*/
protected void invokeOnRestoreNode(ChildAssociationRef childAssocRef)
{
NodeRef childNodeRef = childAssocRef.getChildRef();
// get qnames to invoke against
Set<QName> qnames = getTypeAndAspectQNames(childNodeRef);
@@ -573,13 +572,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
NodeServicePolicies.OnAddAspectPolicy policy = onAddAspectDelegate.get(nodeRef, aspectTypeQName);
policy.onAddAspect(nodeRef, aspectTypeQName);
}
/**
* @see NodeServicePolicies.BeforeRemoveAspectPolicy#BeforeRemoveAspect(NodeRef,
* QName)
*/
protected void invokeBeforeRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
}
/**
* @see NodeServicePolicies.BeforeRemoveAspectPolicy#beforeRemoveAspect(NodeRef,
* QName)
*/
protected void invokeBeforeRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
{
if (ignorePolicy(nodeRef))
{
@@ -603,13 +602,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
NodeServicePolicies.OnRemoveAspectPolicy policy = onRemoveAspectDelegate.get(nodeRef, aspectTypeQName);
policy.onRemoveAspect(nodeRef, aspectTypeQName);
}
/**
* @see NodeServicePolicies.OnCreateChildAssociationPolicy#onCreateChildAssociation(ChildAssociationRef)
*/
protected void invokeOnCreateChildAssociation(ChildAssociationRef childAssocRef, boolean isNewNode)
{
}
/**
* @see NodeServicePolicies.OnCreateChildAssociationPolicy#onCreateChildAssociation(ChildAssociationRef, boolean)
*/
protected void invokeOnCreateChildAssociation(ChildAssociationRef childAssocRef, boolean isNewNode)
{
// Get the parent reference and the assoc type qName
NodeRef parentNodeRef = childAssocRef.getParentRef();
@@ -664,13 +663,13 @@ public abstract class AbstractNodeServiceImpl implements NodeService
// execute policy for node type and aspects
NodeServicePolicies.OnDeleteChildAssociationPolicy policy = onDeleteChildAssociationDelegate.get(parentNodeRef, qnames, assocTypeQName);
policy.onDeleteChildAssociation(childAssocRef);
}
/**
* @see NodeServicePolicies.OnCreateAssociationPolicy#onCreateAssociation(NodeRef, NodeRef, QName)
*/
protected void invokeOnCreateAssociation(AssociationRef nodeAssocRef)
{
}
/**
* @see NodeServicePolicies.OnCreateAssociationPolicy#onCreateAssociation(AssociationRef)
*/
protected void invokeOnCreateAssociation(AssociationRef nodeAssocRef)
{
NodeRef sourceNodeRef = nodeAssocRef.getSourceRef();
if (ignorePolicy(sourceNodeRef))
@@ -805,13 +804,12 @@ public abstract class AbstractNodeServiceImpl implements NodeService
}
/**
* Sets the default property values
*
* @param classDefinition the model type definition for which to get defaults
* @param properties the properties of the node
*/
protected Map<QName, Serializable> getDefaultProperties(ClassDefinition classDefinition)
{
* Sets the default property values
*
* @param classDefinition the model type definition for which to get defaults
*/
protected Map<QName, Serializable> getDefaultProperties(ClassDefinition classDefinition)
{
PropertyMap properties = new PropertyMap();
for (Map.Entry<QName, Serializable> entry : classDefinition.getDefaultValues().entrySet())
{