| author | Sidharth Singh | 2012-05-04 01:53:00 (EDT) |
|---|---|---|
| committer | Manik Kishore | 2012-06-19 07:28:22 (EDT) |
| commit | 2fbac0f216cee62f340386b49fc5e5f6e6564a6b (patch) (side-by-side diff) | |
| tree | 753d4c3e2cc665d896702fe9534a48a3ffb64635 | |
| parent | 0fc036f868ebab86be24c0b42c46bc25febe72b7 (diff) | |
| download | org.eclipse.stardust.ui.web-2fbac0f216cee62f340386b49fc5e5f6e6564a6b.zip org.eclipse.stardust.ui.web-2fbac0f216cee62f340386b49fc5e5f6e6564a6b.tar.gz org.eclipse.stardust.ui.web-2fbac0f216cee62f340386b49fc5e5f6e6564a6b.tar.bz2 | |
Jira-ID: CRNT-24675
1)Made changes to getLinkType() in ProcessInstanceTableEntry.java to use PredefinedProcessInstanceLinkTypes.JOIN.getId()
2)Made change in ProcessTableHelper.java createUserObject() for displayLinkInfo to use the last element of ProcessInstanceLink list rather than first.
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@56053 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
2 files changed, 8 insertions, 8 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java index c2ce2ea..dc6e852 100644 --- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java +++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java @@ -441,25 +441,25 @@ public class ProcessInstanceTableEntry extends DefaultRowModel long sourceLinkOID = link.getSourceOID();
long targetLinkOID = link.getTargetOID();
// If processOID of current process is Sources for LinkedProcess,
- // then use the target Process linked information
+ // then use the source Process linked information
if (processInstance.getOID() == sourceLinkOID)
{
- if (PredefinedProcessInstanceLinkTypes.UPGRADE.equals(link.getLinkType().getId()))
+ if (PredefinedProcessInstanceLinkTypes.UPGRADE.getId().equals(link.getLinkType().getId()))
{
- linkType = MIGRATE_TO;
+ linkType = MIGRATE_FROM;
}
else
// If the link type is Join , set the To Process Link Type
- linkType = PredefinedProcessInstanceLinkTypes.JOIN.equals(link.getLinkType().getId()) ? JOIN_TO : SWITCH_TO;
+ linkType = PredefinedProcessInstanceLinkTypes.JOIN.getId().equals(link.getLinkType().getId()) ? JOIN_FROM : SWITCH_FROM;
}
else if (processInstance.getOID() == targetLinkOID)
{
- if (PredefinedProcessInstanceLinkTypes.UPGRADE.equals(link.getLinkType().getId()))
+ if (PredefinedProcessInstanceLinkTypes.UPGRADE.getId().equals(link.getLinkType().getId()))
{
- linkType = MIGRATE_FROM;
+ linkType = MIGRATE_TO;
}
else
- linkType = PredefinedProcessInstanceLinkTypes.JOIN.equals(link.getLinkType().getId()) ? JOIN_FROM : SWITCH_FROM;
+ linkType = PredefinedProcessInstanceLinkTypes.JOIN.getId().equals(link.getLinkType().getId()) ? JOIN_TO : SWITCH_TO;
}
return linkType;
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java index e61d91d..d335242 100644 --- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java +++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java @@ -1188,7 +1188,7 @@ public class ProcessTableHelper implements IUserObjectBuilder<ProcessInstanceTab if (CollectionUtils.isNotEmpty(linkedProcess))
{
- ProcessInstanceLink processInstanceLink = linkedProcess.get(0);
+ ProcessInstanceLink processInstanceLink = linkedProcess.get(linkedProcess.size()-1);
if (resultRow instanceof ProcessInstance)
{
tableEntry = new ProcessInstanceTableEntry(processInstance, processInstanceLink);
|