summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-10-18 09:47:47 (EDT)
committerManik Kishore2012-10-18 09:47:47 (EDT)
commit0ec33a87875df1e9b370fc0eb05dae97d7f6948c (patch)
tree1d24a70fe694255eab330902d74af11f4184f2c2
parent45fa537b660ca6dc1deb0ad81bcb904cddf4f2a0 (diff)
downloadorg.eclipse.stardust.ui.web-0ec33a87875df1e9b370fc0eb05dae97d7f6948c.zip
org.eclipse.stardust.ui.web-0ec33a87875df1e9b370fc0eb05dae97d7f6948c.tar.gz
org.eclipse.stardust.ui.web-0ec33a87875df1e9b370fc0eb05dae97d7f6948c.tar.bz2
CRNT-26678
1)Added code to check if symbol is retrieved from current Model. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60164 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js10
1 files changed, 6 insertions, 4 deletions
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 94a9b7f..c3c8364 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
@@ -550,7 +550,7 @@ define(
if (null != guid) {
for ( var i = 0; i < this.symbols.length; i++) {
- if (this.symbols[i].oid == guid) {
+ if (this.symbols[i].oid == guid && (this.symbols[i].diagram.modelId == this.modelId)) {
return this.symbols[i];
}
}
@@ -567,7 +567,7 @@ define(
if (null != guid) {
for ( var i = 0; i < this.symbols.length; i++) {
if (this.symbols[i].modelElement != null
- && this.symbols[i].modelElement.oid == guid) {
+ && this.symbols[i].modelElement.oid == guid && (this.symbols[i].diagram.modelId == this.modelId)) {
return this.symbols[i];
}
}
@@ -600,7 +600,8 @@ define(
if (null != guid) {
for ( var i = 0; i < this.connections.length; i++) {
- if (this.connections[i].oid == guid) {
+ if (this.connections[i].oid == guid
+ && (this.connections[i].diagram.modelId == this.modelId)) {
return this.connections[i];
}
}
@@ -616,7 +617,8 @@ define(
if (null != guid) {
for ( var i = 0; i < this.connections.length; i++) {
- if (this.connections[i].modelElement.oid == guid) {
+ if (this.connections[i].modelElement.oid == guid
+ && (this.connections[i].diagram.modelId == this.modelId)) {
return this.connections[i];
}
}