| author | Sidharth Singh | 2012-07-24 05:47:05 (EDT) |
|---|---|---|
| committer | Manik Kishore | 2012-07-30 01:51:23 (EDT) |
| commit | a8a523115561579094eb43bcd08535b59fb65722 (patch) (side-by-side diff) | |
| tree | 288eddd34a582071318b113a925f477a3f726b17 | |
| parent | 72c91c52adb458d1907a72cff9ff1a2f0e91cbf1 (diff) | |
| download | org.eclipse.stardust.ui.web-a8a523115561579094eb43bcd08535b59fb65722.zip org.eclipse.stardust.ui.web-a8a523115561579094eb43bcd08535b59fb65722.tar.gz org.eclipse.stardust.ui.web-a8a523115561579094eb43bcd08535b59fb65722.tar.bz2 | |
Jira-ID: CRNT-25415
1)Moved the code to set symbol type from constructor to bind method in m_activitySymbol.js,m_swimlaneSymbol.js,m_gatewaySymbol.js,m_eventSymbol.js
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@57884 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
4 files changed, 9 insertions, 4 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js index f755717..5c5b448 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js @@ -75,7 +75,6 @@ define( m_utils.inheritFields(this, symbol);
m_utils.inheritMethods(ActivitySymbol.prototype, symbol);
- this.type = m_constants.ACTIVITY_SYMBOL;
this.x = 0;
this.y = 0;
this.width = m_constants.ACTIVITY_SYMBOL_DEFAULT_WIDTH;
@@ -87,12 +86,15 @@ define( * objects, diagram, base classes).
*/
ActivitySymbol.prototype.bind = function(diagram) {
+ this.type = m_constants.ACTIVITY_SYMBOL;
+
this.diagram = diagram;
this.diagram.lastSymbol = this;
this.propertiesPanel = m_activityPropertiesPanel
.getInstance();
+
this.rectangle = null;
this.text = null;
this.icon = null;
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_eventSymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_eventSymbol.js index 83fe93e..ff571ef 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_eventSymbol.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_eventSymbol.js @@ -58,7 +58,6 @@ define( m_utils.inheritFields(this, symbol);
m_utils.inheritMethods(EventSymbol.prototype, symbol);
- this.type = m_constants.EVENT_SYMBOL;
this.width = 2 * m_constants.EVENT_DEFAULT_RADIUS;
this.height = 2 * m_constants.EVENT_DEFAULT_RADIUS;
@@ -66,6 +65,8 @@ define( * Binds all client-side aspects to the object (graphics objects, diagram, base classes).
*/
EventSymbol.prototype.bind = function(diagram) {
+ this.type = m_constants.EVENT_SYMBOL;
+
this.diagram = diagram;
this.diagram.lastSymbol = this;
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_gatewaySymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_gatewaySymbol.js index 1014163..f653881 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_gatewaySymbol.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_gatewaySymbol.js @@ -47,7 +47,6 @@ define( m_utils.inheritFields(this, symbol);
m_utils.inheritMethods(GatewaySymbol.prototype, symbol);
- this.type = m_constants.GATEWAY_SYMBOL;
this.width = m_constants.GATEWAY_SYMBOL_DEFAULT_WIDTH;
this.height = m_constants.GATEWAY_SYMBOL_DEFAULT_HEIGHT;
@@ -56,6 +55,8 @@ define( * objects, diagram, base classes).
*/
GatewaySymbol.prototype.bind = function(diagram) {
+ this.type = m_constants.GATEWAY_SYMBOL;
+
this.diagram = diagram;
this.diagram.lastSymbol = this;
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js index 4a78f13..c6c7c51 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js @@ -59,7 +59,6 @@ define( m_utils.inheritFields(this, symbol);
m_utils.inheritMethods(SwimlaneSymbol.prototype, symbol);
- this.type = m_constants.SWIMLANE_SYMBOL;
this.width = 0;
this.height = 0;
this.id = "DefaultLane";
@@ -77,6 +76,8 @@ define( * objects, diagram, base classes).
*/
SwimlaneSymbol.prototype.bind = function(diagram, parentSymbol) {
+ this.type = m_constants.SWIMLANE_SYMBOL;
+
this.diagram = diagram;
this.orientation = diagram.flowOrientation;
this.parentSymbol = parentSymbol;
|