Jira-ID: CRNT-25577

Added adjustment in adjustGeometry in m_symbol.js
Made change in EventCommandHandler for endEvent creation.

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

3 files changed, 21 insertions, 4 deletions

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java
index 8b5acd5..4a7a2e5 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/EventCommandHandler.java
@@ -88,9 +88,10 @@ public class EventCommandHandler
             endEventSymbol.setElementOid(++maxOid);

 

             endEventSymbol.setXPos(extractInt(request, X_PROPERTY)

-                  - parentLaneSymbol.getXPos());

+                  - parentLaneSymbol.getXPos() - ModelerConstants.POOL_LANE_MARGIN);

             endEventSymbol.setYPos(extractInt(request, Y_PROPERTY)

-                  - parentLaneSymbol.getYPos());

+                  - parentLaneSymbol.getYPos() - ModelerConstants.POOL_LANE_MARGIN

+                  - ModelerConstants.POOL_SWIMLANE_TOP_BOX_HEIGHT);

             endEventSymbol.setWidth(extractInt(request, WIDTH_PROPERTY));

             endEventSymbol.setHeight(extractInt(request, HEIGHT_PROPERTY));

 

diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_constants.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_constants.js
index e1d1028..c571bbe 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_constants.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_constants.js
@@ -154,6 +154,8 @@ define(function() {
 		LANE_DEFAULT_WIDTH : 400,

 		LANE_DEFAULT_HEIGHT : 1000,

 		LANE_MIN_WIDTH : 80,

+		// Adjustment required on Symbols

+		POOL_LANE_MARGIN : 5,

 		

 		// Other graphics

 

diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
index 4e0015e..f33e755 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
@@ -917,7 +917,14 @@ define(
 

 							//this.diagram.submitUpdate();

 							var oldGeometry = {"x": this.dragStartX, "y" : this.dragStartY, "oid" : this.oid};

-							var newGeometry = {"x": this.x, "y" : this.y, "oid" : this.oid};

+							var newGeometry = {

+								"x" : this.x

+										- m_constants.POOL_LANE_MARGIN,

+								"y" : this.y

+										- m_constants.POOL_LANE_MARGIN

+										- m_constants.POOL_SWIMLANE_TOP_BOX_HEIGHT,

+								"oid" : this.oid

+							};

 							

 							var command = m_command.createMoveNodeSymbolCommand(this.diagram.model.id, this.oid, newGeometry);

 							m_commandsController.submitCommand(command);

@@ -930,7 +937,14 @@ define(
 								//this.submitUpdate();

 

 								var oldGeometry = {"x": this.dragStartX, "y" : this.dragStartY, "oid" : this.oid};

-								var newGeometry = {"x": this.x, "y" : this.y, "oid" : this.oid};

+								var newGeometry = {

+										"x" : this.x

+												- m_constants.POOL_LANE_MARGIN,

+										"y" : this.y

+												- m_constants.POOL_LANE_MARGIN

+												- m_constants.POOL_SWIMLANE_TOP_BOX_HEIGHT,

+										"oid" : this.oid

+									};

 

 								var command = m_command.createMoveNodeSymbolCommand(this.diagram.model.id, this.oid, newGeometry);

 								m_commandsController.submitCommand(command);