summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-07 08:05:45 (EDT)
committer Stephan Born2012-09-07 08:05:45 (EDT)
commit3df647a287a5fa14dbc97e603f95334dfe75f9a3 (patch)
treecbea052a672d9f91dd80470e99656d0f08e17b6b
parent39b774850c7cb3ffce927c0fabf36afb20b3baa6 (diff)
downloadorg.eclipse.stardust.ui.web-3df647a287a5fa14dbc97e603f95334dfe75f9a3.zip
org.eclipse.stardust.ui.web-3df647a287a5fa14dbc97e603f95334dfe75f9a3.tar.gz
org.eclipse.stardust.ui.web-3df647a287a5fa14dbc97e603f95334dfe75f9a3.tar.bz2
CRNT-26070
1)Made changes in refreshFromModelElement in m_connection.js to reset the dataFlow connections. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59014 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js71
1 files changed, 45 insertions, 26 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 8c8f5d2..5cb1e7b 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
@@ -746,36 +746,55 @@ define(
}
}
} else if (this.isDataFlow()) {
+
this.path.attr({
"stroke" : m_constants.DATA_FLOW_COLOR,
- "stroke-dasharray" : "-",
- "arrow-start" : "none",
- "arrow-end" : "none"
+ "stroke-dasharray" : "-"
});
- // For In-Mapping path will be from Data to Activity
- // vice-versa for Out mapping
- if (this.modelElement.inDataMapping
- && this.modelElement.outDataMapping) {
- this.path.attr("arrow-start", "block-wide-long");
- this.path.attr("arrow-end", "block-wide-long");
- } else if (this.modelElement.inDataMapping) {
- // When dataFlow modified from properties panel the
- // From,To anchor point symbols to not change
- if (this.fromAnchorPoint.symbol.type == m_constants.ACTIVITY_SYMBOL) {
- this.path.attr("arrow-start", "block-wide-long");
- this.path.attr("arrow-end", "none");
- } else {
- this.path.attr("arrow-start", "none");
- this.path.attr("arrow-end", "block-wide-long");
- }
- } else if (this.modelElement.outDataMapping) {
- if (this.fromAnchorPoint.symbol.type == m_constants.DATA_SYMBOL) {
- this.path.attr("arrow-start", "block-wide-long");
- this.path.attr("arrow-end", "none");
- } else {
- this.path.attr("arrow-start", "none");
- this.path.attr("arrow-end", "block-wide-long");
+ // Remove the Marker attr(marker-start,marker-end)-commonId for all connection
+ jQuery("path[stroke='" + m_constants.DATA_FLOW_COLOR + "']").removeAttr(
+ "marker-end").removeAttr("marker-start");
+
+ for ( var n in this.diagram.connections) {
+ if (this.diagram.connections[n].isDataFlow()) {
+ var connTemp = this.diagram.connections[n];
+ // For In-Mapping path will be from Data to Activity
+ // vice-versa for Out mapping
+ if (connTemp.modelElement.inDataMapping
+ && connTemp.modelElement.outDataMapping) {
+ connTemp.path.attr("arrow-start",
+ "block-wide-long");
+ connTemp.path.attr("arrow-end",
+ "block-wide-long");
+ } else if (connTemp.modelElement.inDataMapping) {
+ // When dataFlow modified from properties panel
+ // the From,To anchor point symbols to not change
+ if (connTemp.fromAnchorPoint.symbol.type == m_constants.ACTIVITY_SYMBOL) {
+ connTemp.path.attr("arrow-start",
+ "block-wide-long");
+ connTemp.path.attr("arrow-end", "none");
+ } else {
+ connTemp.path.attr("arrow-start",
+ "none");
+ connTemp.path.attr("arrow-end",
+ "block-wide-long");
+ }
+ } else if (connTemp.modelElement.outDataMapping) {
+ if (connTemp.fromAnchorPoint.symbol.type == m_constants.DATA_SYMBOL) {
+ connTemp.path.attr("arrow-start",
+ "block-wide-long");
+ connTemp.path.attr("arrow-end", "none");
+ } else {
+ connTemp.path.attr("arrow-start",
+ "none");
+ connTemp.path.attr("arrow-end",
+ "block-wide-long");
+ }
+ } else {
+ connTemp.path.attr("arrow-start", "none");
+ connTemp.path.attr("arrow-end", "none");
+ }
}
}
}