summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2013-03-05 06:52:11 (EST)
committer Sven Rottstock2013-03-11 06:38:59 (EDT)
commit4be44207dea61ae47c8e4d6b47683b2783bd094b (patch)
treed0d341ba0a10203f047f3faea4d7aba34614f689
parent6717e54e63270d84fa0d5a3012a3cd1946476209 (diff)
downloadorg.eclipse.stardust.ui.web-4be44207dea61ae47c8e4d6b47683b2783bd094b.zip
org.eclipse.stardust.ui.web-4be44207dea61ae47c8e4d6b47683b2783bd094b.tar.gz
org.eclipse.stardust.ui.web-4be44207dea61ae47c8e4d6b47683b2783bd094b.tar.bz2
Jira-ID: CRNT-28220 Trigger 'participant' does not update after changing role participant
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@63491 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java24
1 files changed, 17 insertions, 7 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
index 4296f5e..bffad5e 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
@@ -22,6 +22,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import org.eclipse.stardust.common.StringUtils;
+import org.eclipse.stardust.common.error.ObjectNotFoundException;
import org.eclipse.stardust.engine.api.model.PredefinedConstants;
import org.eclipse.stardust.engine.core.struct.StructuredDataConstants;
import org.eclipse.stardust.model.xpdl.builder.common.EObjectUUIDMapper;
@@ -1481,13 +1482,22 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
}
}
- String participantFullID = getModelBuilderFacade().createFullId(
- model,
- getModelBuilderFacade().findParticipant(
- model,
- getModelBuilderFacade().getAttributeValue(
- getModelBuilderFacade().getAttribute(event,
- PredefinedConstants.MANUAL_TRIGGER_PARTICIPANT_ATT))));
+ String participantFullID = null;
+ try
+ {
+ participantFullID = getModelBuilderFacade().createFullId(
+ model,
+ getModelBuilderFacade().findParticipant(
+ model,
+ getModelBuilderFacade().getAttributeValue(
+ getModelBuilderFacade().getAttribute(event,
+ PredefinedConstants.MANUAL_TRIGGER_PARTICIPANT_ATT))));
+
+ }
+ catch (ObjectNotFoundException ex)
+ {
+ //No participant found - FULL ID stays null
+ }
eventJson.addProperty(ModelerConstants.PARTICIPANT_FULL_ID, participantFullID);