@openui5/sap.ui.layout 1.91.0 → 1.93.2

package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.MoveSimpleForm
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @experimental Since 1.34.0
 	 */
 	var MoveSimpleForm = {};
@@ -36,54 +36,74 @@ sap.ui.define([
 	MoveSimpleForm.CONTENT_AGGREGATION = "content";
 
 	function firstGroupWithoutTitle(oModifier, aStopToken, aContent) {
-		for (var i = 0; i < aContent.length; i++) {
-			var sType = oModifier.getControlType(aContent[i]);
-			if (aStopToken.indexOf(sType) === -1) {
-				if (oModifier.getVisible(aContent[i])) {
-					return true;
-				}
-			} else {
-				return false;
-			}
-		}
+		return aContent.reduce(function(oPreviousPromise, oContent){
+			return oPreviousPromise
+				.then(function(bReturnValue){
+					if (bReturnValue !== undefined) {
+						return bReturnValue;
+					}
+					var sType = oModifier.getControlType(oContent);
+					if (aStopToken.indexOf(sType) === -1) {
+						return Promise.resolve()
+							.then(oModifier.getVisible.bind(oModifier, oContent))
+							.then(function(bVisible){
+								return bVisible || undefined;
+							});
+					} else {
+						return false;
+					}
+				});
+		}, Promise.resolve());
 	}
 
 	function addTitleToFirstGroupIfNeeded(oChange, oModifier, aContent, oSimpleForm, mPropertyBag, aStopToken, oGroupSelector) {
-		if (firstGroupWithoutTitle(oModifier, aStopToken, aContent)) {
-			var oView = mPropertyBag.view;
-			var oAppComponent = mPropertyBag.appComponent;
-
-			var oTitle = oModifier.createControl("sap.ui.core.Title", oAppComponent, oView, oGroupSelector);
-			oModifier.setProperty(oTitle, "text", "");
-			oModifier.insertAggregation(oSimpleForm, "content", oTitle, 0, oView);
-
-			var oNewRevertData = oChange.getRevertData();
-			oNewRevertData.createdTitleSelector = mPropertyBag.modifier.getSelector(oTitle, mPropertyBag.appComponent);
-			oChange.setRevertData(oNewRevertData);
-		}
-
-		return oModifier.getAggregation(oSimpleForm, "content");
+		return firstGroupWithoutTitle(oModifier, aStopToken, aContent)
+			.then(function(bFirstGroupWithoutName){
+				if (bFirstGroupWithoutName) {
+					var oView = mPropertyBag.view;
+					var oAppComponent = mPropertyBag.appComponent;
+					var oTitle;
+					return Promise.resolve()
+						.then(oModifier.createControl.bind(oModifier, "sap.ui.core.Title", oAppComponent, oView, oGroupSelector))
+						.then(function(oCreatedTitle){
+							oTitle = oCreatedTitle;
+							oModifier.setProperty(oTitle, "text", "");
+							return oModifier.insertAggregation(oSimpleForm, "content", oTitle, 0, oView);
+						})
+						.then(function() {
+							var oNewRevertData = oChange.getRevertData();
+							oNewRevertData.createdTitleSelector = mPropertyBag.modifier.getSelector(oTitle, mPropertyBag.appComponent);
+							oChange.setRevertData(oNewRevertData);
+						});
+				}
+				return Promise.resolve();
+			})
+			.then(function(){
+				return oModifier.getAggregation(oSimpleForm, "content");
+			});
 	}
 
 	function mapGroupIndexToContentAggregationIndex(oModifier, aStopToken, aContent, iGroupIndex) {
 		var oResult;
 		var iCurrentGroupIndex = -1;
 
-		if (firstGroupWithoutTitle(oModifier, aStopToken, aContent)) {
-			iCurrentGroupIndex++;
-		}
-
-		for (var i = 0; i < aContent.length; i++) {
-			var sType = oModifier.getControlType(aContent[i]);
-			if (aStopToken.indexOf(sType) > -1) {
-				iCurrentGroupIndex++;
-				if (iCurrentGroupIndex === iGroupIndex) {
-					oResult = aContent[i];
-					break;
+		return firstGroupWithoutTitle(oModifier, aStopToken, aContent)
+			.then(function(bFirstGroupWithoutName){
+				if (bFirstGroupWithoutName) {
+					iCurrentGroupIndex++;
 				}
-			}
-		}
-		return aContent.indexOf(oResult);
+				for (var i = 0; i < aContent.length; i++) {
+					var sType = oModifier.getControlType(aContent[i]);
+					if (aStopToken.indexOf(sType) > -1) {
+						iCurrentGroupIndex++;
+						if (iCurrentGroupIndex === iGroupIndex) {
+							oResult = aContent[i];
+							break;
+						}
+					}
+				}
+				return aContent.indexOf(oResult);
+			});
 	}
 
 	function isTitleOrToolbar(aElements, iIndex, oModifier) {
@@ -209,10 +229,19 @@ sap.ui.define([
 	}
 
 	function removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView) {
-		oModifier.removeAllAggregation(oSimpleForm, MoveSimpleForm.CONTENT_AGGREGATION);
-		for (var i = 0; i < aContentClone.length; ++i) {
-			oModifier.insertAggregation(oSimpleForm, MoveSimpleForm.CONTENT_AGGREGATION, aContentClone[i], i, oView);
-		}
+		return Promise.resolve()
+			.then(oModifier.removeAllAggregation.bind(oModifier, oSimpleForm, MoveSimpleForm.CONTENT_AGGREGATION))
+			.then(function(){
+				return aContentClone.reduce(function(oPreviousPromise, oContentClone, iIndex) {
+					return oPreviousPromise
+						.then(oModifier.insertAggregation.bind(oModifier,
+							oSimpleForm,
+							MoveSimpleForm.CONTENT_AGGREGATION,
+							oContentClone,
+							iIndex,
+							oView));
+				}, Promise.resolve());
+			});
 	}
 
 	/**
@@ -226,103 +255,116 @@ sap.ui.define([
 	 * @param {object} mPropertyBag
 	 *          Map containing the control modifier object (either sap.ui.core.util.reflection.JsControlTreeModifier or
 	 *          sap.ui.core.util.reflection.XmlTreeModifier), the view object where the controls are embedded and the application component
-	 * @returns {boolean} true - if change could be applied
+	 * @returns {Promise} Promise resolving when change is applied successfully
 	 * @public
 	 */
 	MoveSimpleForm.applyChange = function(oChange, oSimpleForm, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
 		var oView = mPropertyBag.view;
 		var oAppComponent = mPropertyBag.appComponent;
-		var oTargetGroup, aContentClone;
+		var oTargetGroup;
+		var aContentClone;
+		var iMovedGroupIndex;
 
 		var oContent = oChange.getContent();
 		var mMovedElement = oContent.movedElements[0];
-		var aContent = oModifier.getAggregation(oSimpleForm, MoveSimpleForm.CONTENT_AGGREGATION);
-
-		var aContentSelectors = aContent.map(function(oContentControl) {
-			return oModifier.getSelector(oContentControl, oAppComponent);
-		});
-		var mState = {content: aContentSelectors};
-		oChange.setRevertData(mState);
-
-		if (oChange.getChangeType() === MoveSimpleForm.CHANGE_TYPE_MOVE_FIELD) {
-			// !important: element was used in 1.40, do not remove for compatibility!
-			var oSourceField = oModifier.bySelector(mMovedElement.elementSelector || mMovedElement.element, oAppComponent, oView);
-			var iSourceFieldIndex = aContent.indexOf(oSourceField);
-			var iSourceFieldLength = getFieldLength(oModifier, aContent, iSourceFieldIndex);
-
-			// Compute the fields target index
-			// !important: groupId was used in 1.40, do not remove for compatibility!
-			oTargetGroup = oModifier.bySelector(mMovedElement.target.groupSelector || mMovedElement.target.groupId, oAppComponent, oView);
-			var iTargetGroupIndex = aContent.indexOf(oTargetGroup);
-			// !important: groupId was used in 1.40, do not remove for compatibility!
-			var oSourceGroup = oModifier.bySelector(mMovedElement.source.groupSelector || mMovedElement.source.groupId, oAppComponent, oView);
-			var iSourceGroupIndex = aContent.indexOf(oSourceGroup);
-
-			var iTargetFieldIndex = mapFieldIndexToContentAggregationIndex(oModifier, aContent, iTargetGroupIndex,
-					mMovedElement.target.fieldIndex, (iSourceGroupIndex === iTargetGroupIndex)
-							&& (mMovedElement.source.fieldIndex < mMovedElement.target.fieldIndex));
-			var iTargetFieldLength = getFieldLength(oModifier, aContent, iTargetFieldIndex);
-
-			aContentClone = aContent.slice();
-			var aFieldElements = aContentClone.slice(iSourceFieldIndex, iSourceFieldIndex + iSourceFieldLength);
-
-			var aSegmentBeforeSource, aSegmentBeforeTarget, aSegmentBetweenSourceAndTarget, aSegmentTillEnd;
-			if (iSourceFieldIndex < iTargetFieldIndex) {
-				aSegmentBeforeSource = aContentClone.slice(0, iSourceFieldIndex);
-				aSegmentBetweenSourceAndTarget = aContentClone.slice(iSourceFieldIndex + iSourceFieldLength, iTargetFieldIndex
-						+ iTargetFieldLength);
-				aSegmentTillEnd = aContentClone.slice(iTargetFieldIndex + iTargetFieldLength, aContentClone.length);
-				aContentClone = aSegmentBeforeSource.concat(aSegmentBetweenSourceAndTarget.concat(aFieldElements.concat(aSegmentTillEnd)));
-			} else if (iSourceFieldIndex > iTargetFieldIndex) {
-				aSegmentBeforeTarget = aContentClone.slice(0, iTargetFieldIndex + iTargetFieldLength);
-				aSegmentBetweenSourceAndTarget = aContentClone.slice(iTargetFieldIndex + iTargetFieldLength, iSourceFieldIndex);
-				aSegmentTillEnd = aContentClone.slice(iSourceFieldIndex + iSourceFieldLength, aContentClone.length);
-				aContentClone = aSegmentBeforeTarget.concat(aFieldElements.concat(aSegmentBetweenSourceAndTarget.concat(aSegmentTillEnd)));
-			}
-
-			if (iSourceFieldIndex != iTargetFieldIndex) {
-				removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView);
-			}
-
-		} else if (oChange.getChangeType() === MoveSimpleForm.CHANGE_TYPE_MOVE_GROUP) {
-
-			var aStopGroupToken = [MoveSimpleForm.sTypeTitle,
-									MoveSimpleForm.sTypeToolBar,
-									MoveSimpleForm.sTypeMTitle,
-									MoveSimpleForm.sTypeOverflowToolBar];
-			// !important: element was used in 1.40, do not remove for compatibility!
-			var oMovedGroup = oModifier.bySelector(mMovedElement.elementSelector || mMovedElement.element, oAppComponent, oView);
-
-			// If needed, insert a Title for the first group.
-			if (mMovedElement.target.groupIndex === 0 || !oMovedGroup) {
-				aContent = addTitleToFirstGroupIfNeeded(oChange, oModifier, aContent, oSimpleForm, mPropertyBag, aStopGroupToken, oContent.newControlId);
-			}
-
-			var iMovedGroupIndex = oMovedGroup ? aContent.indexOf(oMovedGroup) : 0;
-
-			var iTargetIndex = mapGroupIndexToContentAggregationIndex(oModifier, aStopGroupToken, aContent, mMovedElement.target.groupIndex);
-			oTargetGroup = aContent[iTargetIndex];
-			var iTargetLength = measureLengthOfSequenceUntilStopToken(oModifier, iTargetIndex, aContent, aStopGroupToken);
-
-			var iMovedLength = measureLengthOfSequenceUntilStopToken(oModifier, iMovedGroupIndex, aContent,
-					aStopGroupToken);
-			aContentClone = aContent.slice();
-			// Cut the moved group from the result array...
-			aContentClone.splice(iMovedGroupIndex, iMovedLength);
-
-			iTargetIndex = aContentClone.indexOf(oTargetGroup);
-
-			var iOffset = mMovedElement.source.groupIndex < mMovedElement.target.groupIndex ? iTargetLength : 0;
-			// and insert it at the target index
-			aContentClone = arrayRangeCopy(aContent, iMovedGroupIndex, aContentClone, iTargetIndex + iOffset, iMovedLength);
-
-			removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView);
-		} else {
-			Log.warning("Unknown change type detected. Cannot apply to SimpleForm");
-		}
-
-		return true;
+		return Promise.resolve()
+			.then(function(){
+				return oModifier.getAggregation(oSimpleForm, MoveSimpleForm.CONTENT_AGGREGATION);
+			})
+			.then(function(aContent){
+				var aContentSelectors = aContent.map(function(oContentControl) {
+					return oModifier.getSelector(oContentControl, oAppComponent);
+				});
+				var mState = {content: aContentSelectors};
+				oChange.setRevertData(mState);
+
+				if (oChange.getChangeType() === MoveSimpleForm.CHANGE_TYPE_MOVE_FIELD) {
+					// !important: element was used in 1.40, do not remove for compatibility!
+					var oSourceField = oModifier.bySelector(mMovedElement.elementSelector || mMovedElement.element, oAppComponent, oView);
+					var iSourceFieldIndex = aContent.indexOf(oSourceField);
+					var iSourceFieldLength = getFieldLength(oModifier, aContent, iSourceFieldIndex);
+
+					// Compute the fields target index
+					// !important: groupId was used in 1.40, do not remove for compatibility!
+					oTargetGroup = oModifier.bySelector(mMovedElement.target.groupSelector || mMovedElement.target.groupId, oAppComponent, oView);
+					var iTargetGroupIndex = aContent.indexOf(oTargetGroup);
+					// !important: groupId was used in 1.40, do not remove for compatibility!
+					var oSourceGroup = oModifier.bySelector(mMovedElement.source.groupSelector || mMovedElement.source.groupId, oAppComponent, oView);
+					var iSourceGroupIndex = aContent.indexOf(oSourceGroup);
+
+					var iTargetFieldIndex = mapFieldIndexToContentAggregationIndex(oModifier, aContent, iTargetGroupIndex,
+							mMovedElement.target.fieldIndex, (iSourceGroupIndex === iTargetGroupIndex)
+									&& (mMovedElement.source.fieldIndex < mMovedElement.target.fieldIndex));
+					var iTargetFieldLength = getFieldLength(oModifier, aContent, iTargetFieldIndex);
+
+					aContentClone = aContent.slice();
+					var aFieldElements = aContentClone.slice(iSourceFieldIndex, iSourceFieldIndex + iSourceFieldLength);
+
+					var aSegmentBeforeSource, aSegmentBeforeTarget, aSegmentBetweenSourceAndTarget, aSegmentTillEnd;
+					if (iSourceFieldIndex < iTargetFieldIndex) {
+						aSegmentBeforeSource = aContentClone.slice(0, iSourceFieldIndex);
+						aSegmentBetweenSourceAndTarget = aContentClone.slice(iSourceFieldIndex + iSourceFieldLength, iTargetFieldIndex
+								+ iTargetFieldLength);
+						aSegmentTillEnd = aContentClone.slice(iTargetFieldIndex + iTargetFieldLength, aContentClone.length);
+						aContentClone = aSegmentBeforeSource.concat(aSegmentBetweenSourceAndTarget.concat(aFieldElements.concat(aSegmentTillEnd)));
+					} else if (iSourceFieldIndex > iTargetFieldIndex) {
+						aSegmentBeforeTarget = aContentClone.slice(0, iTargetFieldIndex + iTargetFieldLength);
+						aSegmentBetweenSourceAndTarget = aContentClone.slice(iTargetFieldIndex + iTargetFieldLength, iSourceFieldIndex);
+						aSegmentTillEnd = aContentClone.slice(iSourceFieldIndex + iSourceFieldLength, aContentClone.length);
+						aContentClone = aSegmentBeforeTarget.concat(aFieldElements.concat(aSegmentBetweenSourceAndTarget.concat(aSegmentTillEnd)));
+					}
+
+					if (iSourceFieldIndex != iTargetFieldIndex) {
+						return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView);
+					}
+
+				} else if (oChange.getChangeType() === MoveSimpleForm.CHANGE_TYPE_MOVE_GROUP) {
+
+					var aStopGroupToken = [MoveSimpleForm.sTypeTitle,
+											MoveSimpleForm.sTypeToolBar,
+											MoveSimpleForm.sTypeMTitle,
+											MoveSimpleForm.sTypeOverflowToolBar];
+					// !important: element was used in 1.40, do not remove for compatibility!
+					var oMovedGroup = oModifier.bySelector(mMovedElement.elementSelector || mMovedElement.element, oAppComponent, oView);
+
+					return Promise.resolve()
+						.then(function(){
+							// If needed, insert a Title for the first group.
+							if (mMovedElement.target.groupIndex === 0 || !oMovedGroup) {
+								return addTitleToFirstGroupIfNeeded(oChange, oModifier, aContent, oSimpleForm, mPropertyBag, aStopGroupToken, oContent.newControlId)
+									.then(function(aContentReturn) {
+										aContent = aContentReturn;
+									});
+							}
+							return undefined;
+						})
+						.then(function(){
+							iMovedGroupIndex = oMovedGroup ? aContent.indexOf(oMovedGroup) : 0;
+							return mapGroupIndexToContentAggregationIndex(oModifier, aStopGroupToken, aContent, mMovedElement.target.groupIndex);
+						})
+						.then(function(iTargetIndex){
+							oTargetGroup = aContent[iTargetIndex];
+							var iTargetLength = measureLengthOfSequenceUntilStopToken(oModifier, iTargetIndex, aContent, aStopGroupToken);
+
+							var iMovedLength = measureLengthOfSequenceUntilStopToken(oModifier, iMovedGroupIndex, aContent,
+									aStopGroupToken);
+							aContentClone = aContent.slice();
+							// Cut the moved group from the result array...
+							aContentClone.splice(iMovedGroupIndex, iMovedLength);
+
+							iTargetIndex = aContentClone.indexOf(oTargetGroup);
+
+							var iOffset = mMovedElement.source.groupIndex < mMovedElement.target.groupIndex ? iTargetLength : 0;
+							// and insert it at the target index
+							aContentClone = arrayRangeCopy(aContent, iMovedGroupIndex, aContentClone, iTargetIndex + iOffset, iMovedLength);
+
+							return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView);
+						});
+				} else {
+					Log.warning("Unknown change type detected. Cannot apply to SimpleForm");
+				}
+			});
 	};
 
 	/**
@@ -392,7 +434,7 @@ sap.ui.define([
 		* @param {object} mPropertyBag
 		*          Map containing the control modifier object (either sap.ui.core.util.reflection.JsControlTreeModifier or
 		*          sap.ui.core.util.reflection.XmlTreeModifier), the view object where the controls are embedded and the application component
-		* @returns {boolean} true - if change could be reverted
+		* @returns {Promise} Promise resolving when change is succesfully reverted
 		* @public
 		*/
 	MoveSimpleForm.revertChange = function(oChange, oSimpleForm, mPropertyBag) {
@@ -405,17 +447,19 @@ sap.ui.define([
 		var aContent = aContentSelectors.map(function(oSelector) {
 			return oModifier.bySelector(oSelector, oAppComponent, oView);
 		});
-		removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContent, oView);
-		// destroy implicitly created title
-		var oCreatedTitleSelector = oRevertData.createdTitleSelector;
-		var oCreatedTitle = mPropertyBag.modifier.bySelector(oCreatedTitleSelector, mPropertyBag.appComponent);
-		if (oCreatedTitle) {
-			oCreatedTitle.destroy();
-		}
+		return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContent, oView)
+			.then(function(){
+				// destroy implicitly created title
+				var oCreatedTitleSelector = oRevertData.createdTitleSelector;
+				var oCreatedTitle = mPropertyBag.modifier.bySelector(oCreatedTitleSelector, mPropertyBag.appComponent);
+				if (oCreatedTitle) {
+					oCreatedTitle.destroy();
+				}
 
-		oChange.resetRevertData();
+				oChange.resetRevertData();
 
-		return true;
+				return true;
+			});
 	};
 
 	MoveSimpleForm.getChangeVisualizationInfo = function(oChange, oAppComponent) {

package/src/sap/ui/layout/changeHandler/RenameFormContainer.js

@@ -4,8 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/*global sap */
-
 sap.ui.define([
 	"sap/ui/fl/changeHandler/Base",
 	"sap/base/Log"
@@ -20,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameFormContainer
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @since 1.48
 	 * @private
 	 * @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -39,31 +37,40 @@ sap.ui.define([
 	 * @param {object} oControl The control which has been determined by the selector id
 	 * @param {object} mPropertyBag Map containing the control modifier object (either sap.ui.core.util.reflection.JsControlTreeModifier or
 	 *                                sap.ui.core.util.reflection.XmlTreeModifier), the view object where the controls are embedded and the application component
+	 * @returns {Promise} Promise resolving when change is applied successfully
 	 * @private
 	 */
 	RenameFormContainer.applyChange = function(oChangeWrapper, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier,
 			oChangeDefinition = oChangeWrapper.getDefinition(),
-			oRenamedElement = oChangeWrapper.getDependentControl(_CONSTANTS.TARGET_ALIAS, mPropertyBag),
-			oTitle = oModifier.getAggregation(oRenamedElement, "title");
-
-		if (oChangeDefinition.texts && oChangeDefinition.texts.formText && this._isProvided(oChangeDefinition.texts.formText.value)) {
-
-			var sValue = oChangeDefinition.texts.formText.value;
-
-			if (typeof oTitle === "string") {
-				oChangeWrapper.setRevertData(oModifier.getProperty(oRenamedElement, "title"));
-				oModifier.setProperty(oRenamedElement, "title", sValue);
-			} else {
-				oChangeWrapper.setRevertData(oModifier.getProperty(oTitle, "text"));
-				oModifier.setProperty(oTitle, "text", sValue);
-			}
-
-			return true;
-		} else {
-			Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
-			//however subsequent changes should be applied
-		}
+			oRenamedElement = oChangeWrapper.getDependentControl(_CONSTANTS.TARGET_ALIAS, mPropertyBag);
+
+		return Promise.resolve()
+			.then(function() {
+				return oModifier.getAggregation(oRenamedElement, "title");
+			})
+			.then(function(oTitle) {
+				if (oChangeDefinition.texts && oChangeDefinition.texts.formText && this._isProvided(oChangeDefinition.texts.formText.value)) {
+
+					var sValue = oChangeDefinition.texts.formText.value;
+					var oRevertDataPromise;
+					if (typeof oTitle === "string") {
+						oRevertDataPromise = Promise.resolve(oModifier.getProperty(oRenamedElement, "title")).then(function(sTitle) {
+							oChangeWrapper.setRevertData(sTitle);
+							oModifier.setProperty(oRenamedElement, "title", sValue);
+						});
+					} else {
+						oRevertDataPromise = Promise.resolve(oModifier.getProperty(oTitle, "text")).then(function(sText) {
+							oChangeWrapper.setRevertData(sText);
+							oModifier.setProperty(oTitle, "text", sValue);
+						});
+					}
+					return oRevertDataPromise;
+				} else {
+					Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
+					//however subsequent changes should be applied
+				}
+			}.bind(this));
 	};
 
 	/**
@@ -99,23 +106,26 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.modifier Modifier for the controls
 	 * @param {object} mPropertyBag.appComponent Component in which the change should be applied
 	 * @param {object} mPropertyBag.view Application view
-	 * @returns {boolean} True if successful
+	 * @returns {Promise} Promise resolving when change is successfully reverted
 	 * @public
 	 */
 	RenameFormContainer.revertChange = function(oChangeWrapper, oControl, mPropertyBag) {
 		var sOldText = oChangeWrapper.getRevertData(),
 			oModifier = mPropertyBag.modifier,
-			oRenamedElement = oChangeWrapper.getDependentControl(_CONSTANTS.TARGET_ALIAS, mPropertyBag),
-			oTitle = oModifier.getAggregation(oRenamedElement, "title");
-
-		if (typeof oTitle === "string") {
-			oModifier.setProperty(oRenamedElement, "title", sOldText);
-		} else {
-			oModifier.setProperty(oTitle, "text", sOldText);
-		}
-		oChangeWrapper.resetRevertData();
-
-		return true;
+			oRenamedElement = oChangeWrapper.getDependentControl(_CONSTANTS.TARGET_ALIAS, mPropertyBag);
+
+		return Promise.resolve()
+			.then(function() {
+				return oModifier.getAggregation(oRenamedElement, "title");
+			})
+			.then(function(oTitle) {
+				if (typeof oTitle === "string") {
+					oModifier.setProperty(oRenamedElement, "title", sOldText);
+				} else {
+					oModifier.setProperty(oTitle, "text", sOldText);
+				}
+				oChangeWrapper.resetRevertData();
+			});
 	};
 
 	RenameFormContainer._isProvided = function(sString){

package/src/sap/ui/layout/changeHandler/RenameSimpleForm.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameForm
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @since 1.40
 	 * @private
 	 * @experimental Since 1.40. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -36,6 +36,7 @@ sap.ui.define([
 	 * @param {object} oControl - the control which has been determined by the selector id
 	 * @param {object} mPropertyBag - map containing the control modifier object (either sap.ui.core.util.reflection.JsControlTreeModifier or
 	 *                                sap.ui.core.util.reflection.XmlTreeModifier), the view object where the controls are embedded and the application component
+	 * @returns {Promise} Promise resolving when change is successfully applied
 	 * @private
 	 */
 	RenameForm.applyChange = function(oChangeWrapper, oControl, mPropertyBag) {
@@ -51,17 +52,22 @@ sap.ui.define([
 
 		if (oChangeDefinition.texts && oChangeDefinition.texts.formText && this._isProvided(oChangeDefinition.texts.formText.value)) {
 			if (!oControl) {
-				throw new Error("no Control provided for renaming");
+				return Promise.reject(new Error("no Control provided for renaming"));
 			}
 
-			oChangeWrapper.setRevertData(oModifier.getProperty(oRenamedElement, "text"));
-			var sValue = oChangeDefinition.texts.formText.value;
-			oModifier.setProperty(oRenamedElement, "text", sValue);
-
-			return true;
+			return Promise.resolve()
+				.then(function() {
+					return oModifier.getProperty(oRenamedElement, "text");
+				})
+				.then(function(sProperty) {
+					oChangeWrapper.setRevertData(sProperty);
+					var sValue = oChangeDefinition.texts.formText.value;
+					oModifier.setProperty(oRenamedElement, "text", sValue);
+				});
 		} else {
 			Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
 			//however subsequent changes should be applied
+			return Promise.resolve();
 		}
 	};
 
@@ -72,7 +78,6 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl Control that matches the change selector for applying the change
 	 * @param {object} mPropertyBag property bag
 	 * @param {object} mPropertyBag.modifier modifier for the controls
-	 * @returns {boolean} true if successful
 	 * @public
 	 */
 	RenameForm.revertChange = function(oChangeWrapper, oControl, mPropertyBag) {
@@ -91,7 +96,6 @@ sap.ui.define([
 			// In some cases the SimpleForm does not properly update the value, so the invalidate call is required
 			oRenamedElement.getParent().invalidate();
 			oChangeWrapper.resetRevertData();
-			return true;
 		} else {
 			Log.error("Change doesn't contain sufficient information to be reverted. Most Likely the Change didn't go through applyChange.");
 		}