| author | Sidharth Singh | 2012-08-06 07:46:03 (EDT) |
|---|---|---|
| committer | Manik Kishore | 2012-08-07 05:02:35 (EDT) |
| commit | 4055e75ec21a472e33b46db7a5b7ff2aa2d9b2b5 (patch) (side-by-side diff) | |
| tree | 97652555ec004c94185b9658b885c5fce05ffcef | |
| parent | 3ad13643b8fb6b9e40bef6c1fd5ecd55e0b0f271 (diff) | |
| download | org.eclipse.stardust.ui.web-4055e75ec21a472e33b46db7a5b7ff2aa2d9b2b5.zip org.eclipse.stardust.ui.web-4055e75ec21a472e33b46db7a5b7ff2aa2d9b2b5.tar.gz org.eclipse.stardust.ui.web-4055e75ec21a472e33b46db7a5b7ff2aa2d9b2b5.tar.bz2 | |
Jira-ID: CRNT-25677
1)Made changes in toDataMappingConnectionType() in ModelElementMarshaller.java
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58190 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
| -rw-r--r-- | web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java | 36 |
1 files changed, 19 insertions, 17 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 128d744..e962058 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 @@ -911,30 +911,32 @@ public class ModelElementMarshaller dataFlowJson.addProperty(ModelerConstants.ID_PROPERTY, "" + dataMappingConnection.getElementOid()); ActivityType activity = dataMappingConnection.getActivitySymbol().getActivity(); + DataType data = dataMappingConnection.getDataSymbol().getData(); for (DataMappingType dataMapping : activity.getDataMapping()) { - if (dataMapping.getDirection() == DirectionType.IN_LITERAL) + // Update the dataFlowJson for currentData symbol + if (dataMapping.getData().getId() == data.getId()) { - dataFlowJson.addProperty(ModelerConstants.IN_DATA_MAPPING_PROPERTY, true); - dataFlowJson.addProperty(ModelerConstants.OUT_DATA_MAPPING_PROPERTY, false); - } - else if (dataMapping.getDirection() == DirectionType.OUT_LITERAL) - { - dataFlowJson.addProperty(ModelerConstants.IN_DATA_MAPPING_PROPERTY, false); - dataFlowJson.addProperty(ModelerConstants.OUT_DATA_MAPPING_PROPERTY, true); - } - else - { - dataFlowJson.addProperty(ModelerConstants.IN_DATA_MAPPING_PROPERTY, true); - dataFlowJson.addProperty(ModelerConstants.OUT_DATA_MAPPING_PROPERTY, true); + if (dataMapping.getDirection() == DirectionType.IN_LITERAL) + { + dataFlowJson.addProperty(ModelerConstants.IN_DATA_MAPPING_PROPERTY, true); + dataFlowJson.addProperty(ModelerConstants.OUT_DATA_MAPPING_PROPERTY, false); + } + else if (dataMapping.getDirection() == DirectionType.OUT_LITERAL) + { + dataFlowJson.addProperty(ModelerConstants.IN_DATA_MAPPING_PROPERTY, false); + dataFlowJson.addProperty(ModelerConstants.OUT_DATA_MAPPING_PROPERTY, true); + } + else + { + dataFlowJson.addProperty(ModelerConstants.IN_DATA_MAPPING_PROPERTY, true); + dataFlowJson.addProperty(ModelerConstants.OUT_DATA_MAPPING_PROPERTY, true); + } } - } dataFlowJson.addProperty(ModelerConstants.DATA_FULL_ID_PROPERTY, - MBFacade.createFullId( - ModelUtils.findContainingModel(dataMappingConnection.getDataSymbol() - .getData()), dataMappingConnection.getDataSymbol().getData())); + MBFacade.createFullId(ModelUtils.findContainingModel(data), data)); dataFlowJson.addProperty(ModelerConstants.ACTIVITY_ID_PROPERTY, activity.getId()); return connectionJson; } |