summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-10-05 09:21:42 (EDT)
committerManik Kishore2012-10-05 09:21:42 (EDT)
commita11c3038536913d499f0c4b3ac2e2e4dcfce5524 (patch)
tree0b8d8c5713714f55dd6e04c83a4e1003acc623d2
parenta4282420cc41bc9dc74498de0cf01fdff564e425 (diff)
downloadorg.eclipse.stardust.ui.web-a11c3038536913d499f0c4b3ac2e2e4dcfce5524.zip
org.eclipse.stardust.ui.web-a11c3038536913d499f0c4b3ac2e2e4dcfce5524.tar.gz
org.eclipse.stardust.ui.web-a11c3038536913d499f0c4b3ac2e2e4dcfce5524.tar.bz2
CRNT-26514
Commented the code to set targetAnchorPoint to NORTH when fromAnchorPoint is Activity and toAnchorPoint is GATEWAY git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59779 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java15
1 files changed, 8 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 20d7262..5f92579 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
@@ -1347,7 +1347,7 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
annotationSymbol.getWidth());
annotationSymbolJson.addProperty(ModelerConstants.HEIGHT_PROPERTY,
annotationSymbol.getHeight());
-
+
if (null != annotationSymbol.getText())
{
annotationSymbolJson.addProperty(ModelerConstants.CONTENT_PROPERTY,
@@ -1509,10 +1509,11 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
{
connectionJson.addProperty(ModelerConstants.TO_MODEL_ELEMENT_TYPE,
ModelerConstants.GATEWAY);
- connectionJson.remove(ModelerConstants.TO_ANCHOR_POINT_ORIENTATION_PROPERTY);
+ // TODO - Is this code required. Causes issue while changing anchor Point
+ /*connectionJson.remove(ModelerConstants.TO_ANCHOR_POINT_ORIENTATION_PROPERTY);
connectionJson.addProperty(
ModelerConstants.TO_ANCHOR_POINT_ORIENTATION_PROPERTY,
- ModelerConstants.NORTH_KEY);
+ ModelerConstants.NORTH_KEY);*/
}
else
{
@@ -1883,22 +1884,22 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
JsonObject typeDeclarationJson = new JsonObject();
structJson.add("typeDeclaration", typeDeclarationJson);
-
+
// TODO: external references
XpdlTypeType type = structType.getDataType();
-
+
if (null != type)
{
typeDeclarationJson.add("type", toXpdlTypeJson(type));
}
-
+
if (null != structType.getSchema())
{
JsonObject schemaJson = new JsonObject();
ModelService.loadSchemaInfo(schemaJson, structType.getSchema());
typeDeclarationJson.add("schema", schemaJson);
}
-
+
structJson.addProperty(ModelerConstants.TYPE_PROPERTY, ModelerConstants.TYPE_DECLARATION_PROPERTY);
return structJson;