summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-05-16 09:42:56 (EDT)
committerManik Kishore2012-06-19 07:29:52 (EDT)
commitd8ecd54d6ca3828d13a9e6d7c3b03ae0071b88b0 (patch)
tree7671da159d45b8d6f8c52af9d21ae2e33dbc50c7
parent4539a4c68cea30c2d054665593cdfce9e701ffc3 (diff)
downloadorg.eclipse.stardust.ui.web-d8ecd54d6ca3828d13a9e6d7c3b03ae0071b88b0.zip
org.eclipse.stardust.ui.web-d8ecd54d6ca3828d13a9e6d7c3b03ae0071b88b0.tar.gz
org.eclipse.stardust.ui.web-d8ecd54d6ca3828d13a9e6d7c3b03ae0071b88b0.tar.bz2
Jira-ID: CRNT-24694
1)Added method getAllRolesExceptCasePerformer() in WorkflowFacade.java in bcc/WorkflowFacade.java. 2)Changed the references to getAllRoles() to getAllRolesExceptCasePerformer() in BCC views. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@56388 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/WorkflowFacade.java19
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CompletedActivitiesBean.java2
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CostsBean.java4
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/OpenActivitiesBean.java2
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessResourceMgmtBean.java2
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ResourcePerformanceBean.java2
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/UserManagerDetailBean.java4
7 files changed, 27 insertions, 8 deletions
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/WorkflowFacade.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/WorkflowFacade.java
index 5480c0f..4741d9a 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/WorkflowFacade.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/WorkflowFacade.java
@@ -406,6 +406,25 @@ public class WorkflowFacade implements Resetable
}
return null;
}
+
+ /**
+ *
+ * @return
+ */
+ public List<RoleItem> getAllRolesExceptCasePerformer()
+ {
+ List<RoleItem> roles = getAllRoles();
+ Iterator<RoleItem> roleIterator = roles.iterator();
+ while (roleIterator.hasNext())
+ {
+ RoleItem roleItem = roleIterator.next();
+ if (PredefinedConstants.CASE_PERFORMER_ID.equals(roleItem.getRole().getId()))
+ {
+ roleIterator.remove();
+ }
+ }
+ return roles;
+ }
/**
* @param modelParticipantInfo
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CompletedActivitiesBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CompletedActivitiesBean.java
index c21832e..efa0f9b 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CompletedActivitiesBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CompletedActivitiesBean.java
@@ -113,7 +113,7 @@ public class CompletedActivitiesBean extends UIComponentBean implements Resource
Users users = facade.getAllUsers((UserQuery) query);
Iterator<UserItem> userIter = facade.getAllUsersAsUserItems(users).iterator();
- Collection/* <RoleItem> */participants = facade.getAllRoles();
+ Collection/* <RoleItem> */participants = facade.getAllRolesExceptCasePerformer();
List<CompletedActivityUserObject> completedActivitiesProcessList = new ArrayList<CompletedActivityUserObject>();
List<CompletedActivityDynamicUserObject> complActiDyna;
UserItem userItem;
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CostsBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CostsBean.java
index 5ea103e..340bf19 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CostsBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/CostsBean.java
@@ -180,7 +180,7 @@ public class CostsBean extends UIComponentBean implements ResourcePaths,ViewEven
*/
private void initAllParticipants()
{
- List<RoleItem> allRoles = WorkflowFacade.getWorkflowFacade().getAllRoles();
+ List<RoleItem> allRoles = WorkflowFacade.getWorkflowFacade().getAllRolesExceptCasePerformer();
roleSelectItem = new SelectItem[allRoles.size()];
Collections.sort(allRoles, new Comparator<RoleItem>()
{
@@ -233,7 +233,7 @@ public class CostsBean extends UIComponentBean implements ResourcePaths,ViewEven
return;
}
- List<RoleItem> allRoles = WorkflowFacade.getWorkflowFacade().getAllRoles();
+ List<RoleItem> allRoles = WorkflowFacade.getWorkflowFacade().getAllRolesExceptCasePerformer();
if (event.getNewValue() != null)
{
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/OpenActivitiesBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/OpenActivitiesBean.java
index 84b71df..eaa1444 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/OpenActivitiesBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/OpenActivitiesBean.java
@@ -125,7 +125,7 @@ public class OpenActivitiesBean extends UIComponentBean implements ResourcePaths
String[] participantname = null;
List<OpenActivitiesUserObject> pendingActList = new ArrayList<OpenActivitiesUserObject>();
- List< RoleItem > participantList = facade.getAllRoles();
+ List< RoleItem > participantList = facade.getAllRolesExceptCasePerformer();
List<Object[]> data = new ArrayList<Object[]>();
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessResourceMgmtBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessResourceMgmtBean.java
index 73f8b11..1a86fdc 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessResourceMgmtBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessResourceMgmtBean.java
@@ -265,7 +265,7 @@ public class ProcessResourceMgmtBean extends UIComponentBean implements Resource
{
WorkflowFacade facade = WorkflowFacade.getWorkflowFacade();
List<ProcessResourceMgmtRoleTableEntry> processResourceRoleList = new ArrayList<ProcessResourceMgmtRoleTableEntry>();
- List<RoleItem> roleItemList = facade.getAllRoles();
+ List<RoleItem> roleItemList = facade.getAllRolesExceptCasePerformer();
DepartmentInfo departmentInfo;
long departmentOid;
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ResourcePerformanceBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ResourcePerformanceBean.java
index 1ac1e8f..0a91aeb 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ResourcePerformanceBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ResourcePerformanceBean.java
@@ -139,7 +139,7 @@ public class ResourcePerformanceBean extends UIComponentBean implements Resource
if (ViewEventType.CREATED == event.getType())
{
selectedComponent=null;
- allRoles = WorkflowFacade.getWorkflowFacade().getAllRoles();
+ allRoles = WorkflowFacade.getWorkflowFacade().getAllRolesExceptCasePerformer();
selectedModelParticipant=allRoles.isEmpty()?null:allRoles.get(0).getRole();
initAllParticipants();
initialize();
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/UserManagerDetailBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/UserManagerDetailBean.java
index f04a303..b43915a 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/UserManagerDetailBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/UserManagerDetailBean.java
@@ -353,7 +353,7 @@ public class UserManagerDetailBean extends UIComponentBean
{
try
{
- List <RoleItem> roles =facade.getAllRoles();
+ List <RoleItem> roles =facade.getAllRolesExceptCasePerformer();
List<Grant> grants = user.getUser().getAllGrants();
roles.retainAll(grants);
return roles;
@@ -372,7 +372,7 @@ public class UserManagerDetailBean extends UIComponentBean
{
try
{
- List<RoleItem> roles = facade.getAllRoles();
+ List<RoleItem> roles = facade.getAllRolesExceptCasePerformer();
List<Grant> grants = user.getUser().getAllGrants();
roles.removeAll(grants);
return roles;