[jboss-svn-commits] JBL Code SVN: r35552 - labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2010-10-17 22:59:58 -0400 (Sun, 17 Oct 2010)
New Revision: 35552

Modified:
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/XmlBPMNProcessDumper.java
Log:
 - fixed issue where BPMNDI of composite node did not take parent location into account

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/XmlBPMNProcessDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/XmlBPMNProcessDumper.java	2010-10-18 00:58:50 UTC (rev 35551)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/XmlBPMNProcessDumper.java	2010-10-18 02:59:58 UTC (rev 35552)
@@ -487,6 +487,23 @@
     	        y = y + offsetY;
     	        height = 48;
     		}
+    		int parentOffsetX = 0;
+    		int parentOffsetY = 0;
+    		NodeContainer nodeContainer = node.getNodeContainer();
+    		while (nodeContainer instanceof CompositeNode) {
+    			CompositeNode parent = (CompositeNode) nodeContainer;
+    			Integer parentX = (Integer) parent.getMetaData().get("x");
+    			if (parentX != null) {
+    				parentOffsetX += parentX;
+    			}
+    			Integer parentY = (Integer) parent.getMetaData().get("y");
+    			if (parentY != null) {
+    				parentOffsetY += (Integer) parent.getMetaData().get("y");
+    			}
+    			nodeContainer = parent.getNodeContainer();
+    		}
+    		x += parentOffsetX;
+    		y += parentOffsetY;
 			xmlDump.append(
 				"      <bpmndi:BPMNShape bpmnElement=\"" + getUniqueNodeId(node) + "\" >" + EOL +
 				"        <dc:Bounds x=\"" + x + "\" " + "y=\"" + y + "\" " +