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 
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
Download Patch File Download Diff File Expand all files Collapse all files

62
source/java/org/alfresco/repo/action/ActionServiceImpl.java
View File

@@ -214,13 +214,13 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
this.monitor = monitor;
}
/**
* Set the asynchronous action execution queues
*
* @param asynchronousActionExecutionQueues the asynchronous action execution
* queues
* @deprecated Rather than inject a Map<String, AsynchronousActionExecutionQueue>, it is
* preferable to inject individual {@link AsynchronousActionExecutionQueue} instances
/**
* Set the asynchronous action execution queues
*
* @param asynchronousActionExecutionQueues the asynchronous action execution
* queues
* @deprecated Rather than inject a Map<String, AsynchronousActionExecutionQueue>, it is
* preferable to inject individual {@link AsynchronousActionExecutionQueue} instances
* during bean initialisation in a spring init-method.
*/
public void setAsynchronousActionExecutionQueues(
@@ -231,8 +231,8 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
/**
* This method registers an {@link AsynchronousActionExecutionQueue} with the {@link ActionService}.
* @param key
* @param asyncExecQueue
* @param key String
* @param asyncExecQueue AsynchronousActionExecutionQueue
* @since Thor Phase 2 Sprint 2
*/
public void registerAsynchronousActionExecutionQueue(String key, AsynchronousActionExecutionQueue asyncExecQueue)
@@ -398,13 +398,13 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
ActionCondition condition = createActionCondition(name);
condition.setParameterValues(params);
return condition;
}
/**
* @see org.alfresco.service.cmr.action.ActionService#createAction(String)
*/
public Action createAction(String name)
{
}
/**
* @see org.alfresco.service.cmr.action.ActionService#createAction(String)
*/
public Action createAction(String name)
{
return new ActionImpl(null, GUID.generate(), name, null);
}
@@ -1234,8 +1234,8 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
/**
* Save the condition properties
*
* @param conditionNodeRef
* @param condition
* @param conditionNodeRef NodeRef
* @param condition ActionCondition
*/
private void saveConditionProperties(NodeRef conditionNodeRef, ActionCondition condition)
{
@@ -1660,12 +1660,12 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
actionTrackingService.recordActionPending(action, actionedUponNodeRef);
}
}
}
}
@SuppressWarnings("unchecked")
private List<PendingAction> getPostTransactionPendingActions()
{
}
}
@SuppressWarnings("unchecked")
private List<PendingAction> getPostTransactionPendingActions()
{
return (List<PendingAction>) AlfrescoTransactionSupport.getResource(POST_TRANSACTION_PENDING_ACTIONS);
}
@@ -1775,13 +1775,13 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
return false;
}
}
}
/**
* @return Returns {@link CopyBehaviourCallback}
*/
public CopyBehaviourCallback getCopyCallback(QName classRef, CopyDetails copyDetails)
{
}
/**
* @return Returns {@link CopyBehaviourCallback}
*/
public CopyBehaviourCallback getCopyCallback(QName classRef, CopyDetails copyDetails)
{
return ActionParameterTypeCopyBehaviourCallback.INSTANCE;
}