summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-09-18 05:24:01 (EDT)
committerStephan Born2013-09-18 05:24:01 (EDT)
commit8c782a84ae2c1c774552645e6312648590be1608 (patch)
tree3db2e511a6f451555faeffc621132e6e23620b57
parentf22dea120d2e3e0c1182de945a0250746e861548 (diff)
downloadorg.eclipse.stardust.ui.web-8c782a84ae2c1c774552645e6312648590be1608.zip
org.eclipse.stardust.ui.web-8c782a84ae2c1c774552645e6312648590be1608.tar.gz
org.eclipse.stardust.ui.web-8c782a84ae2c1c774552645e6312648590be1608.tar.bz2
Jira-ID: CRNT-30402
Added PortalErrorClass for ACTIVITY_ALREADY_ACTIVATED i.e error code CONC03102 Made changes to show Portal error message when above event exception occurs. git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@67355 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--portal-common/src/main/resources/bpm-portal-errors_en.properties2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalErrorClass.java3
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/EventHistoryItem.java9
3 files changed, 13 insertions, 1 deletions
diff --git a/portal-common/src/main/resources/bpm-portal-errors_en.properties b/portal-common/src/main/resources/bpm-portal-errors_en.properties
index c7dc336..6adb2b4 100644
--- a/portal-common/src/main/resources/bpm-portal-errors_en.properties
+++ b/portal-common/src/main/resources/bpm-portal-errors_en.properties
@@ -28,3 +28,5 @@ PP01005 = Unable to complete the current activity.
PP01006 = Failed invoking completion method.
PP01007 = No suitable application context found for method invocation.
PP01008 = Failed evaluating out data mapping.
+
+CONC03102 = Event Failed: Activity is activated.
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalErrorClass.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalErrorClass.java
index 9fae475..c09337f 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalErrorClass.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalErrorClass.java
@@ -27,6 +27,7 @@ public class PortalErrorClass extends ErrorCase
public final static PortalErrorClass UNKNOWN_ERROR_OCCURED_DURING_LOGIN = new PortalErrorClass("CWP01005");
public final static PortalErrorClass NO_DEPLOYED_MODEL = new PortalErrorClass("CWP01006");
public final static PortalErrorClass UNABLE_TO_DELEGATE_ACTIVITY_NOT_IN_WORKLIST = new PortalErrorClass("CWP01007");
+ public final static PortalErrorClass ACTIVITY_ALREADY_ACTIVATED = new PortalErrorClass("CONC03102");
private PortalErrorClass detailErrorClass;
@@ -82,6 +83,8 @@ public class PortalErrorClass extends ErrorCase
{"CWP01005", BpmPortalErrorMessages.getString("CWP01005")},
{"CWP01006", BpmPortalErrorMessages.getString("CWP01006")},
{"CWP01007", BpmPortalErrorMessages.getString("CWP01007")},
+ {"CONC03102", BpmPortalErrorMessages.getString("CONC03102")},
};
}
+
}
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/EventHistoryItem.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/EventHistoryItem.java
index 325aa63..2cd3e28 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/EventHistoryItem.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/EventHistoryItem.java
@@ -25,14 +25,15 @@ import org.eclipse.stardust.engine.api.runtime.HistoricalEventDescriptionDelegat
import org.eclipse.stardust.engine.api.runtime.HistoricalEventDescriptionStateChange;
import org.eclipse.stardust.engine.api.runtime.HistoricalEventType;
import org.eclipse.stardust.engine.api.runtime.User;
+import org.eclipse.stardust.ui.web.common.BpmPortalErrorMessages;
import org.eclipse.stardust.ui.web.viewscommon.common.Localizer;
import org.eclipse.stardust.ui.web.viewscommon.common.LocalizerKey;
import org.eclipse.stardust.ui.web.viewscommon.common.ModelHelper;
+import org.eclipse.stardust.ui.web.viewscommon.common.PortalErrorClass;
import org.eclipse.stardust.ui.web.viewscommon.messages.MessagesViewsCommonBean;
import org.eclipse.stardust.ui.web.viewscommon.utils.I18nUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.ModelUtils;
-
public class EventHistoryItem extends AbstractProcessHistoryTableEntry
{
/*
@@ -93,6 +94,12 @@ public class EventHistoryItem extends AbstractProcessHistoryTableEntry
type = EXCEPTION_TYPE;
name = Localizer.getString(LocalizerKey.PH_EXCEPTION_TYPE);
fullDetail = (String) event.getDetails();
+ if(StringUtils.isNotEmpty(fullDetail) && fullDetail.contains(PortalErrorClass.ACTIVITY_ALREADY_ACTIVATED.getId()))
+ {
+ fullDetail = BpmPortalErrorMessages.getString(PortalErrorClass.ACTIVITY_ALREADY_ACTIVATED.getId());
+ }
+
+
break;
case HistoricalEventType.EVENT_EXECUTION: