@openui5/sap.ui.layout 1.103.1 → 1.106.0

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

@@ -6,14 +6,10 @@
 
 sap.ui.define([
 	"sap/ui/fl/changeHandler/Base",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/base/Log",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/core/util/reflection/JsControlTreeModifier"
 ], function(
 	Base,
-	JsControlTreeModifier,
-	Log,
-	jQuery
+	JsControlTreeModifier
 ) {
 	"use strict";
 
@@ -21,7 +17,7 @@ sap.ui.define([
 		* Change handler for adding a form group.
 		* @alias sap.ui.layout.changeHandler.AddFormContainer
 		* @author SAP SE
-		* @version 1.103.1
+		* @version 1.106.0
 		* @experimental Since 1.48.0
 		*/
 	var AddGroup = { };
@@ -42,18 +38,21 @@ sap.ui.define([
 		var oModifier = mPropertyBag.modifier;
 		var oAppComponent = mPropertyBag.appComponent;
 		var oView = mPropertyBag.view;
-		var oChangeDefinition = oChange.getDefinition();
+		var oContent = oChange.getContent();
+		var oTexts = oChange.getTexts();
 
-		if (oChangeDefinition.texts
-			&& oChangeDefinition.texts.groupLabel
-			&& oChangeDefinition.texts.groupLabel.value
-			&& oChangeDefinition.content
-			&& oChangeDefinition.content.group
-			&& (oChangeDefinition.content.group.selector || oChangeDefinition.content.group.id)) {
-			var sTitleText = oChangeDefinition.texts.groupLabel.value;
-			var iInsertIndex = oChangeDefinition.content.group.index;
-			var mNewGroupSelector = oChangeDefinition.content.group.selector || { id : oChangeDefinition.content.group.id };
-			var mNewTitleSelector = jQuery.extend({}, mNewGroupSelector);
+		if (
+			oTexts
+			&& oTexts.groupLabel
+			&& oTexts.groupLabel.value
+			&& oContent
+			&& oContent.group
+			&& (oContent.group.selector || oContent.group.id)
+		) {
+			var sTitleText = oTexts.groupLabel.value;
+			var iInsertIndex = oContent.group.index;
+			var mNewGroupSelector = oContent.group.selector || { id : oContent.group.id };
+			var mNewTitleSelector = Object.assign({}, mNewGroupSelector);
 
 			mNewTitleSelector.id = mNewTitleSelector.id + "--title"; //same as FormRenderer does it
 			oChange.setRevertData({newGroupSelector: mNewGroupSelector});
@@ -81,12 +80,6 @@ sap.ui.define([
 						.then(oModifier.insertAggregation.bind(oModifier, oForm, "formContainers", oGroup, iInsertIndex, oView));
 				});
 		} 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();
 		}
 	};
@@ -103,32 +96,29 @@ sap.ui.define([
 	 * @public
 	 */
 	AddGroup.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {
-		var oChangeDefinition = oChange.getDefinition();
 		var	oAppComponent = mPropertyBag.appComponent;
 
 		if (oSpecificChangeInfo.newLabel) {
-			Base.setTextInChange(oChangeDefinition, "groupLabel", oSpecificChangeInfo.newLabel, "XFLD");
+			oChange.setText("groupLabel", oSpecificChangeInfo.newLabel, "XFLD");
 		} else {
 			throw new Error("Cannot create a new group: oSpecificChangeInfo.groupLabel attribute required");
 		}
-		if (!oChangeDefinition.content) {
-			oChangeDefinition.content = {};
-		}
-		if (!oChangeDefinition.content.group) {
-			oChangeDefinition.content.group = {};
-		}
+		var oContent = {
+			group: {}
+		};
 
 		if (oSpecificChangeInfo.index === undefined) {
 			throw new Error("Cannot create a new group: oSpecificChangeInfo.index attribute required");
 		} else {
-			oChangeDefinition.content.group.index = oSpecificChangeInfo.index;
+			oContent.group.index = oSpecificChangeInfo.index;
 		}
 
 		if ( oSpecificChangeInfo.newControlId ){
-			oChangeDefinition.content.group.selector = JsControlTreeModifier.getSelector(oSpecificChangeInfo.newControlId, oAppComponent);
+			oContent.group.selector = JsControlTreeModifier.getSelector(oSpecificChangeInfo.newControlId, oAppComponent);
 		} else {
 			throw new Error("Cannot create a new group: oSpecificChangeInfo.newControlId attribute required");
 		}
+		oChange.setContent(oContent);
 	};
 
 	/**

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @experimental Since 1.50.0 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

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

@@ -91,7 +91,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @experimental Since 1.49.0 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.
@@ -108,9 +108,10 @@ sap.ui.define([
 			var aContentClone;
 
 			var oChange = mPropertyBag.change;
-			// as the label is stored independent of the field and will not be destroyed by destroying the field, is needs to be remembered
+			// as the label is stored independent of the field and will not be destroyed by destroying the field, it needs to be remembered
 			var oRevertData = oChange.getRevertData();
 			oRevertData.labelSelector = oModifier.getSelector(mInnerControls.label, oAppComponent);
+			oChange.setRevertData(oRevertData);
 
 			return Promise.resolve()
 				.then(oModifier.getAggregation.bind(oModifier, oSimpleForm, "content"))
@@ -175,7 +176,8 @@ sap.ui.define([
 		var oRevertData = oChange.getRevertData();
 		if (oRevertData && oRevertData.labelSelector) {
 			return {
-				affectedControls: [JsControlTreeModifier.bySelector(oRevertData.labelSelector, oAppComponent).getParent().getId()]
+				affectedControls: [JsControlTreeModifier.bySelector(oRevertData.labelSelector, oAppComponent).getId()],
+				hasParentWithUnstableId: true
 			};
 		}
 		return {

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

@@ -6,12 +6,10 @@
 
 sap.ui.define([
 	"sap/ui/fl/changeHandler/Base",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/base/Log"
+	"sap/ui/core/util/reflection/JsControlTreeModifier"
 ], function (
 	Base,
-	JsControlTreeModifier,
-	Log
+	JsControlTreeModifier
 ) {
 	"use strict";
 
@@ -19,7 +17,7 @@ sap.ui.define([
 		* Change handler for adding a simple form group.
 		* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
 		* @author SAP SE
-		* @version 1.103.1
+		* @version 1.106.0
 		* @experimental Since 1.27.0
 		*/
 	var AddSimpleFormGroup = {};
@@ -94,11 +92,14 @@ sap.ui.define([
 		var oAppComponent = mPropertyBag.appComponent;
 		var iInsertIndex;
 
-		var oChange = oChangeWrapper.getDefinition();
-		if (oChange.texts && oChange.texts.groupLabel && oChange.texts.groupLabel.value &&
-			oChange.content && oChange.content.group &&
-			(oChange.content.group.selector || oChange.content.group.id)) {
-			var oGroupSelector = oChange.content.group.selector;
+		var oTexts = oChangeWrapper.getTexts();
+		var oContent = oChangeWrapper.getContent();
+		if (
+			oTexts && oTexts.groupLabel && oTexts.groupLabel.value
+			&& oContent && oContent.group &&
+			(oContent.group.selector || oContent.group.id)
+		) {
+			var oGroupSelector = oContent.group.selector;
 			var sGroupId;
 			if (oGroupSelector) {
 				if (oGroupSelector.idIsLocal) {
@@ -107,21 +108,21 @@ sap.ui.define([
 					sGroupId = oGroupSelector.id;
 				}
 			} else {
-				sGroupId = oChange.content.group.id;
+				sGroupId = oContent.group.id;
 			}
 			oChangeWrapper.setRevertData({groupId: sGroupId});
-			var sLabelText = oChange.texts.groupLabel.value;
+			var sLabelText = oTexts.groupLabel.value;
 			var iRelativeIndex;
 			return Promise.resolve()
 				.then(function(){
 					return oModifier.getAggregation(oForm, AddSimpleFormGroup.CONTENT_AGGREGATION);
 				})
 				.then(function(aContent){
-					if (typeof oChange.content.group.index === "number") {
+					if (typeof oContent.group.index === "number") {
 						// The old code support
-						return oChange.content.group.index;
+						return oContent.group.index;
 					} else {
-						iRelativeIndex = oChange.content.group.relativeIndex;
+						iRelativeIndex = oContent.group.relativeIndex;
 						return fnMapGroupIndexToContentAggregationIndex(oModifier,
 							["sap.ui.core.Title", "sap.m.Title", "sap.m.Toolbar", "sap.m.OverflowToolbar"],
 							aContent, iRelativeIndex);
@@ -139,17 +140,13 @@ sap.ui.define([
 					oModifier.setProperty(oTitle, "text", sLabelText);
 					return oModifier.insertAggregation(oForm, "content", oTitle, iInsertIndex, oView);
 				});
-
-		} else {
-			Log.error("Change does not contain sufficient information to be applied: [" + oChange.layer + "]" + oChange.namespace + "/" + oChange.fileName + "." + oChange.fileType);
-			//however subsequent changes should be applied
 		}
 	};
 
 	/**
 	 * Completes the change by adding change handler specific content
 	 *
-	 * @param {sap.ui.fl.Change} oChangeWrapper Change wrapper object to be completed
+	 * @param {sap.ui.fl.Change} oChange Change wrapper object to be completed
 	 * @param {object} oSpecificChangeInfo with attributes "groupLabel", the group label to be included in the change and "newControlId", the control ID for the control to be added
 	 * @param {object} mPropertyBag Property bag containing the modifier, the appComponent and the view
 	 * @param {object} mPropertyBag.modifier Modifier for the controls
@@ -157,23 +154,19 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.view Application view
 	 * @public
 	 */
-	AddSimpleFormGroup.completeChangeContent = function (oChangeWrapper, oSpecificChangeInfo, mPropertyBag) {
-		var oChange = oChangeWrapper.getDefinition();
+	AddSimpleFormGroup.completeChangeContent = function (oChange, oSpecificChangeInfo, mPropertyBag) {
 		var oAppComponent = mPropertyBag.appComponent;
+		var oContent = {
+			group: {}
+		};
 
 		if (oSpecificChangeInfo.newLabel) {
-			Base.setTextInChange(oChange, "groupLabel", oSpecificChangeInfo.newLabel, "XFLD");
+			oChange.setText("groupLabel", oSpecificChangeInfo.newLabel, "XFLD");
 		} else {
 			throw new Error("oSpecificChangeInfo.newLabel attribute required");
 		}
-		if (!oChange.content) {
-			oChange.content = {};
-		}
-		if (!oChange.content.group) {
-			oChange.content.group = {};
-		}
 		if (oSpecificChangeInfo.newControlId) {
-			oChange.content.group.selector = JsControlTreeModifier.getSelector(oSpecificChangeInfo.newControlId, oAppComponent);
+			oContent.group.selector = JsControlTreeModifier.getSelector(oSpecificChangeInfo.newControlId, oAppComponent);
 		} else {
 			throw new Error("oSpecificChangeInfo.newControlId attribute required");
 		}
@@ -181,8 +174,10 @@ sap.ui.define([
 		if (oSpecificChangeInfo.index === undefined) {
 			throw new Error("oSpecificChangeInfo.index attribute required");
 		} else {
-			oChange.content.group.relativeIndex = oSpecificChangeInfo.index;
+			oContent.group.relativeIndex = oSpecificChangeInfo.index;
 		}
+
+		oChange.setContent(oContent);
 	};
 
 	/**
@@ -195,8 +190,8 @@ sap.ui.define([
 	AddSimpleFormGroup.getControlIdFromChangeContent = function (oChange) {
 		var sControlId;
 
-		if (oChange && oChange._oDefinition) {
-			sControlId = oChange._oDefinition.content.group.id;
+		if (oChange && oChange.getContent()) {
+			sControlId = oChange.getContent().group.id;
 		}
 
 		return sControlId;
@@ -233,10 +228,11 @@ sap.ui.define([
 	};
 
 	AddSimpleFormGroup.getChangeVisualizationInfo = function(oChange, oAppComponent) {
-		var oSelector = oChange.getDefinition().content.group.selector;
-		var oAffectedGroup = JsControlTreeModifier.bySelector(oSelector, oAppComponent).getParent().getId();
+		var oSelector = oChange.getContent().group.selector;
+		var oAffectedGroup = JsControlTreeModifier.bySelector(oSelector, oAppComponent).getId();
 		return {
-			affectedControls: [oAffectedGroup]
+			affectedControls: [oAffectedGroup],
+			hasParentWithUnstableId: true
 		};
 	};
 

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @experimental Since 1.27.0
 	 */
 	var HideForm = { };
@@ -44,6 +44,10 @@ sap.ui.define([
 		return mPropertyBag.modifier.targets === "xmlTree";
 	}
 
+	function getGroupHeader(oElement) {
+		return oElement.getTitle() || oElement.getToolbar();
+	}
+
 	/**
 	 * Hides a control.
 	 *
@@ -58,7 +62,6 @@ sap.ui.define([
 		var oView = mPropertyBag.view;
 		var oAppComponent = mPropertyBag.appComponent;
 
-		var oChangeDefinition = oChange.getDefinition();
 
 		// in case of custom fields the application needs to be on JS.
 		// In the other case the visuality of the hidden control will be overriden by the custom field binding afterwards
@@ -66,8 +69,9 @@ sap.ui.define([
 			return Promise.reject(Error("Change cannot be applied in XML. Retrying in JS."));
 		}
 
+		var oContent = oChange.getContent();
 		// !important : sHideId was used in 1.40, do not remove for compatibility!
-		var oRemovedElement = oModifier.bySelector(oChangeDefinition.content.elementSelector || oChangeDefinition.content.sHideId, oAppComponent, oView);
+		var oRemovedElement = oModifier.bySelector(oContent.elementSelector || oContent.sHideId, oAppComponent, oView);
 		var aContent;
 
 		return this._getState(oControl, oModifier, oAppComponent)
@@ -88,7 +92,8 @@ sap.ui.define([
 			})
 			.then(function() {
 				var iStart = -1;
-				if (oChangeDefinition.changeType === "hideSimpleFormField") {
+				var sChangeType = oChange.getChangeType();
+				if (sChangeType === "hideSimpleFormField") {
 					aContent.some(function (oField, index) {
 						if (oField === oRemovedElement) {
 							iStart = index;
@@ -104,7 +109,7 @@ sap.ui.define([
 							}
 						}
 					});
-				} else if (oChangeDefinition.changeType === "removeSimpleFormGroup") {
+				} else if (sChangeType === "removeSimpleFormGroup") {
 					var aPromises = [];
 					var oTitleOrToolbar = fnGetFirstToolbarOrTitle(aContent, oModifier);
 					var bFirstContainerWithoutTitle = oTitleOrToolbar && !oRemovedElement;
@@ -161,7 +166,7 @@ sap.ui.define([
 				}
 				return Promise.resolve();
 			})
-			. catch(function(oError) {
+			.catch(function(oError) {
 				oChange.resetRevertData();
 				Log.error(oError.message || oError.name);
 			});
@@ -192,10 +197,11 @@ sap.ui.define([
 	 * @public
 	 */
 	HideForm.completeChangeContent = function(oChangeWrapper, oSpecificChangeInfo, mPropertyBag) {
-		var oChange = oChangeWrapper.getDefinition();
 		if (oSpecificChangeInfo.removedElement && oSpecificChangeInfo.removedElement.id) {
 			var oStableElement = this._getStableElement(sap.ui.getCore().byId(oSpecificChangeInfo.removedElement.id));
-			oChange.content.elementSelector = JsControlTreeModifier.getSelector(oStableElement, mPropertyBag.appComponent);
+			oChangeWrapper.setContent({
+				elementSelector: JsControlTreeModifier.getSelector(oStableElement, mPropertyBag.appComponent)
+			});
 			oChangeWrapper.addDependentControl(oStableElement, "elementSelector", mPropertyBag);
 		} else {
 			throw new Error("oSpecificChangeInfo.removedElement.id attribute required");
@@ -268,14 +274,17 @@ sap.ui.define([
 	};
 
 	HideForm.getChangeVisualizationInfo = function(oChange, oAppComponent) {
-		var oSelector = oChange.getDefinition().content.elementSelector;
+		var oSelector = oChange.getContent().elementSelector;
 		var oElement = JsControlTreeModifier.bySelector(oSelector, oAppComponent);
-		var oDisplaySelector = oChange.getChangeType() === "removeSimpleFormGroup"
-			? oElement.getParent().getId()
-			: oElement.getParent().getParent().getId();
+		// to show the change indicator on the correct position a stable id needs to be passed to the ChangeIndicatorRegistry
+		var oStableElementId =  oChange.getChangeType() === "hideSimpleFormField"
+			? getGroupHeader(oElement.getParent().getParent()).getId()
+			: oElement.getId();
+
 		return {
 			affectedControls: [oSelector],
-			displayControls: [oDisplaySelector]
+			displayControls: [oStableElementId],
+			hasParentWithUnstableId: true
 		};
 	};
 

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.103.1
+	 * @version 1.106.0
 	 * @experimental Since 1.34.0
 	 */
 	var MoveSimpleForm = {};
@@ -168,12 +168,8 @@ sap.ui.define([
 		return aResult;
 	}
 
-	function getGroupHeader(oHeader) {
-		var oResult = oHeader.getTitle();
-		if (!oResult) {
-			oResult = oHeader.getToolbar();
-		}
-		return oResult;
+	function getGroupHeader(oElement) {
+		return oElement.getTitle() || oElement.getToolbar();
 	}
 
 	function moveFormContainer(oSimpleForm, mMovedElement, mPropertyBag) {
@@ -410,11 +406,13 @@ sap.ui.define([
 			Log.error("Element not found. This may be caused by an unstable id!");
 		}
 
-		var mChangeData = oChange.getDefinition();
-		mChangeData.content.targetSelector = mStableChangeInfo.targetSelector;
-		mChangeData.content.movedElements = mStableChangeInfo.movedElements;
-		// legacy changes had only a string with <appComponentId>---<uid>
-		mChangeData.content.newControlId = oModifier.getSelector(oView.createId(uid()), oAppComponent);
+		var oContent = {
+			targetSelector: mStableChangeInfo.targetSelector,
+			movedElements: mStableChangeInfo.movedElements,
+			// legacy changes had only a string with <appComponentId>---<uid>
+			newControlId: oModifier.getSelector(oView.createId(uid()), oAppComponent)
+		};
+		oChange.setContent(oContent);
 
 		if (mStableChangeInfo.source && mStableChangeInfo.target){
 			oChange.addDependentControl(mStableChangeInfo.source, "sourceParent", mPropertyBag);
@@ -467,14 +465,12 @@ sap.ui.define([
 		var oTargetParentContainer;
 		var oMovedElement = oChange.getContent().movedElements[0];
 		var oGroupSelector = oMovedElement.source.groupSelector;
-		var oAffectedControlSelector = JsControlTreeModifier.bySelector(oMovedElement.elementSelector, oAppComponent).getParent().getId();
+		var oAffectedControlSelector = JsControlTreeModifier.bySelector(oMovedElement.elementSelector, oAppComponent).getId();
 		if (oChange.getChangeType() === MoveSimpleForm.CHANGE_TYPE_MOVE_FIELD) {
-			var mPropertyBag = {
-				modifier: JsControlTreeModifier,
-				appComponent: oAppComponent
-			};
-			oSourceParentContainer = oChange.getDependentControl("sourceParent", mPropertyBag).getParent().getId();
-			oTargetParentContainer = oChange.getDependentControl("targetParent", mPropertyBag).getParent().getId();
+			var oSourceParentTitleElement = JsControlTreeModifier.bySelector(oMovedElement.source.groupSelector, oAppComponent);
+			var oTargetParentTitleElement = JsControlTreeModifier.bySelector(oMovedElement.target.groupSelector, oAppComponent);
+			oSourceParentContainer = oSourceParentTitleElement ? oSourceParentTitleElement.getParent().getId() : null;
+			oTargetParentContainer = oTargetParentTitleElement ? oTargetParentTitleElement.getParent().getId() : null;
 			oGroupSelector = {
 				id: oSourceParentContainer
 			};
@@ -486,6 +482,7 @@ sap.ui.define([
 					? oGroupSelector
 					: oChange.getContent().targetSelector
 			],
+			hasParentWithUnstableId: true,
 			payload: {
 				sourceParentContainer: oSourceParentContainer,
 				targetParentContainer: oTargetParentContainer

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

@@ -5,11 +5,7 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/changeHandler/Base",
-	"sap/base/Log"
 ], function(
-	BaseChangeHandler,
-	Log
 ) {
 	"use strict";
 
@@ -18,7 +14,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameFormContainer
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @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.
@@ -42,7 +38,7 @@ sap.ui.define([
 	 */
 	RenameFormContainer.applyChange = function(oChangeWrapper, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier,
-			oChangeDefinition = oChangeWrapper.getDefinition(),
+			oTexts = oChangeWrapper.getTexts(),
 			oRenamedElement = oChangeWrapper.getDependentControl(_CONSTANTS.TARGET_ALIAS, mPropertyBag);
 
 		return Promise.resolve()
@@ -50,9 +46,8 @@ sap.ui.define([
 				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;
+				if (oTexts && oTexts.formText && this._isProvided(oTexts.formText.value)) {
+					var sValue = oTexts.formText.value;
 					var oRevertDataPromise;
 					if (typeof oTitle === "string") {
 						oRevertDataPromise = Promise.resolve(oModifier.getProperty(oRenamedElement, "title")).then(function(sTitle) {
@@ -66,9 +61,6 @@ sap.ui.define([
 						});
 					}
 					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));
 	};
@@ -76,14 +68,12 @@ sap.ui.define([
 	/**
 	 * Completes the change by adding change handler specific content
 	 *
-	 * @param {sap.ui.fl.Change} oChangeWrapper Change wrapper object to be completed
+	 * @param {sap.ui.fl.Change} oChange Change wrapper object to be completed
 	 * @param {object} oSpecificChangeInfo With attribute fieldLabel, the new field label to be included in the change
 	 * @param {object} mPropertyBag Map containing the application component
 	 * @private
 	 */
-	RenameFormContainer.completeChangeContent = function(oChangeWrapper, oSpecificChangeInfo, mPropertyBag) {
-		var oChangeDefinition = oChangeWrapper.getDefinition();
-
+	RenameFormContainer.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {
 		if (!(oSpecificChangeInfo.renamedElement && oSpecificChangeInfo.renamedElement.id)) {
 			throw new Error("Rename of the group cannot be executed: oSpecificChangeInfo.renamedElement attribute required");
 		}
@@ -92,9 +82,8 @@ sap.ui.define([
 			throw new Error("Rename of the group cannot be executed: oSpecificChangeInfo.value attribute required");
 		}
 
-		oChangeWrapper.addDependentControl(oSpecificChangeInfo.renamedElement.id, _CONSTANTS.TARGET_ALIAS, mPropertyBag);
-		BaseChangeHandler.setTextInChange(oChangeDefinition, "formText", oSpecificChangeInfo.value, "XGRP");
-
+		oChange.addDependentControl(oSpecificChangeInfo.renamedElement.id, _CONSTANTS.TARGET_ALIAS, mPropertyBag);
+		oChange.setText("formText", oSpecificChangeInfo.value, "XGRP");
 	};
 
 	/**