Jira-ID: CRNT-24255

1)Made changes to findLinked() method to add support for UPGRADE.
2)Made changes to getLinkType() in ProcessInstanceTableEntry.java to include support for MIGRATE_TO and MIGRATE_FROM link types.
3)Added views-common-messages.properties property of view.linkedProcess.label.migrate_to and view.linkedProcess.label.migrate_from

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55601 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

6 files changed, 24 insertions, 5 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 39d7b7d..c2ce2ea 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
@@ -435,6 +435,8 @@ public class ProcessInstanceTableEntry extends DefaultRowModel
       String SWITCH_TO = MessagesViewsCommonBean.getInstance().getString("view.linkedProcess.label.switch_to");

       String JOIN_FROM = MessagesViewsCommonBean.getInstance().getString("views.joinProcessDialog.label.join_from");

       String SWITCH_FROM = MessagesViewsCommonBean.getInstance().getString("view.linkedProcess.label.switch_from");

+      String MIGRATE_TO = MessagesViewsCommonBean.getInstance().getString("view.linkedProcess.label.migrate_to");

+      String MIGRATE_FROM = MessagesViewsCommonBean.getInstance().getString("view.linkedProcess.label.migrate_from");

 

       long sourceLinkOID = link.getSourceOID();

       long targetLinkOID = link.getTargetOID();

@@ -442,12 +444,22 @@ public class ProcessInstanceTableEntry extends DefaultRowModel
       // then use the target Process linked information

       if (processInstance.getOID() == sourceLinkOID)

       {

-         // If the link type is Join , set the To Process Link Type

-         linkType = PredefinedProcessInstanceLinkTypes.JOIN.equals(link.getLinkType().getId()) ? JOIN_TO : SWITCH_TO;

+         if (PredefinedProcessInstanceLinkTypes.UPGRADE.equals(link.getLinkType().getId()))

+         {

+            linkType = MIGRATE_TO;

+         }

+         else

+            // If the link type is Join , set the To Process Link Type

+            linkType = PredefinedProcessInstanceLinkTypes.JOIN.equals(link.getLinkType().getId()) ? JOIN_TO : SWITCH_TO;

       }

       else if (processInstance.getOID() == targetLinkOID)

       {

-         linkType = PredefinedProcessInstanceLinkTypes.JOIN.equals(link.getLinkType().getId()) ? JOIN_FROM : SWITCH_FROM;

+         if (PredefinedProcessInstanceLinkTypes.UPGRADE.equals(link.getLinkType().getId()))

+         {

+            linkType = MIGRATE_FROM;

+         }

+         else

+            linkType = PredefinedProcessInstanceLinkTypes.JOIN.equals(link.getLinkType().getId()) ? JOIN_FROM : SWITCH_FROM;

       }

       return linkType;

 

diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java
index fbce8e2..5608ab7 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java
@@ -902,7 +902,8 @@ public class ProcessInstanceDetailsBean extends PopupUIComponentBean
       public Query createQuery()

       {

          ProcessInstanceQuery query = ProcessInstanceQuery.findLinked(processInstanceOID, LinkDirection.TO_FROM,

-        		 PredefinedProcessInstanceLinkTypes.JOIN, PredefinedProcessInstanceLinkTypes.SWITCH);

+               PredefinedProcessInstanceLinkTypes.JOIN, PredefinedProcessInstanceLinkTypes.SWITCH,

+               PredefinedProcessInstanceLinkTypes.UPGRADE);

          ProcessInstanceDetailsPolicy processInstanceDetailsPolicy = new ProcessInstanceDetailsPolicy(

                ProcessInstanceDetailsLevel.Default);

          processInstanceDetailsPolicy.getOptions().add(ProcessInstanceDetailsOptions.WITH_LINK_INFO);

diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java
index 37169de..cff6a6e 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java
@@ -1140,7 +1140,7 @@ public class CaseDetailsBean extends PopupUIComponentBean
          String qualifiedGroupId = "{" + PredefinedConstants.PREDEFINED_MODEL_ID + "}"

          + PredefinedConstants.CASE_PROCESS_ID;

          ProcessInstanceQuery query = ProcessInstanceQuery.findLinked(processInstanceOID, LinkDirection.TO_FROM,

-        		 PredefinedProcessInstanceLinkTypes.JOIN);

+               PredefinedProcessInstanceLinkTypes.JOIN, PredefinedProcessInstanceLinkTypes.UPGRADE);

          ProcessInstanceDetailsPolicy processInstanceDetailsPolicy = new ProcessInstanceDetailsPolicy(

                ProcessInstanceDetailsLevel.Default);

          processInstanceDetailsPolicy.getOptions().add(ProcessInstanceDetailsOptions.WITH_LINK_INFO);

diff --git a/views-common/src/main/resources/views-common-messages.properties b/views-common/src/main/resources/views-common-messages.properties
index ae1e649..4aa8452 100644
--- a/views-common/src/main/resources/views-common-messages.properties
+++ b/views-common/src/main/resources/views-common-messages.properties
@@ -1315,6 +1315,8 @@ linkedProcessTable.table=Linked Processes
 linkedCasesTable.table=Linked Cases

 view.linkedProcess.label.switch_from=Switched From

 view.linkedProcess.label.switch_to=Switched To

+view.linkedProcess.label.migrate_to=Migrated To

+view.linkedProcess.label.migrate_from=Migrated From

 views.linkedProcess.processname={1} ({2}) 

 view.linkedProcess.label.norecord=No Linked Processes

 

diff --git a/views-common/src/main/resources/views-common-messages_de.properties b/views-common/src/main/resources/views-common-messages_de.properties
index 93da01d..2d501ff 100644
--- a/views-common/src/main/resources/views-common-messages_de.properties
+++ b/views-common/src/main/resources/views-common-messages_de.properties
@@ -1312,6 +1312,8 @@ linkedProcessTable.table=+Linked Processes
 linkedCasesTable.table=+Linked Cases

 view.linkedProcess.label.switch_from=+Switched From

 view.linkedProcess.label.switch_to=+Switched To

+view.linkedProcess.label.migrate_to=+Migrated To

+view.linkedProcess.label.migrate_from=+Migrated From

 views.linkedProcess.processname=+{1} ({2}) 

 view.linkedProcess.label.norecord=+No Linked Processes

 

diff --git a/views-common/src/main/resources/views-common-messages_zh_CN.properties b/views-common/src/main/resources/views-common-messages_zh_CN.properties
index 724b2dc..5bb59f5 100644
--- a/views-common/src/main/resources/views-common-messages_zh_CN.properties
+++ b/views-common/src/main/resources/views-common-messages_zh_CN.properties
@@ -1313,6 +1313,8 @@ linkedProcessTable.table = \u94FE\u63A5\u8FDB\u7A0B
 linkedCasesTable.table = \u76F8\u5173\u6848\u4F8B

 view.linkedProcess.label.switch_from = \u8F6C\u81EA

 view.linkedProcess.label.switch_to = \u5207\u6362\u5230

+view.linkedProcess.label.migrate_to=+Migrated To

+view.linkedProcess.label.migrate_from=+Migrated From

 views.linkedProcess.processname = {1}\uFF08{2}\uFF09

 view.linkedProcess.label.norecord = \u6CA1\u6709\u94FE\u63A5\u7684\u8FDB\u7A0B