CRNT-26157

1)added check in ModelElementUnmarshaller.java  updateNodeSymbol() for x,y

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59114 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 33 insertions, 28 deletions

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 2372ea2..9663a45 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
@@ -592,38 +592,43 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
     */
    private void updateNodeSymbol(INodeSymbol nodeSymbol, JsonObject nodeSymbolJto)
    {
-      int x = extractInt(nodeSymbolJto, ModelerConstants.X_PROPERTY);
-      int y = extractInt(nodeSymbolJto, ModelerConstants.Y_PROPERTY);
-
-      // adjust coordinates from global to local
-      int laneOffsetX = 0;
-      int laneOffsetY = 0;
-      ISwimlaneSymbol container = (nodeSymbol.eContainer() instanceof ISwimlaneSymbol)
-            ? (ISwimlaneSymbol) nodeSymbol.eContainer()
-            : null;
-      while (null != container)
+      if (nodeSymbolJto.has(ModelerConstants.X_PROPERTY)
+            && nodeSymbolJto.has(ModelerConstants.Y_PROPERTY))
       {
-         laneOffsetX += container.getXPos();
-         laneOffsetY += container.getYPos();
-
-         // recurse
-         container = (container.eContainer() instanceof ISwimlaneSymbol)
-               ? (ISwimlaneSymbol) container.eContainer()
+         int x = extractInt(nodeSymbolJto, ModelerConstants.X_PROPERTY);
+         int y = extractInt(nodeSymbolJto, ModelerConstants.Y_PROPERTY);
+
+         // adjust coordinates from global to local
+         int laneOffsetX = 0;
+         int laneOffsetY = 0;
+         ISwimlaneSymbol container = (nodeSymbol.eContainer() instanceof ISwimlaneSymbol)
+               ? (ISwimlaneSymbol) nodeSymbol.eContainer()
                : null;
-      }
+         while (null != container)
+         {
+            laneOffsetX += container.getXPos();
+            laneOffsetY += container.getYPos();
 
-      nodeSymbol.setXPos(x - laneOffsetX);
-      nodeSymbol.setYPos(y - laneOffsetY);
+            // recurse
+            container = (container.eContainer() instanceof ISwimlaneSymbol)
+                  ? (ISwimlaneSymbol) container.eContainer()
+                  : null;
+         }
+
+         nodeSymbol.setXPos(x - laneOffsetX);
+         nodeSymbol.setYPos(y - laneOffsetY);
+
+         if (nodeSymbolJto.has(ModelerConstants.WIDTH_PROPERTY))
+         {
+            int width = extractInt(nodeSymbolJto, ModelerConstants.WIDTH_PROPERTY);
+            nodeSymbol.setWidth(width);
+         }
+         if (nodeSymbolJto.has(ModelerConstants.HEIGHT_PROPERTY))
+         {
+            int height = extractInt(nodeSymbolJto, ModelerConstants.HEIGHT_PROPERTY);
+            nodeSymbol.setHeight(height);
+         }
 
-      if (nodeSymbolJto.has(ModelerConstants.WIDTH_PROPERTY))
-      {
-         int width = extractInt(nodeSymbolJto, ModelerConstants.WIDTH_PROPERTY);
-         nodeSymbol.setWidth(width);
-      }
-      if (nodeSymbolJto.has(ModelerConstants.HEIGHT_PROPERTY))
-      {
-         int height = extractInt(nodeSymbolJto, ModelerConstants.HEIGHT_PROPERTY);
-         nodeSymbol.setHeight(height);
       }
    }