summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-07 09:11:53 (EDT)
committerManik Kishore2012-08-07 09:11:53 (EDT)
commit3a5730c1431936c97c8b76896729542f14d0bc28 (patch)
tree2d12fd9b4592470e490bfd7733101435573e243f
parent790d9b5952c28bc9d73f950e259eb0cdd0041590 (diff)
downloadorg.eclipse.stardust.ui.web-3a5730c1431936c97c8b76896729542f14d0bc28.zip
org.eclipse.stardust.ui.web-3a5730c1431936c97c8b76896729542f14d0bc28.tar.gz
org.eclipse.stardust.ui.web-3a5730c1431936c97c8b76896729542f14d0bc28.tar.bz2
Jira-ID: CRNT-25577
1)Made changes in code to calcuate nearest anchor Point for connections git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58227 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js26
1 files changed, 15 insertions, 11 deletions
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 c3a7b10..31ffd9c 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
@@ -1030,15 +1030,17 @@ define(
* this.diagram.zoomFactor
- this.diagram.X_OFFSET, y
* this.diagram.zoomFactor
- - this.diagram.Y_OFFSET);
+ - this.diagram.Y_OFFSET + m_constants.POOL_SWIMLANE_TOP_BOX_HEIGHT);
anchorPoint.select();
-
- if (this.diagram.currentConnection.toAnchorPoint == anchorPoint) {
- return;
- } else if (this.diagram.currentConnection.isPrepared()) {
- this.diagram.currentConnection
- .setSecondAnchorPointNoComplete(anchorPoint);
+
+ if(null != this.diagram.currentConnection){
+ if (this.diagram.currentConnection.toAnchorPoint == anchorPoint) {
+ return;
+ } else if (this.diagram.currentConnection.isPrepared()) {
+ this.diagram.currentConnection
+ .setSecondAnchorPointNoComplete(anchorPoint);
+ }
}
}
};
@@ -1054,11 +1056,12 @@ define(
* this.diagram.zoomFactor
- this.diagram.X_OFFSET, y
* this.diagram.zoomFactor
- - this.diagram.Y_OFFSET);
+ - this.diagram.Y_OFFSET + m_constants.POOL_SWIMLANE_TOP_BOX_HEIGHT);
anchorPoint.select();
- if (this.diagram.currentConnection.isPrepared()) {
+ if (null != this.diagram.currentConnection
+ && this.diagram.currentConnection.isPrepared()) {
this.diagram.currentConnection
.setSecondAnchorPointNoComplete(anchorPoint);
}
@@ -1073,7 +1076,8 @@ define(
*/
Symbol.prototype.hoverOut = function() {
if (this.diagram.isInConnectionMode()) {
- if (this.diagram.currentConnection.isPrepared()) {
+ if (null != this.diagram.currentConnection
+ && this.diagram.currentConnection.isPrepared()) {
this.diagram.currentConnection
.setDummySecondAnchorPoint();
}
@@ -1108,7 +1112,7 @@ define(
* this.diagram.zoomFactor
- this.diagram.X_OFFSET, y
* this.diagram.zoomFactor
- - this.diagram.Y_OFFSET));
+ - this.diagram.Y_OFFSET + m_constants.POOL_SWIMLANE_TOP_BOX_HEIGHT));
this.hideAnchorPoints();
} else {
this.select();