[jbpm-commits] JBoss JBPM SVN: r4357 - 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-03-30 11:40:57 -0400 (Mon, 30 Mar 2009)
New Revision: 4357

Modified:
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
Log:
Fix task selection by GroupRef 

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-03-30 13:27:06 UTC (rev 4356)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-03-30 15:40:57 UTC (rev 4357)
@@ -57,8 +57,10 @@
       UserRef user = new UserRef(idRef);
       List<Task> assignedTasks = taskService.findTasksByAssignment(user);
       List<Task> userTasks = taskService.findTasksByParticipation(Participation.CANDIDATE, user);
-      List<Task> groupTasks = taskService.findTasksByParticipation(Participation.CANDIDATE, new GroupRef(idRef));
 
+      GroupRef[] groups = getGroupIdsForIdentityRef(idRef);
+      List<Task> groupTasks = taskService.findTasksByParticipation(Participation.CANDIDATE, groups);
+
       adoptTasks(assignedTasks, results);
       adoptTasks(userTasks, results);
       adoptTasks(groupTasks, results);
@@ -79,17 +81,19 @@
     }
   }
 
-  private List<String> getGroupIdsForIdentityRef(String idRef)
+  private GroupRef[] getGroupIdsForIdentityRef(String idRef)
   {
     IdentityService idService = this.processEngine.get(IdentityService.class);
     List<Group> groups = idService.findGroupsByUser(idRef);
-    List<String> groupIds = new ArrayList<String>();
+    GroupRef[] groupRefs = new GroupRef[groups.size()];
+    int i = 0;
     for(Group g : groups)
     {
-      groupIds.add(g.getId());
+      groupRefs[i] = new GroupRef(g.getId());
+      i++;
     }
 
-    return groupIds;
+    return groupRefs;
   }
 
   public TaskRef getTaskById(long taskId)