summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShrikant Gangal2012-10-23 07:23:24 -0400
committerStephan Born2012-10-23 07:23:24 -0400
commita593954439e86b2a010a03f44e017d2003a68ef1 (patch)
treea8d8e04f052063b5e6481eb152e1e9e756601ebe
parent08d1a274b268fa9f7b295f90bae5346b57ca9912 (diff)
downloadorg.eclipse.stardust.ui.web-a593954439e86b2a010a03f44e017d2003a68ef1.zip
org.eclipse.stardust.ui.web-a593954439e86b2a010a03f44e017d2003a68ef1.tar.gz
org.eclipse.stardust.ui.web-a593954439e86b2a010a03f44e017d2003a68ef1.tar.xz
Jira-ID: CRNT-26773
Data mapping can now be created. There are still issues with delete / modify of data mappings. These will be addressed later git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60241 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java6
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js4
2 files changed, 4 insertions, 6 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 91d06ce..8a5a3c1 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
@@ -415,9 +415,6 @@ public class ConnectionCommandHandler
DataType data = dataSymbol.getData();
ActivityType activity = activitySymbol.getActivity();
- boolean inDataMapping = extractBoolean(
- connectionJson.getAsJsonObject(ModelerConstants.MODEL_ELEMENT_PROPERTY),
- ModelerConstants.INPUT_DATA_MAPPING_PROPERTY);
DataMappingType dataMapping = AbstractElementBuilder.F_CWM.createDataMappingType();
DataMappingConnectionType dataMappingConnection = AbstractElementBuilder.F_CWM.createDataMappingConnectionType();
@@ -427,7 +424,8 @@ public class ConnectionCommandHandler
dataMapping.setName(data.getName());
dataMappingConnection.setElementOid(++maxOid);
- if (inDataMapping)
+ if (connectionJson.getAsJsonObject(ModelerConstants.MODEL_ELEMENT_PROPERTY).has(
+ ModelerConstants.INPUT_DATA_MAPPING_PROPERTY))
{
dataMapping.setDirection(DirectionType.get(DirectionType.IN));
}
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 5e6e776..141277c 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
@@ -154,7 +154,7 @@ define(
if (toolbarPalettes[n].contentHtmlUrl != null) {
var extension = toolbarPalettes[n];
var dummy = this;
-
+
jQuery(
"#diagramToolbarTable #paletteRow #"
+ toolbarPalettes[n].id + "EntryRow")
@@ -767,7 +767,7 @@ define(
|| obj.changes.added[i].type == m_constants.DATA_FLOW_CONNECTION
|| obj.changes.added[i].type == m_constants.CONTROL_FLOW
|| obj.changes.added[i].type == m_constants.DATA_FLOW) {
- var conn = this.findConnection(obj.changes.added[i]);
+ var conn = this.findConnection(obj.changes.added[i], command.modelId);
if (null != conn) {
conn.applyChanges(obj.changes.added[i]);
conn.refresh();