[jbpm-commits] JBoss JBPM SVN: r4809 - jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-05-13 16:34:25 -0400 (Wed, 13 May 2009)
New Revision: 4809

Modified:
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
Log:
More finegrained task list access methods

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-05-13 20:23:37 UTC (rev 4808)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-05-13 20:34:25 UTC (rev 4809)
@@ -23,11 +23,9 @@
 
 import org.jboss.bpm.console.client.model.TaskRef;
 import org.jboss.bpm.console.server.integration.TaskManagement;
-import org.jbpm.api.IdentityService;
 import org.jbpm.api.TaskService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.EnvironmentFactory;
-import org.jbpm.api.task.GroupRef;
 import org.jbpm.api.task.Participation;
 import org.jbpm.api.task.Task;
 
@@ -41,17 +39,27 @@
  */
 public class TaskManagementImpl extends JBPMIntegration implements TaskManagement
 {
-  public List<TaskRef> getTasksForIdentity(String idRef)
+  public List<TaskRef> getAssignedTasks(String idRef)
   {
-    return internalGetTaskForIdentity(idRef, null);
-  }
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
-  public List<TaskRef> getTasksForIdentity(String idRef, String participationType)
-  {
-    return internalGetTaskForIdentity(idRef, participationType);
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      List<TaskRef> results = new ArrayList<TaskRef>();
+
+      List<Task> assignedTasks = taskService.findAssignedTasks(idRef);
+      adoptTasks(assignedTasks, results);
+
+      return results;
+    }
+    finally
+    {
+      env.close();
+    }
   }
 
-  private List<TaskRef> internalGetTaskForIdentity(String idRef, String participationType)
+  public List<TaskRef> getUnassignedTasks(String idRef, String participationType)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
@@ -62,11 +70,7 @@
 
       if(null==participationType || participationType.equals(Participation.CANDIDATE))
       {
-        // TODO: Paging
-        List<Task> assignedTasks = taskService.findAssignedTasks(idRef);
         List<Task> takableTasks = taskService.findTakableTasks(idRef);
-
-        adoptTasks(assignedTasks, results);
         adoptTasks(takableTasks, results);
       }
       else
@@ -90,21 +94,6 @@
     }
   }
 
-  private GroupRef[] getGroupIdsForIdentityRef(String idRef)
-  {
-    IdentityService idService = this.processEngine.get(IdentityService.class);
-    List<String> groupIds = idService.findGroupIdsByUser(idRef);
-    GroupRef[] groupRefs = new GroupRef[groupIds.size()];
-    int i = 0;
-    for(String groupId : groupIds)
-    {
-      groupRefs[i] = new GroupRef(groupId);
-      i++;
-    }
-
-    return groupRefs;
-  }
-
   public TaskRef getTaskById(long taskId)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
@@ -120,20 +109,6 @@
     }
   }
 
-  public void takeTask(long taskId, String idRef)
-  {
-    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
-
-    try
-    {
-      TaskService taskService = this.processEngine.get(TaskService.class);
-      taskService.takeTask(taskId, idRef);
-    }
-    finally{
-      env.close();
-    }
-  }
-
   public void assignTask(long taskId, String idRef)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
@@ -171,7 +146,7 @@
       TaskService taskService = this.processEngine.get(TaskService.class);
       if(data!=null)
         taskService.setVariables(taskId, data);
-      
+
       taskService.completeTask(taskId);
     }
     finally{