summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-11-02 02:00:07 (EDT)
committerSven Rottstock2012-11-02 02:00:07 (EDT)
commit3259cb47c7507e8105d314b5921350d25a5f0c04 (patch)
tree16a808ce54c294439445a391d613b3c5173d1580
parent27d950170debb4a3aba9de50bb012e780b8764dc (diff)
downloadorg.eclipse.stardust.ui.web-3259cb47c7507e8105d314b5921350d25a5f0c04.zip
org.eclipse.stardust.ui.web-3259cb47c7507e8105d314b5921350d25a5f0c04.tar.gz
org.eclipse.stardust.ui.web-3259cb47c7507e8105d314b5921350d25a5f0c04.tar.bz2
CRNT-26836
Added temp fix for id generation in m_outline.js git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60518 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_outline.js90
1 files changed, 45 insertions, 45 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_outline.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_outline.js
index f65d2cc..758f1be 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_outline.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_outline.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
******************************************************************************/
@@ -1714,7 +1714,7 @@ define(
};
/**
- *
+ *
*/
function prepareInfoDialogPoupupData(msg, okText) {
return {
@@ -1732,7 +1732,7 @@ define(
}
/**
- *
+ *
*/
function prepareErrorDialogPoupupData(msg, okText) {
return {
@@ -1750,7 +1750,7 @@ define(
}
/**
- *
+ *
*/
function createModel() {
var count = 0;
@@ -1770,7 +1770,7 @@ define(
}
/**
- *
+ *
*/
function deleteModel(modelId) {
var model = m_model.findModel(modelId);
@@ -1779,7 +1779,7 @@ define(
}
/**
- *
+ *
*/
function getUniqueNameForElement(modelId, namePrefix) {
var suffix = 0;
@@ -1787,7 +1787,7 @@ define(
var id = m_utils.generateIDFromName(name);
var model = m_model.findModel(modelId);
if (model) {
- while (model.findModelElementById(id)) {
+ while (model.findModelElementById(id.toUpperCase())) {
var name = namePrefix + (++suffix);
var id = m_utils.generateIDFromName(name);
}
@@ -1797,7 +1797,7 @@ define(
}
/**
- *
+ *
*/
function createProcess(modelId) {
var name = getUniqueNameForElement(modelId, "Process ");
@@ -1812,7 +1812,7 @@ define(
}
/**
- *
+ *
*/
function deleteProcess(processId, modelUUID) {
var model = m_model.findModelByUuid(modelUUID);
@@ -1834,7 +1834,7 @@ define(
}
/**
- *
+ *
*/
function deleteParticipant(modelUUID, id) {
var model = m_model.findModelByUuid(modelUUID);
@@ -1846,7 +1846,7 @@ define(
}
/**
- *
+ *
*/
function deleteApplication(modelUUID, appId) {
var model = m_model.findModelByUuid(modelUUID);
@@ -1858,7 +1858,7 @@ define(
}
/**
- *
+ *
*/
function deleteData(modelUUID, id) {
var model = m_model.findModelByUuid(modelUUID);
@@ -1899,7 +1899,7 @@ define(
}
/**
- *
+ *
*/
function createPrimitiveData(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -1921,7 +1921,7 @@ define(
}
/**
- *
+ *
*/
function createDocumentData(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -1939,7 +1939,7 @@ define(
}
/**
- *
+ *
*/
function createStructuredData(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -1959,7 +1959,7 @@ define(
}
/**
- *
+ *
*/
function createRole(modelUUId, targetUUID) {
var model = m_model.findModelByUuid(modelUUId);
@@ -1978,7 +1978,7 @@ define(
}
/**
- *
+ *
*/
function createConditionalPerformer(modelUUId, targetUUID) {
var model = m_model.findModelByUuid(modelUUId);
@@ -1999,7 +1999,7 @@ define(
}
/**
- *
+ *
*/
function setAsManager(modelUUId, orgUUID, roleUUID) {
var model = m_model.findModelByUuid(modelUUId);
@@ -2015,7 +2015,7 @@ define(
}
/**
- *
+ *
*/
function createOrganization(modelUUId, targetUUID) {
var model = m_model.findModelByUuid(modelUUId);
@@ -2036,7 +2036,7 @@ define(
}
/**
- *
+ *
*/
function createWebServiceApplication(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -2053,7 +2053,7 @@ define(
}
/**
- *
+ *
*/
function createMessageTransformationApplication(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -2071,7 +2071,7 @@ define(
}
/**
- *
+ *
*/
function createCamelApplication(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -2087,7 +2087,7 @@ define(
}
/**
- *
+ *
*/
function createUiMashupApplication(modelUUId) {
var model = m_model.findModelByUuid(modelUUId);
@@ -2104,7 +2104,7 @@ define(
}
/**
- *
+ *
* @param modelId
* @returns
*/
@@ -2124,7 +2124,7 @@ define(
}
/**
- *
+ *
* @param modelId
* @param id
* @returns
@@ -2154,7 +2154,7 @@ define(
}
/**
- *
+ *
* @param modelId
* @param id
* @returns
@@ -2207,7 +2207,7 @@ define(
if (newViewManager != null) {
viewManager = newViewManager;
}
-
+
setupEventHandling();
outline = new Outline();
@@ -2222,18 +2222,18 @@ define(
};
/**
- *
+ *
*/
function Outline() {
/**
- *
+ *
*/
Outline.prototype.toString = function() {
return "Lightdust.Outline";
};
/**
- *
+ *
*/
Outline.prototype.initialize = function() {
// Register with Event Bus
@@ -2242,7 +2242,7 @@ define(
};
/**
- *
+ *
*/
Outline.prototype.openElementView = function(element, openView) {
if (isElementCreatedViaOutline || openView) {
@@ -2264,14 +2264,14 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.fireCloseViewCommand = function(uuid) {
viewManager.closeViewsForElement(uuid);
}
/**
- *
+ *
*/
Outline.prototype.processCommand = function(command) {
m_utils.debug("===> Outline Process Event");
@@ -2492,7 +2492,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.createModel = function(data) {
var outlineObj = this;
@@ -2563,7 +2563,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.deleteModel = function(transferObject) {
m_model.deleteModel(transferObject.id);
@@ -2572,7 +2572,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.deleteProcess = function(transferObject) {
jQuery("#outline").jstree("remove",
@@ -2583,7 +2583,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.deleteApplication = function(transferObject) {
jQuery("#outline").jstree("remove",
@@ -2594,7 +2594,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.deleteParticipant = function(transferObject) {
jQuery("#outline").jstree("remove",
@@ -2606,7 +2606,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.deleteTypeDeclaration = function(
transferObject) {
@@ -2620,7 +2620,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.deleteData = function(transferObject) {
jQuery("#outline").jstree("remove",
@@ -2631,7 +2631,7 @@ define(
}
/**
- *
+ *
*/
Outline.prototype.createProcess = function(transferObject) {
var model = m_model.findModel(transferObject.modelId);
@@ -2658,7 +2658,7 @@ define(
};
/**
- *
+ *
*/
Outline.prototype.createApplication = function(transferObject) {
var model = m_model.findModel(transferObject.modelId);
@@ -2684,7 +2684,7 @@ define(
};
/**
- *
+ *
*/
Outline.prototype.createData = function(transferObject) {
var model = m_model
@@ -2710,7 +2710,7 @@ define(
};
/**
- *
+ *
*/
Outline.prototype.createStructuredDataType = function(
transferObject) {
@@ -2737,7 +2737,7 @@ define(
};
/**
- *
+ *
*/
Outline.prototype.createParticipant = function(transferObject) {
var model = m_model