summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-07-26 09:46:18 (EDT)
committer Manik Kishore2012-07-30 01:52:01 (EDT)
commit439ed894b4856def825db117ad5c1d1d95dfae0a (patch)
tree98696bbd502b7829f99d94e8c17556f7cdd583b8
parent5ac4c3fa9ba2c43503b96f09ce31c8b528302192 (diff)
downloadorg.eclipse.stardust.ui.web-439ed894b4856def825db117ad5c1d1d95dfae0a.zip
org.eclipse.stardust.ui.web-439ed894b4856def825db117ad5c1d1d95dfae0a.tar.gz
org.eclipse.stardust.ui.web-439ed894b4856def825db117ad5c1d1d95dfae0a.tar.bz2
Jira-ID: CRNT-25581
1)Made changes in processCommand for added[] array git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@57970 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js18
1 files changed, 14 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 500220c..e8ec794 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
@@ -540,12 +540,22 @@ define(
for ( var i = 0; i < obj.changes.added.length; i++) {
if (null != this.lastSymbol) {
if (null != this.lastSymbol.modelElement
- && null == this.lastSymbol.modelElement.oid) {
- this.lastSymbol.modelElement.oid = obj.changes.added[i].oid;
- } else {
+ && null != obj.changes.added[i].modelElement) {
+ this.lastSymbol.modelElement.oid = obj.changes.added[i].modelElement.oid;
this.lastSymbol.oid = obj.changes.added[i].oid;
+ } else {
+ // If current symbol is modelElement of an
+ // Symbol and already set, no need to set
+ // anything
+ if (null != this.lastSymbol.modelElement
+ && this.lastSymbol.modelElement.oid == obj.changes.added[i].oid) {
+ continue;
+ } else {
+ this.lastSymbol.oid = obj.changes.added[i].oid;
+ }
}
- } else if (null != obj.changes.added[i].modelElement) {
+ }// For connections lastSymbol will be empty
+ else if (null != obj.changes.added[i].modelElement) {
// for connections , search by connectionId to
// set OID
var conn = this