summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-27 04:27:31 (EDT)
committerStephan Born2012-08-27 04:27:31 (EDT)
commit21be69a48bc8ab0bafba37310a3c482719b0dca8 (patch)
treeda0166e40875bc5cdf7a39dc365755d3d1f73a3b
parente03d196de7e6da18f971e81ca833403579b9c41a (diff)
downloadorg.eclipse.stardust.ui.web-21be69a48bc8ab0bafba37310a3c482719b0dca8.zip
org.eclipse.stardust.ui.web-21be69a48bc8ab0bafba37310a3c482719b0dca8.tar.gz
org.eclipse.stardust.ui.web-21be69a48bc8ab0bafba37310a3c482719b0dca8.tar.bz2
CRNT-25842
1)Added code to find data using modelElement in m_dataPropertiesPanel.js setElement() git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58701 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_dataPropertiesPanel.js25
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_dataSymbol.js2
2 files changed, 18 insertions, 9 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataPropertiesPanel.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataPropertiesPanel.js
index 79ebb7f..bb81cfe 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataPropertiesPanel.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataPropertiesPanel.js
@@ -3,7 +3,7 @@
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors: SunGard CSA LLC - initial API and implementation and/or initial
* documentation
******************************************************************************/
@@ -29,7 +29,7 @@ define([ "m_utils", "m_constants", "m_commandsController", "m_command", "m_exten
};
/**
- *
+ *
*/
function DataPropertiesPanel(models) {
// Inheritance
@@ -58,14 +58,14 @@ define([ "m_utils", "m_constants", "m_commandsController", "m_command", "m_exten
});
/**
- *
+ *
*/
DataPropertiesPanel.prototype.toString = function() {
return "Lightdust.DataPropertiesPanel";
};
/**
- *
+ *
*/
DataPropertiesPanel.prototype.openView = function() {
m_utils.debug("Open View");
@@ -77,20 +77,27 @@ define([ "m_utils", "m_constants", "m_commandsController", "m_command", "m_exten
};
/**
- *
+ *
*/
DataPropertiesPanel.prototype.getElementUuid = function() {
return this.data.uuid;
};
/**
- *
+ *
*/
DataPropertiesPanel.prototype.setElement = function(element) {
this.clearErrorMessages();
this.element = element;
- this.data = m_model.findData(this.element.dataFullId);
+ // dataFullId doesn't get updated on rename, using
+ // modelElement.getFullId() to find data
+ if (this.element.modelElement != null) {
+ this.data = m_model.findData(this.element.modelElement
+ .getFullId());
+ } else {
+ this.data = m_model.findData(this.element.dataFullId);
+ }
if (this.element.properties == null) {
this.element.properties = {};
@@ -100,9 +107,9 @@ define([ "m_utils", "m_constants", "m_commandsController", "m_command", "m_exten
this.propertiesPages[n].setElement();
}
};
-
+
/**
- *
+ *
*/
DataPropertiesPanel.prototype.submitChanges = function(changes) {
m_utils.debug("Changes to be submitted for UUID " + this.getElementUuid() + ":");
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 3846059..6cb8290 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
@@ -26,6 +26,8 @@ define(
dataSymbol.dataId = "Data_" + index;
dataSymbol.dataName = "Data " + index;
+ // Data is not present at server side, using DataIndex and
+ // modelId to create dataId
dataSymbol.dataFullId = m_model.getFullId(diagram.model,
"Data" + index);
return dataSymbol;