summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-28 06:55:53 (EDT)
committerManik Kishore2012-06-19 07:24:07 (EDT)
commita5b12943a836f5546821b18dfdaab6d4f24e3e4f (patch)
tree45e32efac85ab4f89af82ff3f613efae72759183
parentb332fd846f56d93bce96838ff272e597988b449d (diff)
downloadorg.eclipse.stardust.ui.web-a5b12943a836f5546821b18dfdaab6d4f24e3e4f.zip
org.eclipse.stardust.ui.web-a5b12943a836f5546821b18dfdaab6d4f24e3e4f.tar.gz
org.eclipse.stardust.ui.web-a5b12943a836f5546821b18dfdaab6d4f24e3e4f.tar.bz2
Jira-ID: CRNT-24338
Removed "Case Performer" role from "Pick from List" and "Search for Participant" modes in Delegation git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55019 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/CaseDelegateProvider.java6
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DefaultDelegatesProvider.java10
2 files changed, 12 insertions, 4 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/CaseDelegateProvider.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/CaseDelegateProvider.java
index cd2852e..8a13abf 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/CaseDelegateProvider.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/CaseDelegateProvider.java
@@ -16,6 +16,7 @@ import org.eclipse.stardust.engine.api.model.Organization;
import org.eclipse.stardust.engine.api.model.OrganizationInfo;
import org.eclipse.stardust.engine.api.model.Participant;
import org.eclipse.stardust.engine.api.model.ParticipantInfo;
+import org.eclipse.stardust.engine.api.model.PredefinedConstants;
import org.eclipse.stardust.engine.api.model.Role;
import org.eclipse.stardust.engine.api.model.RoleInfo;
import org.eclipse.stardust.engine.api.query.FilterOrTerm;
@@ -152,6 +153,11 @@ public class CaseDelegateProvider implements IDelegatesProvider, Serializable
for (DeployedModel model : activeModels)
{
+ if (PredefinedConstants.PREDEFINED_MODEL_ID.equals(model.getId()))
+ {
+ continue;
+ }
+
List<Participant> allParticipants = model.getAllParticipants();
for (Participant participant : allParticipants)
{
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DefaultDelegatesProvider.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DefaultDelegatesProvider.java
index 313b8f1..eff49f7 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DefaultDelegatesProvider.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DefaultDelegatesProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.stardust.common.CollectionUtils;
import org.eclipse.stardust.common.CompareHelper;
import org.eclipse.stardust.common.StringUtils;
import org.eclipse.stardust.engine.api.model.ConditionalPerformer;
-import org.eclipse.stardust.engine.api.model.Model;
import org.eclipse.stardust.engine.api.model.ModelParticipant;
import org.eclipse.stardust.engine.api.model.ModelParticipantInfo;
import org.eclipse.stardust.engine.api.model.Organization;
@@ -399,10 +398,13 @@ public class DefaultDelegatesProvider implements IDelegatesProvider, Serializabl
if (modelCache != null && models != null)
{
- Iterator<DeployedModel> modelIter = modelCache.getAllModels().iterator();
- while (modelIter.hasNext())
+ for (DeployedModel model : modelCache.getAllModels())
{
- Model model = modelIter.next();
+ if (PredefinedConstants.PREDEFINED_MODEL_ID.equals(model.getId()))
+ {
+ continue;
+ }
+
if (models.contains(new Integer(model.getModelOID())))
{
if (participants.isEmpty())