summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-09-24 05:41:56 (EDT)
committerStephan Born2012-09-24 05:41:56 (EDT)
commit677b301309779db8679872b4d37187034a03fd6a (patch)
tree1b8eadb6a0862bc8119407eebb5c4e2112ec9d37
parent0104d428154754b678397f38ed922fefedd0d76a (diff)
downloadorg.eclipse.stardust.ui.web-677b301309779db8679872b4d37187034a03fd6a.zip
org.eclipse.stardust.ui.web-677b301309779db8679872b4d37187034a03fd6a.tar.gz
org.eclipse.stardust.ui.web-677b301309779db8679872b4d37187034a03fd6a.tar.bz2
CRNT-26101 Pepper: Cross Model: Issue's when application used for cross modelling. (Incorrect applicationFullID returned in JSON object)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59443 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java7
1 files changed, 4 insertions, 3 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 a633df4..37ae0bd 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
@@ -635,11 +635,12 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
else if ((activity.eContainer() != null && (!(activity.eContainer() instanceof ChangeDescription)))
&& activity.getApplication() != null)
{
+ ApplicationType application = activity.getApplication();
activityJson.addProperty(
ModelerConstants.APPLICATION_FULL_ID_PROPERTY,
getModelBuilderFacade().createFullId(
- ModelUtils.findContainingModel(activity),
- activity.getApplication()));
+ ModelUtils.findContainingModel(application),
+ application));
}
JsonObject accessPointsJson = new JsonObject();
@@ -1225,7 +1226,7 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
loadAttributes(application, applicationJson);
applicationJson.addProperty(ModelerConstants.INTERACTIVE_PROPERTY, application.isInteractive());
-
+
if (application.getType() != null)
{
applicationJson.addProperty(ModelerConstants.APPLICATION_TYPE_PROPERTY,