summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-20 03:01:15 (EDT)
committer Stephan Born2012-09-20 03:01:15 (EDT)
commitfafbed67a901c3736919eb429f0f016203fc0f48 (patch)
treed3aca36ddd64a60e2fb738a063586ec118a7e6be
parent40f35cfbf5d87dbbba01488119775b9ecc3d911f (diff)
downloadorg.eclipse.stardust.ui.web-fafbed67a901c3736919eb429f0f016203fc0f48.zip
org.eclipse.stardust.ui.web-fafbed67a901c3736919eb429f0f016203fc0f48.tar.gz
org.eclipse.stardust.ui.web-fafbed67a901c3736919eb429f0f016203fc0f48.tar.bz2
CRNT-26280
1)Added a check in globalMouseMove() for connections if symbol is swimlane, move should be allowed. 2)Added a validation for pool and swimlane in validateCreateConnection() AnchorPoint.symbol git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59382 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js5
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js8
2 files changed, 8 insertions, 5 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js
index 0158416..64da1b5 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js
@@ -1503,7 +1503,10 @@ define(
}
}
if (toAnchorPoint != null) {
- if (toAnchorPoint.symbol.type == m_constants.EVENT_SYMBOL) {
+ if (toAnchorPoint.symbol.type == m_constants.SWIMLANE_SYMBOL
+ || toAnchorPoint.symbol.type == m_constants.POOL_SYMBOL) {
+ return false;
+ }else if (toAnchorPoint.symbol.type == m_constants.EVENT_SYMBOL) {
// Check for IN connections on Start Event
if (toAnchorPoint.symbol.modelElement.eventType == m_constants.START_EVENT_TYPE) {
m_messageDisplay
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
index aef79d6..85dcf0b 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
@@ -1061,10 +1061,10 @@ define(
// TODO Can we guarantee that Raphael objects always
// get their events first
- if (this.currentConnection.toAnchorPoint.symbol == null) {
- /*m_utils
- .debug("this.currentConnection.toAnchorPoint.symbol == null");*/
-
+ if (this.currentConnection.toAnchorPoint.symbol == null
+ || (this.currentConnection.toAnchorPoint.symbol.type == m_constants.SWIMLANE_SYMBOL)) {
+ // when connection moves with toAnchorPoint.symbol as
+ // swimlane , move is allowed on connection
this.currentConnection.toAnchorPoint.moveTo(x
* this.zoomFactor, y * this.zoomFactor);
this.currentConnection.reroute();