@openui5/sap.ui.fl 1.103.0 → 1.105.0

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/prepareVariantsMap.js

@@ -1,30 +1,32 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"sap/base/util/ObjectPath",
-	"sap/base/Log",
-	"sap/ui/fl/Change",
+	"sap/base/util/each",
 	"sap/base/util/includes",
-	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/base/util/isEmptyObject",
-	"sap/base/util/each",
-	"sap/base/util/values",
 	"sap/base/util/merge",
+	"sap/base/util/ObjectPath",
+	"sap/base/util/values",
+	"sap/base/Log",
+	"sap/ui/fl/apply/_internal/controlVariants/Utils",
+	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
+	"sap/ui/fl/Change",
 	"sap/ui/fl/LayerUtils"
 ], function(
-	ObjectPath,
-	Log,
-	Change,
+	each,
 	includes,
-	VariantsApplyUtil,
 	isEmptyObject,
-	each,
-	values,
 	merge,
+	ObjectPath,
+	values,
+	Log,
+	VariantsApplyUtil,
+	FlexObjectFactory,
+	Change,
 	LayerUtils
 ) {
 	"use strict";
@@ -36,7 +38,7 @@ sap.ui.define([
 		var oVariantsMapClone = merge({}, oVariantsMap);
 		aVariants.forEach(function(oVariant) {
 			oVariantsMapClone[oVariant.fileName] = {
-				content: oVariant,
+				instance: FlexObjectFactory.createFromFileContent(oVariant),
 				controlChanges: [],
 				variantChanges: {}
 			};
@@ -45,25 +47,30 @@ sap.ui.define([
 	}
 
 	// change
-	function addVariantDependentControlChanges(oVariantsMap, aVariantDependentChanges) {
+	function addVariantDependentControlChanges(oVariantsMap, aVariantDependentChanges, sReference) {
 		var oVariantsMapClone = merge({}, oVariantsMap);
 		aVariantDependentChanges.forEach(function(oChange) {
 			var oChangeInstance = new Change(oChange);
 			oChangeInstance.setState(Change.states.PERSISTED);
-			oVariantsMapClone[oChange.variantReference] = oVariantsMapClone[oChange.variantReference] || createStandardVariant(oChange.variantReference);
-			oVariantsMapClone[oChange.variantReference].controlChanges.push(oChangeInstance);
+			var oVariantEntry = oVariantsMapClone[oChange.variantReference];
+			oVariantEntry = oVariantEntry || createStandardVariant(oChange.variantReference, sReference);
+			oVariantEntry.controlChanges.push(oChangeInstance);
+			oVariantsMapClone[oChange.variantReference] = oVariantEntry;
 		});
 		return oVariantsMapClone;
 	}
 
 	// ctrl_variant_change
-	function addVariantChanges(oVariantsMap, aVariantChanges) {
+	function addVariantChanges(oVariantsMap, aVariantChanges, sReference) {
 		var oVariantsMapClone = merge({}, oVariantsMap);
+		// TODO: create change instances
 		aVariantChanges.forEach(function(oChange) {
-			oVariantsMapClone[oChange.selector.id] = oVariantsMapClone[oChange.selector.id] || createStandardVariant(oChange.selector.id);
-			var aVariantChangesOfTheChangeType = oVariantsMapClone[oChange.selector.id].variantChanges[oChange.changeType] || [];
+			var oVariantEntry = oVariantsMapClone[oChange.selector.id];
+			oVariantEntry = oVariantEntry || createStandardVariant(oChange.selector.id, sReference);
+			var aVariantChangesOfTheChangeType = oVariantEntry.variantChanges[oChange.changeType] || [];
 			aVariantChangesOfTheChangeType.push(oChange);
-			oVariantsMapClone[oChange.selector.id].variantChanges[oChange.changeType] = aVariantChangesOfTheChangeType;
+			oVariantEntry.variantChanges[oChange.changeType] = aVariantChangesOfTheChangeType;
+			oVariantsMapClone[oChange.selector.id] = oVariantEntry;
 		});
 		return oVariantsMapClone;
 	}
@@ -71,12 +78,12 @@ sap.ui.define([
 	// filter invisible variants
 	function filterInvisibleVariants(oVariantsMap) {
 		var oVariantsMapClone = merge({}, oVariantsMap);
-		values(oVariantsMap).forEach(function(oVariant) {
-			var aSetVisibleChanges = ObjectPath.get("variantChanges.setVisible", oVariant);
+		values(oVariantsMap).forEach(function(oVariantEntry) {
+			var aSetVisibleChanges = ObjectPath.get("variantChanges.setVisible", oVariantEntry);
 			if (aSetVisibleChanges && aSetVisibleChanges.length > 0) {
 				var oSetVisibleActiveChange = getActiveChange(aSetVisibleChanges);
 				if (!oSetVisibleActiveChange.getContent().visible && oSetVisibleActiveChange.getContent().createdByReset) {
-					delete oVariantsMapClone[oVariant.content.fileName];
+					delete oVariantsMapClone[oVariantEntry.instance.getId()];
 				}
 			}
 		});
@@ -84,20 +91,20 @@ sap.ui.define([
 	}
 
 	// resolve references
-	function resolveReferences(oVariantsMap) {
+	function resolveReferences(oVariantsMap, sReference) {
 		var oVariantsMapClone = merge({}, oVariantsMap);
-		values(oVariantsMapClone).forEach(function(oVariant) {
-			var sVariantReference = oVariant.content.variantReference;
+		values(oVariantsMapClone).forEach(function(oVariantEntry) {
+			var sVariantReference = oVariantEntry.instance.getVariantReference();
 			var oReferencedVariant;
 			if (sVariantReference) {
-				oReferencedVariant = findOrCreateAndAddVariantById(oVariantsMapClone, sVariantReference, oVariant.content.variantManagementReference);
+				oReferencedVariant = findOrCreateAndAddVariantById(oVariantsMapClone, sVariantReference, oVariantEntry.instance.getVariantManagementReference(), sReference);
 			}
-			oVariant.controlChanges = getReferencedControlChange(oReferencedVariant, oVariant.content.layer).concat(oVariant.controlChanges);
+			oVariantEntry.controlChanges = getReferencedControlChanges(oReferencedVariant, oVariantEntry.instance.getLayer()).concat(oVariantEntry.controlChanges);
 		});
 		return oVariantsMapClone;
 	}
 
-	function getReferencedControlChange(oReferencedVariant, sVariantLayer) {
+	function getReferencedControlChanges(oReferencedVariant, sVariantLayer) {
 		if (!oReferencedVariant) {
 			return [];
 		}
@@ -106,11 +113,11 @@ sap.ui.define([
 		});
 	}
 
-	function findOrCreateAndAddVariantById(oVariantsMap, sVariantId, sVMReference) {
+	function findOrCreateAndAddVariantById(oVariantsMap, sVariantId, sVMReference, sReference) {
 		var oReferencedVariant = oVariantsMap[sVariantId];
 
 		if (!oReferencedVariant && sVariantId === sVMReference) {
-			oReferencedVariant = createStandardVariant(sVariantId);
+			oReferencedVariant = createStandardVariant(sVariantId, sReference);
 			oVariantsMap[sVariantId] = oReferencedVariant;
 		}
 
@@ -118,14 +125,14 @@ sap.ui.define([
 	}
 
 	// prepares initial map for variants
-	function getVariantsMap(oStorageResponse) {
+	function getVariantsMap(oStorageResponse, sReference) {
 		var oVariantsMap = {};
 
 		oVariantsMap = addVariants(oVariantsMap, oStorageResponse.variants);
-		oVariantsMap = addVariantDependentControlChanges(oVariantsMap, oStorageResponse.variantDependentControlChanges);
-		oVariantsMap = addVariantChanges(oVariantsMap, oStorageResponse.variantChanges);
+		oVariantsMap = addVariantDependentControlChanges(oVariantsMap, oStorageResponse.variantDependentControlChanges, sReference);
+		oVariantsMap = addVariantChanges(oVariantsMap, oStorageResponse.variantChanges, sReference);
 		oVariantsMap = filterInvisibleVariants(oVariantsMap);
-		oVariantsMap = resolveReferences(oVariantsMap);
+		oVariantsMap = resolveReferences(oVariantsMap, sReference);
 
 		return oVariantsMap;
 	}
@@ -142,23 +149,22 @@ sap.ui.define([
 	// add prepared variants to resultant variant section
 	function addVariantsToResult(oResult, oVariantsMap, aTechnicalParameters) {
 		var oResultClone = merge({}, oResult);
-		values(oVariantsMap).forEach(function(oVariant) {
-			var sVariantManagementId = oVariant.content.variantManagementReference;
+		values(oVariantsMap).forEach(function(oVariantEntry) {
+			var sVariantManagementId = oVariantEntry.instance.getVariantManagementReference();
 			if (!oResultClone[sVariantManagementId]) {
 				oResultClone[sVariantManagementId] = createVariantManagementSection();
 			}
-			oVariant = setDefaultProperties(oVariant);
-			oVariant = applyChangesOnVariant(oVariant);
+			oVariantEntry = applyChangesOnVariant(oVariantEntry);
 
 			// invisible variant cannot be set as current variant
-			if (!oResultClone[sVariantManagementId].currentVariant && oVariant.content.content.visible && includes(aTechnicalParameters, oVariant.content.fileName)) {
-				oResultClone[sVariantManagementId].currentVariant = oVariant.content.fileName;
+			if (!oResultClone[sVariantManagementId].currentVariant && oVariantEntry.instance.getVisible() && includes(aTechnicalParameters, oVariantEntry.instance.getId())) {
+				oResultClone[sVariantManagementId].currentVariant = oVariantEntry.instance.getId();
 			}
 
 			oResultClone[sVariantManagementId].defaultVariant = sVariantManagementId;
 
-			var iSortedIndex = VariantsApplyUtil.getIndexToSortVariant(oResultClone[sVariantManagementId].variants, oVariant);
-			oResultClone[sVariantManagementId].variants.splice(iSortedIndex, 0, oVariant);
+			var iSortedIndex = VariantsApplyUtil.getIndexToSortVariant(oResultClone[sVariantManagementId].variants, oVariantEntry);
+			oResultClone[sVariantManagementId].variants.splice(iSortedIndex, 0, oVariantEntry);
 		});
 
 		return oResultClone;
@@ -184,17 +190,17 @@ sap.ui.define([
 	}
 
 	// add missing standard variants to resultant variant section
-	function addStandardVariants(oResult) {
+	function addStandardVariants(oResult, sReference) {
 		var oResultClone = merge({}, oResult);
 		each(oResultClone, function(sVariantManagementId, oVariantManagement) {
-			var iStandardVariantIndex = oVariantManagement.variants.findIndex(function(oVariant) {
-				return oVariant.content.fileName === sVariantManagementId;
+			var iStandardVariantIndex = oVariantManagement.variants.findIndex(function(oVariantEntry) {
+				return oVariantEntry.instance.getId() === sVariantManagementId;
 			});
 
 			var oStandardVariant;
 
 			if (iStandardVariantIndex === -1) {
-				oStandardVariant = createStandardVariant(sVariantManagementId);
+				oStandardVariant = createStandardVariant(sVariantManagementId, sReference);
 			} else {
 				oStandardVariant = oVariantManagement.variants[iStandardVariantIndex];
 				oVariantManagement.variants.splice(iStandardVariantIndex, 1);
@@ -207,32 +213,26 @@ sap.ui.define([
 	}
 
 	// prepares resultant variant section
-	function assembleResult(oVariantsMap, aVariantManagementChanges, aTechnicalParameters) {
+	function assembleResult(oVariantsMap, aVariantManagementChanges, aTechnicalParameters, sReference) {
 		var oResult = {};
 
 		oResult = addVariantsToResult(oResult, oVariantsMap, aTechnicalParameters);
 		oResult = addVariantManagementChangesToResult(oResult, aVariantManagementChanges);
-		oResult = addStandardVariants(oResult);
+		oResult = addStandardVariants(oResult, sReference);
 
 		return oResult;
 	}
 
-	function createStandardVariant(sVariantId) {
+	function createStandardVariant(sVariantId, sReference) {
 		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl");
 		return {
-			content: {
-				fileName: sVariantId,
+			instance: FlexObjectFactory.createFlVariant({
+				id: sVariantId,
 				variantManagementReference: sVariantId,
-				variantReference: "",
-				content: {
-					title: oResourceBundle.getText("STANDARD_VARIANT_TITLE"),
-					favorite: true,
-					visible: true
-				},
-				support: {
-					user: VariantsApplyUtil.DEFAULT_AUTHOR
-				}
-			},
+				variantName: oResourceBundle.getText("STANDARD_VARIANT_TITLE"),
+				user: VariantsApplyUtil.DEFAULT_AUTHOR,
+				reference: sReference
+			}),
 			variantChanges: {},
 			controlChanges: []
 		};
@@ -255,47 +255,47 @@ sap.ui.define([
 	}
 
 	// set ctrl_variant_change via map properties
-	function applyChangesOnVariant(oVariant) {
-		var oVariantClone = merge({}, oVariant);
-		var mVariantChanges = oVariantClone.variantChanges;
+	function applyChangesOnVariant(oVariantEntry) {
+		var oVariantEntryClone = merge({}, oVariantEntry);
+		var mVariantChanges = oVariantEntryClone.variantChanges;
 		var oActiveChange;
 		each(mVariantChanges, function(sChangeType, aChanges) {
 			switch (sChangeType) {
 				case "setTitle":
 					oActiveChange = getActiveChange(aChanges);
 					if (oActiveChange) {
-						oVariantClone.content.content.title = oActiveChange.getText("title");
+						oVariantEntryClone.instance.setName(oActiveChange.getText("title"), true);
 					}
 					break;
 				case "setFavorite":
 					oActiveChange = getActiveChange(aChanges);
 					if (oActiveChange) {
-						oVariantClone.content.content.favorite = oActiveChange.getContent().favorite;
+						oVariantEntryClone.instance.setFavorite(oActiveChange.getContent().favorite);
 					}
 					break;
 				case "setExecuteOnSelect":
 					oActiveChange = getActiveChange(aChanges);
 					if (oActiveChange) {
-						oVariantClone.content.content.executeOnSelect = oActiveChange.getContent().executeOnSelect;
+						oVariantEntryClone.instance.setExecuteOnSelection(oActiveChange.getContent().executeOnSelect);
 					}
 					break;
 				case "setVisible":
 					oActiveChange = getActiveChange(aChanges);
 					if (oActiveChange) {
-						oVariantClone.content.content.visible = oActiveChange.getContent().visible;
+						oVariantEntryClone.instance.setVisible(oActiveChange.getContent().visible);
 					}
 					break;
 				case "setContexts":
 					oActiveChange = getActiveChange(aChanges);
 					if (oActiveChange) {
-						oVariantClone.content.contexts = oActiveChange.getContent().contexts;
+						oVariantEntryClone.instance.setContexts(oActiveChange.getContent().contexts);
 					}
 					break;
 				default:
-					Log.error("No valid changes on variant " + oVariantClone.content.content.title + " available");
+					Log.error("No valid changes on variant " + oVariantEntryClone.content.content.title + " available");
 			}
 		});
-		return oVariantClone;
+		return oVariantEntryClone;
 	}
 
 	function getActiveChange(aChanges) {
@@ -305,41 +305,6 @@ sap.ui.define([
 		return false;
 	}
 
-	function getText(sTextKey) {
-		return sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl").getText(sTextKey);
-	}
-
-	// set default map properties
-	function setDefaultProperties(oVariant) {
-		var oVariantClone = merge({}, oVariant);
-		if (oVariantClone.content.fileName === oVariantClone.content.variantManagementReference) {
-			// standard Variant should always contain the value: "SAP" in "author" / "Created by" field
-			// case when standard variant exists in the backend response
-			if (!ObjectPath.get("content.support.user", oVariantClone)) {
-				var oSupport = {
-					support: {
-						user: VariantsApplyUtil.DEFAULT_AUTHOR
-					}
-				};
-				merge(oVariantClone.content, oSupport);
-			}
-		}
-		if (!oVariantClone.content.content.favorite) {
-			oVariantClone.content.content.favorite = true;
-		}
-		if (!oVariantClone.content.content.visible) {
-			oVariantClone.content.content.visible = true;
-		}
-		if (!oVariantClone.content.content.executeOnSelect) {
-			oVariantClone.content.content.executeOnSelect = false;
-		}
-		var aTitleKeyMatch = oVariantClone.content.content.title.match(/.i18n>(\w+)./);
-		if (aTitleKeyMatch) {
-			oVariantClone.content.content.title = getText(aTitleKeyMatch[1]);
-		}
-		return oVariantClone;
-	}
-
 	/**
 	 * Prepares the variants map from the flex response for the passed flex state
 	 *
@@ -364,8 +329,8 @@ sap.ui.define([
 
 		var aTechnicalParameters = ObjectPath.get(["technicalParameters", VariantsApplyUtil.VARIANT_TECHNICAL_PARAMETER], mPropertyBag.componentData) || [];
 
-		var oVariantsMap = getVariantsMap(mPropertyBag.storageResponse.changes);
-		oVariantsMap = assembleResult(oVariantsMap, mPropertyBag.storageResponse.changes.variantManagementChanges, aTechnicalParameters);
+		var oVariantsMap = getVariantsMap(mPropertyBag.storageResponse.changes, mPropertyBag.reference);
+		oVariantsMap = assembleResult(oVariantsMap, mPropertyBag.storageResponse.changes.variantManagementChanges, aTechnicalParameters, mPropertyBag.reference);
 		return oVariantsMap;
 	};
 });

package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js

@@ -14,7 +14,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator

package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {};

package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessor = function() {};

package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -26,10 +26,10 @@ sap.ui.define([
 	/**
 	 * Provides an API for applications to work with control variants. See also {@link sap.ui.fl.variants.VariantManagement}.
 	 *
-	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
+	 * @name sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @experimental Since 1.67
 	 * @since 1.67
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

package/src/sap/ui/fl/apply/api/DelegateMediatorAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/apply/api/UI2PersonalizationApplyAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/changeHandler/AddIFrame.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @since 1.72
 	 * @private
 	 */
@@ -38,9 +38,9 @@ sap.ui.define([
 	 */
 	AddIFrame.applyChange = function(oChange, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
-		var oChangeDefinition = oChange.getDefinition();
+		var oChangeContent = oChange.getContent();
 		var oView = mPropertyBag.view;
-		var sAggregationName = oChangeDefinition.content.targetAggregation;
+		var sAggregationName = oChangeContent.targetAggregation;
 		var iIndex;
 		var oIFrame;
 		return Promise.resolve()
@@ -53,7 +53,7 @@ sap.ui.define([
 			})
 			.then(function(iRetrievedIndex) {
 				iIndex = iRetrievedIndex;
-				return createIFrame(oChange, mPropertyBag, oChangeDefinition.content.selector);
+				return createIFrame(oChange, mPropertyBag, oChangeContent.selector);
 			})
 			.then(function(oCreatedIFrame) {
 				oIFrame = oCreatedIFrame;
@@ -93,7 +93,6 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.fl
 	 */
 	AddIFrame.completeChangeContent = function (oChange, oSpecificChangeInfo, mPropertyBag) {
-		var oChangeJson = oChange.getDefinition();
 		var oModifier = mPropertyBag.modifier;
 		var oAppComponent = mPropertyBag.appComponent;
 		// Required settings
@@ -102,8 +101,9 @@ sap.ui.define([
 				throw new Error("Attribute missing from the change specific content '" + sRequiredProperty + "'");
 			}
 		});
-		oChangeJson.content = Object.assign(oChangeJson.content || {}, oSpecificChangeInfo.content);
-		oChangeJson.content.selector = oModifier.getSelector(oChangeJson.content.baseId, oAppComponent);
+		var oContent = Object.assign({}, oSpecificChangeInfo.content);
+		oContent.selector = oModifier.getSelector(oContent.baseId, oAppComponent);
+		oChange.setContent(oContent);
 	};
 
 	AddIFrame.getChangeVisualizationInfo = function(oChange) {

package/src/sap/ui/fl/changeHandler/AddXML.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @since 1.54
 	 * @private
 	 * @experimental Since 1.54. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -32,14 +32,15 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.modifier Modifier for the controls
 	 * @param {object} mPropertyBag.view Root view
 	 * @returns {boolean} <true> if the change got applied successfully
-	 * @public
+	 * @private
+	 * @ui5-restricted sap.ui.fl.apply.changes.Applyer
 	 * @name sap.ui.fl.changeHandler.AddXML#applyChange
 	 */
 	AddXML.applyChange = function(oChange, oControl, mPropertyBag) {
-		var oChangeDefinition = oChange.getDefinition();
+		var oContent = oChange.getContent();
 		var mChangeInfo = {
-			aggregationName: oChangeDefinition.content.targetAggregation,
-			index: oChangeDefinition.content.index
+			aggregationName: oContent.targetAggregation,
+			index: oContent.index
 		};
 
 		return BaseAddXml.applyChange(oChange, oControl, mPropertyBag, mChangeInfo);
@@ -56,7 +57,8 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.appComponent App component
 	 * @param {object} mPropertyBag.view Root view
 	 * @return {boolean} <true> if change has been reverted successfully
-	 * @public
+	 * @private
+	 * @ui5-restricted sap.ui.fl.apply.changes.Reverter
 	 * @name sap.ui.fl.changeHandler.AddXML#revertChange
 	 */
 	AddXML.revertChange = BaseAddXml.revertChange;
@@ -66,29 +68,25 @@ sap.ui.define([
 	 *
 	 * @param {object} oChange Change object to be completed
 	 * @param {object} oSpecificChangeInfo Additional information needed to complete the change
-	 * @public
+	 * @private
+	 * @ui5-restricted sap.ui.fl.write._internal
 	 * @name sap.ui.fl.changeHandler.AddXML#completeChangeContent
 	 */
 	AddXML.completeChangeContent = function(oChange, oSpecificChangeInfo) {
-		var oChangeDefinition = oChange.getDefinition();
-
-		if (!oChangeDefinition.content) {
-			oChangeDefinition.content = {};
-		}
-
+		var oContent = {};
 		if (oSpecificChangeInfo.targetAggregation) {
-			oChangeDefinition.content.targetAggregation = oSpecificChangeInfo.targetAggregation;
+			oContent.targetAggregation = oSpecificChangeInfo.targetAggregation;
 		} else {
 			BaseAddXml._throwMissingAttributeError("targetAggregation");
 		}
 
 		if (oSpecificChangeInfo.index !== undefined) {
-			oChangeDefinition.content.index = oSpecificChangeInfo.index;
+			oContent.index = oSpecificChangeInfo.index;
 		} else {
 			BaseAddXml._throwMissingAttributeError("index");
 		}
 
-		BaseAddXml.completeChangeContent(oChange, oSpecificChangeInfo, oChangeDefinition);
+		BaseAddXml.completeChangeContent(oChange, oSpecificChangeInfo, oContent);
 	};
 
 	return AddXML;

package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -40,13 +40,14 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.modifier Modifier for the controls
 	 * @param {object} mPropertyBag.view Root view
 	 * @returns {boolean} <true> if the change got applied successfully
-	 * @public
+	 * @private
+	 * @ui5-restricted sap.ui.fl.apply.changes.Applyer
 	 * @name sap.ui.fl.changeHandler.AddXMLAtExtensionPoint#applyChange
 	 */
 	AddXMLAtExtensionPoint.applyChange = function (oChange, oControl, mPropertyBag) {
 		var oView = mPropertyBag.view;
 		var oModifier = mPropertyBag.modifier;
-		var oSelector = oChange.getDefinition().selector;
+		var oSelector = oChange.getSelector();
 		var mExtensionPointInfo;
 
 		return Promise.resolve()
@@ -100,7 +101,8 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.appComponent App component
 	 * @param {object} mPropertyBag.view Root view
 	 * @return {boolean} <true> if change has been reverted successfully
-	 * @public
+	 * @private
+	 * @ui5-restricted sap.ui.fl.apply.changes.Reverter
 	 * @name sap.ui.fl.changeHandler.AddXMLAtExtensionPoint#revertChange
 	 */
 	AddXMLAtExtensionPoint.revertChange = BaseAddXml.revertChange;
@@ -110,13 +112,14 @@ sap.ui.define([
 	 *
 	 * @param {object} oChange Change object to be completed
 	 * @param {object} oSpecificChangeInfo Additional information needed to complete the change
-	 * @public
+	 * @private
+	 * @ui5-restricted sap.ui.fl.write._internal
 	 * @name sap.ui.fl.changeHandler.AddXMLAtExtensionPoint#completeChangeContent
 	 */
 	AddXMLAtExtensionPoint.completeChangeContent = function(oChange, oSpecificChangeInfo) {
 		// Complete change content could be called with a third parameter. That would override the
 		// optional changeDefinition parameter of the BaseAddXml used in e.g. addxml usecase
-		BaseAddXml.completeChangeContent(oChange, oSpecificChangeInfo/*, oChangeDefinition*/);
+		BaseAddXml.completeChangeContent(oChange, oSpecificChangeInfo/*, oContent*/);
 	};
 
 	return AddXMLAtExtensionPoint;

package/src/sap/ui/fl/changeHandler/Base.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Base functionality for all change handlers, which provides some reuse methods
 	 * @namespace sap.ui.fl.changeHandler.Base
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted change handlers
 	 */