summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-20 03:25:54 (EDT)
committer Stephan Born2012-09-20 03:25:54 (EDT)
commitafe752ce4cbb37b9cf36dd6fb51f8a105ef2cb66 (patch)
tree3be1f98d35a7962e550fa4ce41519d2968345206
parentfafbed67a901c3736919eb429f0f016203fc0f48 (diff)
downloadorg.eclipse.stardust.ui.web-afe752ce4cbb37b9cf36dd6fb51f8a105ef2cb66.zip
org.eclipse.stardust.ui.web-afe752ce4cbb37b9cf36dd6fb51f8a105ef2cb66.tar.gz
org.eclipse.stardust.ui.web-afe752ce4cbb37b9cf36dd6fb51f8a105ef2cb66.tar.bz2
CRNT-26277
Made change to check for DataMappingId match with dataId in toDataMappingConnectionType() in ModelElementMarshaller.java Changed the above check in updateDataFlowConnection in ModelElementUnmarshaller.java. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59383 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java2
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java2
2 files changed, 2 insertions, 2 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 17c63ff..c94685c 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
@@ -1326,7 +1326,7 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
for (DataMappingType dataMapping : activity.getDataMapping())
{
// Update the dataFlowJson for currentData symbol
- if (dataMapping.getId().equals(data.getId()))
+ if (dataMapping.getData().getId().equals(data.getId()))
{
dataFlowJson = toDataMappingJson(dataMapping);
// TODO - Currently API always assumes connectionJson.getSourceNode will
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
index 3bba7c5..66b584f 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
@@ -458,7 +458,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
.getActivity()
.getDataMapping())
{
- if (dataMapping.getId().equals(
+ if (dataMapping.getData().getId().equals(
dataFlowConnection.getDataSymbol().getData().getId()))
{
updateDataMapping(dataFlowJson, dataMapping);