summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-10-18 03:42:36 (EDT)
committer Manik Kishore2012-10-18 03:42:36 (EDT)
commit382d4c133276024a5573bd4ae176ff921e4ffe9f (patch)
treec2f2e9e7f006e666e8ae41dc5719e8a1fcf37364
parentcae8ded920cf8aa8ae049a014ccf774fc5e8f508 (diff)
downloadorg.eclipse.stardust.ui.web-382d4c133276024a5573bd4ae176ff921e4ffe9f.zip
org.eclipse.stardust.ui.web-382d4c133276024a5573bd4ae176ff921e4ffe9f.tar.gz
org.eclipse.stardust.ui.web-382d4c133276024a5573bd4ae176ff921e4ffe9f.tar.bz2
CRNT-25651
Made changes in m_connection.js and m_dataSymbol.js for rename of inDataMapping -inputDataMapping, outDataMapping-outputDataMapping. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60137 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java16
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js28
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js4
3 files changed, 32 insertions, 16 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
index 471191e..86fb0c7 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
@@ -239,6 +239,22 @@ public class ConnectionCommandHandler
{
DataMappingConnectionType dataMappingConnection = getModelBuilderFacade().findDataMappingConnectionByModelOid(
processDefinition, connectionOid);
+ DataMappingType dataMapping = null;
+ for (DataMappingType dataMappingType : dataMappingConnection.getActivitySymbol()
+ .getActivity()
+ .getDataMapping())
+ {
+ if (dataMappingType.getData()
+ .getId()
+ .equals(dataMappingConnection.getDataSymbol().getData().getId()))
+ {
+ dataMapping = dataMappingType;
+ }
+ }
+ dataMappingConnection.getActivitySymbol()
+ .getActivity()
+ .getDataMapping()
+ .remove(dataMapping);
processDefinition.getDiagram()
.get(0)
.getPoolSymbols()
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 389e13c..f351ebd 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
@@ -385,11 +385,11 @@ define(
this.diagram.process, data, activity);
if (this.fromModelElementType == m_constants.DATA) {
- this.modelElement.inDataMapping = true;
- this.modelElement.outDataMapping = false;
+ this.modelElement.inputDataMapping = true;
+ this.modelElement.outputDataMapping = false;
} else {
- this.modelElement.inDataMapping = false;
- this.modelElement.outDataMapping = true;
+ this.modelElement.inputDataMapping = false;
+ this.modelElement.outputDataMapping = true;
}
this.propertiesPanel = m_dataFlowPropertiesPanel
@@ -449,16 +449,16 @@ define(
updateConnection = dataSymbol.connections[n];
// This will be the case always, just cross
// verification for IN-OUT mapping
- if ((updateConnection.modelElement.inDataMapping && this.modelElement.outDataMapping)
- || (updateConnection.modelElement.outDataMapping && this.modelElement.inDataMapping)) {
- updateConnection.modelElement.inDataMapping = true;
- updateConnection.modelElement.outDataMapping = true;
+ if ((updateConnection.modelElement.inputDataMapping && this.modelElement.outputDataMapping)
+ || (updateConnection.modelElement.outputDataMapping && this.modelElement.inputDataMapping)) {
+ updateConnection.modelElement.inputDataMapping = true;
+ updateConnection.modelElement.outputDataMapping = true;
var changes = {
modelElement : {
toAnchorPointOrientation : this.toAnchorPoint.orientation,
fromAnchorPointOrientation : this.fromAnchorPoint.orientation,
- inDataMapping : updateConnection.modelElement.inDataMapping,
- outDataMapping : updateConnection.modelElement.inDataMapping
+ inputDataMapping : updateConnection.modelElement.inputDataMapping,
+ outputDataMapping : updateConnection.modelElement.outputDataMapping
}
}
updateConnection.createUpdateCommand(changes);
@@ -818,13 +818,13 @@ define(
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) {
+ if (connTemp.modelElement.inputDataMapping
+ && connTemp.modelElement.outputDataMapping) {
connTemp.path.attr("arrow-start",
"block-wide-long");
connTemp.path.attr("arrow-end",
"block-wide-long");
- } else if (connTemp.modelElement.inDataMapping) {
+ } else if (connTemp.modelElement.inputDataMapping) {
// When dataFlow modified from properties panel
// the From,To anchor point symbols to not change
if (connTemp.fromAnchorPoint.symbol.type == m_constants.ACTIVITY_SYMBOL) {
@@ -837,7 +837,7 @@ define(
connTemp.path.attr("arrow-end",
"block-wide-long");
}
- } else if (connTemp.modelElement.outDataMapping) {
+ } else if (connTemp.modelElement.outputDataMapping) {
if (connTemp.fromAnchorPoint.symbol.type == m_constants.DATA_SYMBOL) {
connTemp.path.attr("arrow-start",
"block-wide-long");
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js
index 6161ea0..58c92bf 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js
@@ -319,8 +319,8 @@ define(
for ( var n in this.connections) {
var connection = this.connections[n];
if (null != connection.modelElement
- && connection.modelElement.inDataMapping
- && connection.modelElement.outDataMapping) {
+ && connection.modelElement.inputDataMapping
+ && connection.modelElement.outputDataMapping) {
if (connection.fromAnchorPoint.symbol.type == m_constants.ACTIVITY_SYMBOL) {
outMapping
.push(connection.fromAnchorPoint.symbol.oid);