summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-14 02:43:43 (EDT)
committerManik Kishore2012-08-14 02:43:43 (EDT)
commitb8147e1fa3cbeae43d7e7fca5b88b41f84a93a2b (patch)
treee0f66e3cf5ac9e6b2bd36f7f9ad7c825460a55dc
parentf3b61b8fd7e3a5a050a5bb6301654c667e1ecdec (diff)
downloadorg.eclipse.stardust.ui.web-b8147e1fa3cbeae43d7e7fca5b88b41f84a93a2b.zip
org.eclipse.stardust.ui.web-b8147e1fa3cbeae43d7e7fca5b88b41f84a93a2b.tar.gz
org.eclipse.stardust.ui.web-b8147e1fa3cbeae43d7e7fca5b88b41f84a93a2b.tar.bz2
Jira-ID: CRNT-25692
1)Made changes in m_data.js submitCreation() to create Structured Data on DND of structured Type 2)Made change in m_dataSymbol.js createCreateCommand() to call command protocol. 3)Added ElementOID to toTransitionType transition Json. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58391 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java2
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js28
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js5
3 files changed, 10 insertions, 25 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
index acc0752..2c833e5 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
@@ -1018,6 +1018,8 @@ public abstract class ModelElementMarshaller
modelElementJson.addProperty(ModelerConstants.TYPE_PROPERTY,
ModelerConstants.CONTROL_FLOW_LITERAL);
modelElementJson.addProperty(ModelerConstants.ID_PROPERTY, transition.getId());
+ modelElementJson.addProperty(ModelerConstants.OID_PROPERTY,
+ transition.getElementOid());
if (transition.getCondition().equals("CONDITION"))
{
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js
index 8d86774..f60e139 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js
@@ -107,15 +107,6 @@ define([ "m_utils", "m_constants", "m_modelElement", "m_command", "m_commandsCon
/**
*
*/
- Data.prototype.createCreateCommand = function() {
- return m_command.createCreateCommand("/models/"
- + this.model.id + "/data", this
- .createTransferObject());
- };
-
- /**
- *
- */
Data.prototype.createUpdateCommand = function() {
return m_command.createUpdateCommand("/models/"
+ this.model.id + "/data/"
@@ -135,18 +126,13 @@ define([ "m_utils", "m_constants", "m_modelElement", "m_command", "m_commandsCon
*
*/
Data.prototype.submitCreation = function() {
- //Temp code to made service work
- return m_commandsController.submitCommand(this.createCreateCommand());
-
- // the below call is unable to set url for createCommand,
- // so commented for time being
- /*
- m_commandsController.submitImmediately(this.createCreateCommand(),
- {
- method : "onCreate",
- callbackScope : this
- });
- */
+ return m_commandsController.submitCommand(m_command
+ .createCreateStructuredDataCommand(model.id, model.id,
+ {
+ "name" : name,
+ "id" : id,
+ "structuredDataTypeFullId" : fullId
+ }));
};
/**
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 3780bac..8db1182 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
@@ -147,10 +147,7 @@ define(
*
*/
DataSymbol.prototype.createCreateCommand = function() {
- return m_command.createCreateCommand("/models/"
- + this.diagram.model.id + "/processes/"
- + this.diagram.process.id + "/dataSymbols", this
- .createTransferObject());
+ this.createAndSubmitCreateCommand();
};
/**