summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-06 06:48:51 (EDT)
committer Stephan Born2012-09-06 06:48:51 (EDT)
commit20f3d30b3ace8f1d2492ac90744c38ff3a7c6fd9 (patch)
tree0ad99171e79ee70487014794760cb74f777825d2
parent15e18d906248e3d8563f2840649f6ee7a27218e4 (diff)
downloadorg.eclipse.stardust.ui.web-20f3d30b3ace8f1d2492ac90744c38ff3a7c6fd9.zip
org.eclipse.stardust.ui.web-20f3d30b3ace8f1d2492ac90744c38ff3a7c6fd9.tar.gz
org.eclipse.stardust.ui.web-20f3d30b3ace8f1d2492ac90744c38ff3a7c6fd9.tar.bz2
CRNT-26070
1)Used DataMapping OID in toDataMappingConnectionType() for ModelElementMarshaller.java git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58959 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java11
1 files changed, 7 insertions, 4 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 1220640..19cc9d4 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
@@ -1,6 +1,7 @@
package org.eclipse.stardust.ui.web.modeler.marshaling;
import static org.eclipse.stardust.ui.web.modeler.marshaling.GsonUtils.extractString;
+import static org.eclipse.stardust.ui.web.modeler.marshaling.GsonUtils.extractInt;
import java.util.Iterator;
import java.util.List;
@@ -437,10 +438,12 @@ public abstract class ModelElementMarshaller
JsonObject connectionJson = toDataMappingConnectionType(dataMappingConnection);
if (connectionJson.has(ModelerConstants.MODEL_ELEMENT_PROPERTY))
{
- connectionsJson.add(
- extractString(
- connectionJson.getAsJsonObject(ModelerConstants.MODEL_ELEMENT_PROPERTY),
- ModelerConstants.ID_PROPERTY), connectionJson);
+ // ModelElement Id for dataFlow is DataId, which duplicates in case of
+ // IN-OUT mapping for data, using DATA MAPPING OID
+ connectionsJson.add(
+ extractInt(
+ connectionJson.getAsJsonObject(ModelerConstants.MODEL_ELEMENT_PROPERTY),
+ ModelerConstants.OID_PROPERTY).toString(), connectionJson);
}
}