summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-09 07:28:36 (EST)
committer Manik Kishore2012-06-19 07:20:21 (EDT)
commit5a7641328217b3905e4b07897a82ac4430e9cf0b (patch)
treecf39903cb03408439ff95bdbadff241e32a1788a
parent3be63b9ff5292482fcd1b547213e0f0b8b5b8066 (diff)
downloadorg.eclipse.stardust.ui.web-5a7641328217b3905e4b07897a82ac4430e9cf0b.zip
org.eclipse.stardust.ui.web-5a7641328217b3905e4b07897a82ac4430e9cf0b.tar.gz
org.eclipse.stardust.ui.web-5a7641328217b3905e4b07897a82ac4430e9cf0b.tar.bz2
Jira-ID: CRNT-24061
Change 'Active Processes' to 'Active Cases' in the Related ProcessSearch Message git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54435 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java20
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/dialogs/relatedProcessSearchTable.xhtml18
-rw-r--r--views-common/src/main/resources/views-common-messages.properties6
-rw-r--r--views-common/src/main/resources/views-common-messages_de.properties6
-rw-r--r--views-common/src/main/resources/views-common-messages_ja.properties6
-rw-r--r--views-common/src/main/resources/views-common-messages_zh_CN.properties6
6 files changed, 43 insertions, 19 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java
index ddefdd7..7486c5f 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java
@@ -77,6 +77,7 @@ public class RelatedProcessSearchHelper
private boolean searchCases;
private boolean isSourceCase;
private Map<Boolean, List<ProcessInstance>> resultCache;
+ private String messageHeader;
/**
@@ -103,6 +104,8 @@ public class RelatedProcessSearchHelper
createTable();
buildTable();
}
+
+
}
/**
@@ -537,5 +540,22 @@ public class RelatedProcessSearchHelper
{
this.searchCases = searchCase;
}
+
+ public String getMessageHeader()
+ {
+ if (!isSourceCase)
+ {
+ messageHeader = matchAny ? COMMON_MESSAGE_BEAN
+ .getString("views.joinProcessDialog.descriptorAnyMatchingCases.message") : COMMON_MESSAGE_BEAN
+ .getString("views.joinProcessDialog.descriptorAllMatchingCases.message");
+ }
+ else
+ {
+ messageHeader = matchAny ? COMMON_MESSAGE_BEAN
+ .getString("views.joinProcessDialog.descriptorAnyMatchingProcesses.message") : COMMON_MESSAGE_BEAN
+ .getString("views.joinProcessDialog.descriptorAllMatchingProcesses.message");
+ }
+ return messageHeader;
+ }
}
diff --git a/views-common/src/main/resources/META-INF/xhtml/dialogs/relatedProcessSearchTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/dialogs/relatedProcessSearchTable.xhtml
index 4e22efd..0203729 100644
--- a/views-common/src/main/resources/META-INF/xhtml/dialogs/relatedProcessSearchTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/dialogs/relatedProcessSearchTable.xhtml
@@ -20,30 +20,26 @@
<ice:panelGrid columns="2" style="text-align: right">
- <ice:panelGrid columns="2"
- rendered="#{not searchBean.relatedProcessSearchHelper.matchAny}">
+ <ice:panelGrid columns="2">
<ice:outputText style="font-weight: bold;"
- value="#{views_common_msgPropsBean['views.joinProcessDialog.descriptorAllMatching.message']}" />
- <ice:commandButton
+ value="#{searchBean.relatedProcessSearchHelper.messageHeader}" />
+
+ <ice:commandButton rendered="#{not searchBean.relatedProcessSearchHelper.matchAny}"
value="#{views_common_msgPropsBean['views.joinProcessDialog.descriptorMatchAny.button.label']}"
action="#{searchBean.toggleMatch}" styleClass="button" immediate="true"
style="margin-left:10px;">
<pc:automationTag value="auto-COM-JoinProcDlg-MatchAll" standAlone="false"/>
</ice:commandButton>
- </ice:panelGrid>
-
- <ice:panelGrid columns="2"
- rendered="#{searchBean.relatedProcessSearchHelper.matchAny}">
- <ice:outputText style="font-weight: bold;"
- value="#{views_common_msgPropsBean['views.joinProcessDialog.descriptorAnyMatching.message']}" />
+
<ice:commandButton
rendered="#{searchBean.relatedProcessSearchHelper.matchAny}"
value="#{views_common_msgPropsBean['views.joinProcessDialog.descriptorMatchAll.button.label']}"
action="#{searchBean.toggleMatch}" styleClass="button" immediate="true"
style="margin-left:10px;" >
<pc:automationTag value="auto-COM-JoinProcDlg-MatchAny" standAlone="false"/>
- </ice:commandButton>
+ </ice:commandButton>
</ice:panelGrid>
+
</ice:panelGrid>
diff --git a/views-common/src/main/resources/views-common-messages.properties b/views-common/src/main/resources/views-common-messages.properties
index 35d86e8..f328efe 100644
--- a/views-common/src/main/resources/views-common-messages.properties
+++ b/views-common/src/main/resources/views-common-messages.properties
@@ -1368,8 +1368,10 @@ views.relatedProcessSearch.table.column.caseOwner=Case Owner
views.joinProcessDialog.title=Abort {0} and Join
views.joinProcessAdvanced.title=Abort {0} and Join Advanced
views.joinProcessAdvanced.advanced.link.label=Advanced
-views.joinProcessDialog.descriptorAllMatching.message=Active Processes Matching All Key Descriptors
-views.joinProcessDialog.descriptorAnyMatching.message=Active Processes Matching Any Key Descriptors
+views.joinProcessDialog.descriptorAllMatchingProcesses.message=Active Processes Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingProcesses.message=Active Processes Matching Any Key Descriptors
+views.joinProcessDialog.descriptorAllMatchingCases.message=Active Cases Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingCases.message=Active Cases Matching Any Key Descriptors
views.joinProcessDialog.descriptorMatchAny.button.label=Match Any
views.joinProcessDialog.descriptorMatchAll.button.label=Match All
views.joinProcessDialog.abortAndJoin.button.label=Abort & Join
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 efa4111..ba62173 100644
--- a/views-common/src/main/resources/views-common-messages_de.properties
+++ b/views-common/src/main/resources/views-common-messages_de.properties
@@ -1364,8 +1364,10 @@ views.relatedProcessSearch.table.column.caseOwner=+Case Owner
views.joinProcessDialog.title=+Abort {0} and Join
views.joinProcessAdvanced.title=+Abort {0} and Join Advanced
views.joinProcessAdvanced.advanced.link.label=+Advanced
-views.joinProcessDialog.descriptorAllMatching.message=+Active Processes Matching All Key Descriptors
-views.joinProcessDialog.descriptorAnyMatching.message=+Active Processes Matching Any Key Descriptors
+views.joinProcessDialog.descriptorAllMatchingProcesses.message=+Active Processes Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingProcesses.message=+Active Processes Matching Any Key Descriptors
+views.joinProcessDialog.descriptorAllMatchingCases.message=+Active Cases Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingCases.message=+Active Cases Matching Any Key Descriptors
views.joinProcessDialog.descriptorMatchAny.button.label=+Match Any
views.joinProcessDialog.descriptorMatchAll.button.label=+Match All
views.joinProcessDialog.abortAndJoin.button.label=+Abort & Join
diff --git a/views-common/src/main/resources/views-common-messages_ja.properties b/views-common/src/main/resources/views-common-messages_ja.properties
index bc97207..b22a778 100644
--- a/views-common/src/main/resources/views-common-messages_ja.properties
+++ b/views-common/src/main/resources/views-common-messages_ja.properties
@@ -1365,8 +1365,10 @@ views.relatedProcessSearch.table.column.caseOwner = +Case Owner
views.joinProcessDialog.title = +Abort {0} and Join
views.joinProcessAdvanced.title = +Abort {0} and Join Advanced
views.joinProcessAdvanced.advanced.link.label = +Advanced
-views.joinProcessDialog.descriptorAllMatching.message = +Active Processes Matching All Key Descriptors
-views.joinProcessDialog.descriptorAnyMatching.message = +Active Processes Matching Any Key Descriptors
+views.joinProcessDialog.descriptorAllMatchingProcesses.message=+Active Processes Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingProcesses.message=+Active Processes Matching Any Key Descriptors
+views.joinProcessDialog.descriptorAllMatchingCases.message=+Active Cases Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingCases.message=+Active Cases Matching Any Key Descriptors
views.joinProcessDialog.descriptorMatchAny.button.label = +Match Any
views.joinProcessDialog.descriptorMatchAll.button.label = +Match All
views.joinProcessDialog.abortAndJoin.button.label = +Abort & Join
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 e4f43ad..fb2f8d1 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
@@ -1366,8 +1366,10 @@ views.relatedProcessSearch.table.column.caseOwner = \u6848\u4F8B\u6240\u6709\u4E
views.joinProcessDialog.title = \u4E2D\u6B62{0}\u548C\u52A0\u5165
views.joinProcessAdvanced.title = \u4E2D\u6B62{0}\u548C\u52A0\u5165\u9AD8\u7EA7
views.joinProcessAdvanced.advanced.link.label = \u9AD8\u7EA7
-views.joinProcessDialog.descriptorAllMatching.message = \u6D3B\u52A8\u8FDB\u7A0B\u7B26\u5408\u6240\u6709\u4E3B\u8981\u7684\u63CF\u8FF0\u7B26
-views.joinProcessDialog.descriptorAnyMatching.message = \u5339\u914D\u4EFB\u4F55\u4E3B\u8981\u63CF\u8FF0\u7B26\u7684\u6D3B\u52A8\u8FDB\u7A0B
+views.joinProcessDialog.descriptorAllMatchingProcesses.message=\u6D3B\u52A8\u8FDB\u7A0B\u7B26\u5408\u6240\u6709\u4E3B\u8981\u7684\u63CF\u8FF0\u7B26
+views.joinProcessDialog.descriptorAnyMatchingProcesses.message=\u5339\u914D\u4EFB\u4F55\u4E3B\u8981\u63CF\u8FF0\u7B26\u7684\u6D3B\u52A8\u8FDB\u7A0B
+views.joinProcessDialog.descriptorAllMatchingCases.message=+Active Cases Matching All Key Descriptors
+views.joinProcessDialog.descriptorAnyMatchingCases.message=+Active Cases Matching Any Key Descriptors
views.joinProcessDialog.descriptorMatchAny.button.label = \u5339\u914D\u4EFB\u4F55
views.joinProcessDialog.descriptorMatchAll.button.label = \u5339\u914D\u6240\u6709
views.joinProcessDialog.abortAndJoin.button.label = \u4E2D\u6B62\u548C\u52A0\u5165