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

source/java/org/alfresco/service/cmr/workflow/WorkflowService.java

@@ -240,8 +240,8 @@ public interface WorkflowService
     /**
      * Gets all "in-flight" workflow instances according to the specified workflowInstanceQuery parameter
      * 
-     * @param workflowInstanceQuery
-     * @return
+     * @param workflowInstanceQuery WorkflowInstanceQuery
+     * @return List<WorkflowInstance>
      */
     public List<WorkflowInstance> getWorkflows(WorkflowInstanceQuery workflowInstanceQuery);
     
@@ -249,9 +249,9 @@ public interface WorkflowService
      * Gets maxItems "in-flight" workflow instances according to the specified workflowInstanceQuery parameter
      * Get maxItems and skipCount parameters form request
      * 
-     * @param workflowInstanceQuery
-     * @param maxItems
-     * @param skipCount
+     * @param workflowInstanceQuery WorkflowInstanceQuery
+     * @param maxItems int
+     * @param skipCount int
      * @return maxItems workflow instances
      */
     public List<WorkflowInstance> getWorkflows(WorkflowInstanceQuery workflowInstanceQuery, int maxItems, int skipCount);
@@ -259,7 +259,7 @@ public interface WorkflowService
     /**
      * Get count of workflow instances
      * 
-     * @param workflowInstanceQuery
+     * @param workflowInstanceQuery WorkflowInstanceQuery
      * @return count of workflow instances
      */
     public long countWorkflows(WorkflowInstanceQuery workflowInstanceQuery);
@@ -268,7 +268,7 @@ public interface WorkflowService
      * Gets all active workflow instances.
      * 
      * @return  the list of "in-flight" workflow instances
-     * @since4.0
+     * @since 4.0
      */
     @Auditable
     public List<WorkflowInstance> getActiveWorkflows();
@@ -380,8 +380,8 @@ public interface WorkflowService
     /**
      * Gets the start task instance for the given workflow instance.
      * 
-     * @param workflowInstanceId
-     * @return
+     * @param workflowInstanceId String
+     * @return WorkflowTask
      */
     @Auditable(parameters = {"pathId"})
     public WorkflowTask getStartTask(String workflowInstanceId);
@@ -389,11 +389,11 @@ public interface WorkflowService
     /**
      * Gets the start task instances for the given workflow instances.
      * 
-     * @param workflowInstanceIds
+     * @param workflowInstanceIds List<String>
      * @param sameSession indicates that the returned {@link WorkflowTask} elements will be used in
      *        the same session. If {@code true}, the returned List will be a lazy loaded list
      *        providing greater performance.
-     * @return
+     * @return List<WorkflowTask>
      */
     @Auditable(parameters = {"pathIds"})
     public List<WorkflowTask> getStartTasks(List<String> workflowInstanceIds, boolean sameSession);

source/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java

@@ -78,7 +78,7 @@ public class WorkflowTaskQuery
     
     
     /**
-     * @param orderBy
+     * @param orderBy OrderBy[]
      */
     public void setOrderBy(OrderBy[] orderBy)
     {
@@ -86,7 +86,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return OrderBy[]
      */
     public OrderBy[] getOrderBy()
     {
@@ -94,7 +94,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return String
      */
     public String getTaskId()
     {
@@ -102,7 +102,7 @@ public class WorkflowTaskQuery
     }
     
     /** 
-     * @param taskId
+     * @param taskId String
      */
     public void setTaskId(String taskId)
     {
@@ -110,7 +110,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return Map
      */
     public Map<QName, Object> getTaskCustomProps()
     {
@@ -118,7 +118,7 @@ public class WorkflowTaskQuery
     }
 
     /**
-     * @param taskCustomProps
+     * @param taskCustomProps Map<QName, Object>
      */
     public void setTaskCustomProps(Map<QName, Object> taskCustomProps)
     {
@@ -126,7 +126,7 @@ public class WorkflowTaskQuery
     }
 
     /**
-     * @return
+     * @return WorkflowTaskState
      */
     public WorkflowTaskState getTaskState()
     {
@@ -134,7 +134,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @param taskState
+     * @param taskState WorkflowTaskState
      */
     public void setTaskState(WorkflowTaskState taskState)
     {
@@ -142,7 +142,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return QName
      */
     public QName getTaskName()
     {
@@ -150,7 +150,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @param taskName
+     * @param taskName QName
      */
     public void setTaskName(QName taskName)
     {
@@ -158,7 +158,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return String
      */
     public String getActorId()
     {
@@ -166,7 +166,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @param actorId
+     * @param actorId String
      */
     public void setActorId(String actorId)
     {
@@ -174,7 +174,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return String
      */
     public String getProcessId()
     {
@@ -183,7 +183,7 @@ public class WorkflowTaskQuery
 
     /**
      * Filters ont he {@link WorkflowInstance} Id.
-     * @param processId
+     * @param processId String
      */
     public void setProcessId(String processId)
     {
@@ -191,7 +191,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return QName
      */
     public QName getProcessName()
     {
@@ -204,7 +204,7 @@ public class WorkflowTaskQuery
      * the method {@link #setWorkflowDefinitionName(String)} should be used
      * instead of this method.
      * 
-     * @param processName
+     * @param processName QName
      */
     @Deprecated
     public void setProcessName(QName processName)
@@ -213,7 +213,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return 
+     * @return String
      */
     public String getWorkflowDefinitionName()
     {
@@ -222,7 +222,7 @@ public class WorkflowTaskQuery
     
     /**
      * Filters on the {@link WorkflowDefinition} name.
-     * @param workflowDefinitionName
+     * @param workflowDefinitionName String
      */
     public void setWorkflowDefinitionName(String workflowDefinitionName)
     {
@@ -230,7 +230,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @return
+     * @return Boolean
      */
     public Boolean isActive()
     {
@@ -238,7 +238,7 @@ public class WorkflowTaskQuery
     }
     
     /**
-     * @param active
+     * @param active Boolean
      */
     public void setActive(Boolean active)
     {
@@ -246,7 +246,7 @@ public class WorkflowTaskQuery
     }
 
     /**
-     * @return
+     * @return Map
      */
     public Map<QName, Object> getProcessCustomProps()
     {
@@ -254,7 +254,7 @@ public class WorkflowTaskQuery
     }
 
     /**
-     * @param processCustomProps
+     * @param processCustomProps Map<QName, Object>
      */
     public void setProcessCustomProps(Map<QName, Object> processCustomProps)
     {