@openui5/sap.m 1.119.0 → 1.120.0

package/src/sap/m/p13n/SelectionController.js

@@ -5,27 +5,27 @@
  */
 
 sap.ui.define([
-    'sap/base/util/array/diff',
-    'sap/ui/base/Object',
-    'sap/base/util/merge',
-    'sap/base/util/deepEqual',
-    'sap/m/p13n/SelectionPanel',
-    'sap/m/p13n/modules/xConfigAPI',
-    'sap/ui/core/Configuration',
-    'sap/ui/core/mvc/View'
+	'sap/base/util/array/diff',
+	'sap/ui/base/Object',
+	'sap/base/util/merge',
+	'sap/base/util/deepEqual',
+	'sap/m/p13n/SelectionPanel',
+	'sap/m/p13n/modules/xConfigAPI',
+	'sap/ui/core/Configuration',
+	'sap/ui/core/mvc/View'
 ], function (diff, BaseObject, merge, deepEqual, SelectionPanel, xConfigAPI, Configuration, View) {
 	"use strict";
 
-    /**
+	/**
 	 * Constructor for a new <code>SelectionController</code>.
 	 *
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] Initial settings for the new control
-     * @param {sap.ui.core.Control} mSettings.control The control instance that is personalized by this controller
-     * @param {function} [mSettings.getKeyForItem] By default the SelectionController tries to identify the existing item through the
-     * key by checking if there is an existing item with this id. This behaviour can be overruled by implementing this method which will
-     * provide the according item of the <code>targetAggregation</code> to return the according key associated to this item.
-     * @param {string} mSettings.targetAggregation The name of the aggregation that is now managed by this controller
+	 * @param {sap.ui.core.Control} mSettings.control The control instance that is personalized by this controller
+	 * @param {function} [mSettings.getKeyForItem] By default the SelectionController tries to identify the existing item through the
+	 * key by checking if there is an existing item with this id. This behaviour can be overruled by implementing this method which will
+	 * provide the according item of the <code>targetAggregation</code> to return the according key associated to this item.
+	 * @param {string} mSettings.targetAggregation The name of the aggregation that is now managed by this controller
 	 *
 	 * @class
 	 * The <code>SelectionController</code> entity serves as a base class to create control-specific personalization implementations.
@@ -33,203 +33,203 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
 	 */
 	var SelectionController = BaseObject.extend("sap.m.p13n.SelectionController",{
-        constructor: function(mSettings) {
-            BaseObject.call(this);
-
-            this._oAdaptationControl = mSettings.control;
-
-            /**
-             * The 'stableKeys' can be provided in the constructor to exclude the keys from the p13n UI, while still respecting them in the
-             * delta logic. For instance by ignoring the first column of a TreeTable in the p13n dialog while still not removing this column
-             * on closing the dialog.
-             */
-            this._aStableKeys = mSettings.stableKeys || [];
-
-            if (!this._oAdaptationControl) {
-                throw new Error("Always provide atleast a 'control' configuration when creating a new p13n controller!");
-            }
-
-            this._sTargetAggregation = mSettings.targetAggregation;
-            this._fSelector = mSettings.getKeyForItem;
-
-            this._oP13nData = null;
-            this._bLiveMode = false;
-            this._bResetEnabled = false;
-            this._bReorderingEnabled = mSettings.hasOwnProperty("enableReorder") ? mSettings.enableReorder : true;
-
-        }
-    });
-
-    /**
-     * The control that is being personalized via this controller.
-     *
-     * @returns {sap.ui.mdc.Control} The control which is being adapted.
-     */
-    SelectionController.prototype.getAdaptationControl = function(){
-        return this._oAdaptationControl;
-    };
-
-    SelectionController.prototype.getTargetAggregation = function(){
-        return this._sTargetAggregation;
-    };
-
-
-    /**
-     * Defines the available ChangeTypes (should be in sync with 'getDelta').
-     *
-     * @returns {object} A map of legal change types.
-     */
-    SelectionController.prototype.getChangeOperations = function() {
-        return {
-            add: "addItem",
-            remove: "removeItem",
-            move: "moveItem"
-        };
-    };
-
-     /**
-     * Defines which control(s) are considered for the reset.
-     *
-     * @returns {sap.ui.core.Control | sap.ui.core.Control[]}
-     **/
-    SelectionController.prototype.getSelectorForReset = function() {
-        return this._oAdaptationControl;
-    };
-
-    SelectionController.prototype.sanityCheck = function(oState) {
-        return oState;
-    };
-
-    /**
-     * The actual UI used for personalization.
-     *
-     * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The property helper instance
-     * @returns {sap.ui.core.Control|string|Promise} The control which is going to be used in the p13n container.
-     */
-    SelectionController.prototype.initAdaptationUI = function(oPropertyHelper){
-        var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
-        this._oPanel = this.createUI(oAdaptationData);
-        return Promise.resolve(this._oPanel);
-    };
-
-    SelectionController.prototype.createUI = function(oAdaptationData) {
-        var oSelectionPanel = new SelectionPanel({
-            showHeader: true,
-            enableCount: true
-        });
-        oSelectionPanel.setEnableReorder(this._bReorderingEnabled);
-        return oSelectionPanel.setP13nData(oAdaptationData.items);
-    };
-
-    var getViewForControl = function(oControl) {
-        if (oControl instanceof View) {
-            return oControl;
-        }
-
-        if (oControl && typeof oControl.getParent === "function") {
-            oControl = oControl.getParent();
-            return getViewForControl(oControl);
-        }
-    };
-
-    SelectionController.prototype.getCurrentState = function(){
-        var aState = [], aAggregationItems = this.getAdaptationControl().getAggregation(this.getTargetAggregation()) || [];
-        var oView = getViewForControl(this.getAdaptationControl());
-        aAggregationItems.forEach(function(oItem, iIndex) {
-            var sId = oView ? oView.getLocalId(oItem.getId()) : oItem.getId();
-            var vRelevant = this._fSelector ? this._fSelector(oItem) : oItem.getVisible();
-            if (vRelevant) {
-                aState.push({
-                    key: typeof vRelevant === "boolean" ? sId : vRelevant
-                });
-            }
+		constructor: function(mSettings) {
+			BaseObject.call(this);
+
+			this._oAdaptationControl = mSettings.control;
+
+			/**
+			 * The 'stableKeys' can be provided in the constructor to exclude the keys from the p13n UI, while still respecting them in the
+			 * delta logic. For instance by ignoring the first column of a TreeTable in the p13n dialog while still not removing this column
+			 * on closing the dialog.
+			 */
+			this._aStableKeys = mSettings.stableKeys || [];
+
+			if (!this._oAdaptationControl) {
+				throw new Error("Always provide atleast a 'control' configuration when creating a new p13n controller!");
+			}
+
+			this._sTargetAggregation = mSettings.targetAggregation;
+			this._fSelector = mSettings.getKeyForItem;
+
+			this._oP13nData = null;
+			this._bLiveMode = false;
+			this._bResetEnabled = false;
+			this._bReorderingEnabled = mSettings.hasOwnProperty("enableReorder") ? mSettings.enableReorder : true;
+
+		}
+	});
+
+	/**
+	 * The control that is being personalized via this controller.
+	 *
+	 * @returns {sap.ui.mdc.Control} The control which is being adapted.
+	 */
+	SelectionController.prototype.getAdaptationControl = function(){
+		return this._oAdaptationControl;
+	};
+
+	SelectionController.prototype.getTargetAggregation = function(){
+		return this._sTargetAggregation;
+	};
+
+
+	/**
+	 * Defines the available ChangeTypes (should be in sync with 'getDelta').
+	 *
+	 * @returns {object} A map of legal change types.
+	 */
+	SelectionController.prototype.getChangeOperations = function() {
+		return {
+			add: "addItem",
+			remove: "removeItem",
+			move: "moveItem"
+		};
+	};
+
+	 /**
+	 * Defines which control(s) are considered for the reset.
+	 *
+	 * @returns {sap.ui.core.Control | sap.ui.core.Control[]}
+	 **/
+	SelectionController.prototype.getSelectorForReset = function() {
+		return this._oAdaptationControl;
+	};
+
+	SelectionController.prototype.sanityCheck = function(oState) {
+		return oState;
+	};
+
+	/**
+	 * The actual UI used for personalization.
+	 *
+	 * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The property helper instance
+	 * @returns {sap.ui.core.Control|string|Promise} The control which is going to be used in the p13n container.
+	 */
+	SelectionController.prototype.initAdaptationUI = function(oPropertyHelper){
+		var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+		this._oPanel = this.createUI(oAdaptationData);
+		return Promise.resolve(this._oPanel);
+	};
+
+	SelectionController.prototype.createUI = function(oAdaptationData) {
+		var oSelectionPanel = new SelectionPanel({
+			showHeader: true,
+			enableCount: true
+		});
+		oSelectionPanel.setEnableReorder(this._bReorderingEnabled);
+		return oSelectionPanel.setP13nData(oAdaptationData.items);
+	};
+
+	var getViewForControl = function(oControl) {
+		if (oControl instanceof View) {
+			return oControl;
+		}
+
+		if (oControl && typeof oControl.getParent === "function") {
+			oControl = oControl.getParent();
+			return getViewForControl(oControl);
+		}
+	};
+
+	SelectionController.prototype.getCurrentState = function(){
+		var aState = [], aAggregationItems = this.getAdaptationControl().getAggregation(this.getTargetAggregation()) || [];
+		var oView = getViewForControl(this.getAdaptationControl());
+		aAggregationItems.forEach(function(oItem, iIndex) {
+			var sId = oView ? oView.getLocalId(oItem.getId()) : oItem.getId();
+			var vRelevant = this._fSelector ? this._fSelector(oItem) : oItem.getVisible();
+			if (vRelevant) {
+				aState.push({
+					key: typeof vRelevant === "boolean" ? sId : vRelevant
+				});
+			}
 		}.bind(this));
 
-        var oXConfig = xConfigAPI.readConfig(this.getAdaptationControl()) || {};
-        var oItemXConfig = oXConfig.hasOwnProperty("aggregations") ? oXConfig.aggregations[this._sTargetAggregation] : {};
-
-        for (var sKey in oItemXConfig) {
-            var aStateKeys = aState.map(function(o){return o.key;});
-            var iCurrentIndex = aStateKeys.indexOf(sKey);
-            var iNewIndex = oItemXConfig[sKey].position;
-            var bVisible = oItemXConfig[sKey].visible !== false;
-            var bReordered = iNewIndex !== undefined;
-
-            if (bVisible && iCurrentIndex === -1) {
-                aState.push({
-                    key: sKey
-                });
-            }
-
-            if (bVisible && bReordered && aState.length > 0) {
-                var oItem = aState.splice(iCurrentIndex, 1)[0];
-                aState.splice(iNewIndex, 0, oItem);
-                iCurrentIndex = iNewIndex;
-            }
-            if (oItemXConfig[sKey].visible === false && iCurrentIndex > -1) {
-                aState.splice(iCurrentIndex, 1);
-            }
-
-        }
-        return aState;
-    };
+		var oXConfig = xConfigAPI.readConfig(this.getAdaptationControl()) || {};
+		var oItemXConfig = oXConfig.hasOwnProperty("aggregations") ? oXConfig.aggregations[this._sTargetAggregation] : {};
+
+		for (var sKey in oItemXConfig) {
+			var aStateKeys = aState.map(function(o){return o.key;});
+			var iCurrentIndex = aStateKeys.indexOf(sKey);
+			var iNewIndex = oItemXConfig[sKey].position;
+			var bVisible = oItemXConfig[sKey].visible !== false;
+			var bReordered = iNewIndex !== undefined;
+
+			if (bVisible && iCurrentIndex === -1) {
+				aState.push({
+					key: sKey
+				});
+			}
+
+			if (bVisible && bReordered && aState.length > 0) {
+				var oItem = aState.splice(iCurrentIndex, 1)[0];
+				aState.splice(iNewIndex, 0, oItem);
+				iCurrentIndex = iNewIndex;
+			}
+			if (oItemXConfig[sKey].visible === false && iCurrentIndex > -1) {
+				aState.splice(iCurrentIndex, 1);
+			}
+
+		}
+		return aState;
+	};
 
 	SelectionController.prototype.getStateKey = function(){
 		return "items";
 	};
 
-    SelectionController.prototype.getDelta = function(mPropertyBag) {
-        var sPresenceAttribute = this._getPresenceAttribute(mPropertyBag.externalAppliance);
-        var aNewStatePrepared;
-
-        var fnFilterUnselected = function (oItem) {
-            return oItem.hasOwnProperty(sPresenceAttribute) && oItem[sPresenceAttribute] === false ? false : true;
-        };
-        aNewStatePrepared = mPropertyBag.applyAbsolute
-            ? mPropertyBag.changedState.filter(fnFilterUnselected) :
-            this._getFilledArray(mPropertyBag.existingState, mPropertyBag.changedState, sPresenceAttribute).filter(fnFilterUnselected);
-
-        this._aStableKeys.forEach(function(sKey, iIndex){
-            var mExistingState = this.arrayToMap(this.getCurrentState());
-            var mNewState = this.arrayToMap(aNewStatePrepared);
-            var iStableIndex = mExistingState[sKey] || (iIndex - 1);
-
-            if (!mNewState.hasOwnProperty(sKey)) {
-                aNewStatePrepared.splice(iStableIndex, 0,mExistingState[sKey]);
-            }
-        }.bind(this));
-        mPropertyBag.changedState = aNewStatePrepared;
-
-        //Example: Dialog Ok --> don't trigger unnecessary flex change processing
-        if (deepEqual(mPropertyBag.existingState, aNewStatePrepared)){
-            return [];
-        } else {
-            return this.getArrayDeltaChanges(mPropertyBag);
-        }
-
-    };
-
-    /**
-    * Generates a set of changes based on the given arrays for a specified control
-    *
-    * @param {object} mDeltaInfo Map containing the necessary information to calculate the diff as change objects
-    * @param {array} mDeltaInfo.existingState An array describing the control state before a adaptation
-    * @param {array} mDeltaInfo.changedState An array describing the control state after a certain adaptation
-    * @param {object} mDeltaInfo.control Control instance which is being used to generate the changes
-    * @param {object} mDeltaInfo.changeOperations Map containing the changeOperations for the given Control instance
-    * @param {string} mDeltaInfo.changeOperations.add Name of the control specific 'add' changehandler
-    * @param {string} mDeltaInfo.changeOperations.remove Name of the control specific 'remove' changehandler
-    * @param {string} [mDeltaInfo.changeOperations.move] Name of the control specific 'move' changehandler
-    * @param {string} [mDeltaInfo.generator] Name of the change generator (E.g. the namespace of the UI creating the change object)
-    *
-    * @returns {array} Array containing the delta based created changes
-    */
+	SelectionController.prototype.getDelta = function(mPropertyBag) {
+		var sPresenceAttribute = this._getPresenceAttribute(mPropertyBag.externalAppliance);
+		var aNewStatePrepared;
+
+		var fnFilterUnselected = function (oItem) {
+			return oItem.hasOwnProperty(sPresenceAttribute) && oItem[sPresenceAttribute] === false ? false : true;
+		};
+		aNewStatePrepared = mPropertyBag.applyAbsolute
+			? mPropertyBag.changedState.filter(fnFilterUnselected) :
+			this._getFilledArray(mPropertyBag.existingState, mPropertyBag.changedState, sPresenceAttribute).filter(fnFilterUnselected);
+
+		this._aStableKeys.forEach(function(sKey, iIndex){
+			var mExistingState = this.arrayToMap(this.getCurrentState());
+			var mNewState = this.arrayToMap(aNewStatePrepared);
+			var iStableIndex = mExistingState[sKey] || (iIndex - 1);
+
+			if (!mNewState.hasOwnProperty(sKey)) {
+				aNewStatePrepared.splice(iStableIndex, 0,mExistingState[sKey]);
+			}
+		}.bind(this));
+		mPropertyBag.changedState = aNewStatePrepared;
+
+		//Example: Dialog Ok --> don't trigger unnecessary flex change processing
+		if (deepEqual(mPropertyBag.existingState, aNewStatePrepared)){
+			return [];
+		} else {
+			return this.getArrayDeltaChanges(mPropertyBag);
+		}
+
+	};
+
+	/**
+	* Generates a set of changes based on the given arrays for a specified control
+	*
+	* @param {object} mDeltaInfo Map containing the necessary information to calculate the diff as change objects
+	* @param {array} mDeltaInfo.existingState An array describing the control state before a adaptation
+	* @param {array} mDeltaInfo.changedState An array describing the control state after a certain adaptation
+	* @param {object} mDeltaInfo.control Control instance which is being used to generate the changes
+	* @param {object} mDeltaInfo.changeOperations Map containing the changeOperations for the given Control instance
+	* @param {string} mDeltaInfo.changeOperations.add Name of the control specific 'add' changehandler
+	* @param {string} mDeltaInfo.changeOperations.remove Name of the control specific 'remove' changehandler
+	* @param {string} [mDeltaInfo.changeOperations.move] Name of the control specific 'move' changehandler
+	* @param {string} [mDeltaInfo.generator] Name of the change generator (E.g. the namespace of the UI creating the change object)
+	*
+	* @returns {array} Array containing the delta based created changes
+	*/
 	SelectionController.prototype.getArrayDeltaChanges = function(mDeltaInfo) {
 		var aExistingArray = mDeltaInfo.existingState;
 		var aChangedArray = mDeltaInfo.changedState;
@@ -365,12 +365,12 @@ sap.ui.define([
 
 	   return mDeleteInserts;
    };
-    SelectionController.prototype._verifyDeltaAttributes = function (oSource, oTarget, aDeltaAttributes) {
+	SelectionController.prototype._verifyDeltaAttributes = function (oSource, oTarget, aDeltaAttributes) {
 		var bReturn = false;
 
 		aDeltaAttributes.some(function(sAttr) {
 			if (!oSource.hasOwnProperty(sAttr) && oTarget.hasOwnProperty(sAttr)  ||
-			     oSource.hasOwnProperty(sAttr) && !oTarget.hasOwnProperty(sAttr) ||
+				 oSource.hasOwnProperty(sAttr) && !oTarget.hasOwnProperty(sAttr) ||
 				(oSource[sAttr] != oTarget[sAttr]) ) {
 					bReturn = true;
 				}
@@ -381,140 +381,143 @@ sap.ui.define([
 
 	};
 
-     /**
-     * Method which reduces a propertyinfo map to changecontent relevant attributes.
-     * <b>Note:</b> This method determines the attributes stored in the changeContent.
-     *
-     * @param {object} oProperty Object containing all values prior to change creation
-     * @param {array} aDeltaAttributes Array containing all attributes that are necessary for the delta calculation
-     *
-     * @returns {object} Object containing reduced content
-     */
-    SelectionController.prototype._getChangeContent = function (oProperty, aDeltaAttributes) {
-
-        var oChangeContent = {};
-
-        // Index
-        if (oProperty.hasOwnProperty("index") && oProperty.index >= 0) {
-            oChangeContent.index = oProperty.index;
-        }
-
-        aDeltaAttributes.forEach(function(sAttribute) {
-            if (oProperty.hasOwnProperty(sAttribute)){
-                oChangeContent[sAttribute] = oProperty[sAttribute];
-            }
-        });
-
-        return oChangeContent;
-    };
-
-    SelectionController.prototype._createAddRemoveChange = function(oControl, sOperation, oContent){
-
-        var oChangeContent = oContent;
-
-        oChangeContent.value = (sOperation == this.getChangeOperations()["add"]);
-        oChangeContent.targetAggregation = this.getTargetAggregation();
-
-        var oAddRemoveChange = {
-            selectorElement: oControl,
-            changeSpecificData: {
-                changeType: sOperation,
-                content: oChangeContent
-            }
-        };
-        return oAddRemoveChange;
-    };
-
-    SelectionController.prototype._createMoveChange = function(sPropertykey, iNewIndex, sMoveOperation, oControl){
-        var oMoveChange =  {
-            selectorElement: oControl,
-            changeSpecificData: {
-                changeType: sMoveOperation,
-                content: {
-                    key: sPropertykey,
-                    targetAggregation: this.getTargetAggregation(),
-                    index: iNewIndex
-                }
-            }
-        };
-        return oMoveChange;
-    };
-    SelectionController.prototype._getPresenceAttribute = function(bexternalAppliance){
-        return "visible";
-    };
-
-    /**
-     * Allows calculations prior to applying a set of changes.
-     * This can be used to mix additional changes to auto-created changes.
-     *
-     * @returns {Promise} A Promise that should resolve with an array of additional changes.
-     */
-    SelectionController.prototype.getBeforeApply = function(){
-        return Promise.resolve();
-    };
-
-    /**
-     * Initialized the inner model for the Personalization.
-     *
-     * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The propertyhelper that should be utilized for property determination.
-     * @returns {object} The personalization model data
-     */
-    SelectionController.prototype.mixInfoAndState = function(oPropertyHelper) {
-
-        var aItemState = this.getCurrentState();
-        var mItemState = this.arrayToMap(aItemState);
-
-        var oP13nData = this.prepareAdaptationData(oPropertyHelper, function(mItem, oProperty){
-            var oExisting = mItemState[oProperty.name || oProperty.key];
-            mItem.visible = !!oExisting;
-            mItem.position =  oExisting ? oExisting.position : -1;
-            return !(oProperty.visible === false || (this._aStableKeys.indexOf(oProperty.name || oProperty.key) > -1));
-        }.bind(this));
-
-        this.sortP13nData({
-            visible: "visible",
-            position: "position"
-        }, oP13nData.items);
-
-        oP13nData.items.forEach(function(oItem){delete oItem.position;});
-        return oP13nData;
-    };
-
-    /**
-     * @returns {object} The personalization data.
-     *
-     */
-    SelectionController.prototype.getP13nData = function() {
-        return this._oPanel ? this._oPanel.getP13nData() : this._oAdaptationModel && this._oAdaptationModel.getProperty("/items");
-    };
-
-    SelectionController.prototype.model2State = false;
-
-    /**
-     * Can be used to trigger update after UI interactions such as "Ok" and "Reset"
-     *
-     * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The property helper instance
-     */
-    SelectionController.prototype.update = function(oPropertyHelper) {
-        if (this._oPanel) {
+	 /**
+	 * Method which reduces a propertyinfo map to changecontent relevant attributes.
+	 * <b>Note:</b> This method determines the attributes stored in the changeContent.
+	 *
+	 * @param {object} oProperty Object containing all values prior to change creation
+	 * @param {array} aDeltaAttributes Array containing all attributes that are necessary for the delta calculation
+	 *
+	 * @returns {object} Object containing reduced content
+	 */
+	SelectionController.prototype._getChangeContent = function (oProperty, aDeltaAttributes) {
+
+		var oChangeContent = {};
+
+		// Index
+		if (oProperty.hasOwnProperty("index") && oProperty.index >= 0) {
+			oChangeContent.index = oProperty.index;
+		}
+
+		aDeltaAttributes.forEach(function(sAttribute) {
+			if (oProperty.hasOwnProperty(sAttribute)){
+				oChangeContent[sAttribute] = oProperty[sAttribute];
+			}
+		});
+
+		return oChangeContent;
+	};
+
+	SelectionController.prototype._createAddRemoveChange = function(oControl, sOperation, oContent){
+
+		var oChangeContent = oContent;
+
+		if (sOperation.indexOf("set") !== 0) {
+			oChangeContent.value = (sOperation == this.getChangeOperations()["add"]);
+		}
+
+		oChangeContent.targetAggregation = this.getTargetAggregation();
+
+		var oAddRemoveChange = {
+			selectorElement: oControl,
+			changeSpecificData: {
+				changeType: sOperation,
+				content: oChangeContent
+			}
+		};
+		return oAddRemoveChange;
+	};
+
+	SelectionController.prototype._createMoveChange = function(sPropertykey, iNewIndex, sMoveOperation, oControl){
+		var oMoveChange =  {
+			selectorElement: oControl,
+			changeSpecificData: {
+				changeType: sMoveOperation,
+				content: {
+					key: sPropertykey,
+					targetAggregation: this.getTargetAggregation(),
+					index: iNewIndex
+				}
+			}
+		};
+		return oMoveChange;
+	};
+	SelectionController.prototype._getPresenceAttribute = function(bexternalAppliance){
+		return "visible";
+	};
+
+	/**
+	 * Allows calculations prior to applying a set of changes.
+	 * This can be used to mix additional changes to auto-created changes.
+	 *
+	 * @returns {Promise} A Promise that should resolve with an array of additional changes.
+	 */
+	SelectionController.prototype.getBeforeApply = function(){
+		return Promise.resolve();
+	};
+
+	/**
+	 * Initialized the inner model for the Personalization.
+	 *
+	 * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The propertyhelper that should be utilized for property determination.
+	 * @returns {object} The personalization model data
+	 */
+	SelectionController.prototype.mixInfoAndState = function(oPropertyHelper) {
+
+		var aItemState = this.getCurrentState();
+		var mItemState = this.arrayToMap(aItemState);
+
+		var oP13nData = this.prepareAdaptationData(oPropertyHelper, function(mItem, oProperty){
+			var oExisting = mItemState[oProperty.name || oProperty.key];
+			mItem.visible = !!oExisting;
+			mItem.position =  oExisting ? oExisting.position : -1;
+			return !(oProperty.visible === false || (this._aStableKeys.indexOf(oProperty.name || oProperty.key) > -1));
+		}.bind(this));
+
+		this.sortP13nData({
+			visible: "visible",
+			position: "position"
+		}, oP13nData.items);
+
+		oP13nData.items.forEach(function(oItem){delete oItem.position;});
+		return oP13nData;
+	};
+
+	/**
+	 * @returns {object} The personalization data.
+	 *
+	 */
+	SelectionController.prototype.getP13nData = function() {
+		return this._oPanel ? this._oPanel.getP13nData() : this._oAdaptationModel && this._oAdaptationModel.getProperty("/items");
+	};
+
+	SelectionController.prototype.model2State = false;
+
+	/**
+	 * Can be used to trigger update after UI interactions such as "Ok" and "Reset"
+	 *
+	 * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The property helper instance
+	 */
+	SelectionController.prototype.update = function(oPropertyHelper) {
+		if (this._oPanel) {
 			if (!this._oPanel.isDestroyed()) {
 				var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
 				this._oPanel.setP13nData(oAdaptationData.items);
 			}
-        } else if (this._oAdaptationModel){
-            //'setData' causes unnecessary rerendering in some cases
-            var oP13nData = this.mixInfoAndState(oPropertyHelper);
-            this._oAdaptationModel.setProperty("/items", oP13nData.items);
-            this._oAdaptationModel.setProperty("/itemsGrouped", oP13nData.itemsGrouped);
-        }
-    };
-
-    SelectionController.prototype._getFilledArray = function(aPreviousItems, aNewItems, sRemoveProperty) {
+		} else if (this._oAdaptationModel){
+			//'setData' causes unnecessary rerendering in some cases
+			var oP13nData = this.mixInfoAndState(oPropertyHelper);
+			this._oAdaptationModel.setProperty("/items", oP13nData.items);
+			this._oAdaptationModel.setProperty("/itemsGrouped", oP13nData.itemsGrouped);
+		}
+	};
+
+	SelectionController.prototype._getFilledArray = function(aPreviousItems, aNewItems, sRemoveProperty) {
 		var aNewItemsPrepared = merge([], aPreviousItems);
 		var aNewItemState = merge([], aNewItems);
 
 		aNewItemState.forEach(function (oItem) {
-            var mExistingItems = this.arrayToMap(aNewItemsPrepared);
+			var mExistingItems = this.arrayToMap(aNewItemsPrepared);
 			var oExistingItem = mExistingItems[oItem.key];
 			if (!oItem.hasOwnProperty(sRemoveProperty) || oItem[sRemoveProperty]) {
 				var iNewPosition = oItem.position;
@@ -536,134 +539,165 @@ sap.ui.define([
 		return aNewItemsPrepared;
 	};
 
-    SelectionController.prototype.changesToState = function(aChanges) {
+	SelectionController.prototype.getPropertySetterChanges = function(mDeltaInfo) {
+		var oControl = mDeltaInfo.control;
+		var aExistingState = mDeltaInfo.existingState;
+		var aChangedState = mDeltaInfo.changedState;
+		var sOperation = mDeltaInfo.operation;
+		var sSetAttribute = mDeltaInfo.deltaAttribute;
+
+		var aSetterChanges = [];
+
+		aChangedState.forEach(function(oItem){
+			//check if the provided state item holds the value to check for
+			if (oItem.hasOwnProperty(sSetAttribute)) {
+				var oExistingItem = aExistingState.find(function(oExisting){return oExisting.name == oItem.name;});
+
+				//compare to identify delta (only create a change if really necessary)
+				var vOldValue = oExistingItem && oExistingItem.hasOwnProperty(sSetAttribute) && oExistingItem[sSetAttribute];
+				var vNewValue = oItem[sSetAttribute];
+				var bValueChanged = vOldValue !== vNewValue;
+				if (bValueChanged) {
+					aSetterChanges.push(this._createAddRemoveChange(oControl, sOperation, {
+						[oItem.hasOwnProperty("key") ? "key" : "name"]: oItem.key || oItem.name,
+						targetAggregation: this.getTargetAggregation(),
+						value: oItem[sSetAttribute]
+					}));
+				}
+			}
+		}.bind(this));
 
-        var aState = [];
+		return aSetterChanges;
+	};
+
+	SelectionController.prototype.changesToState = function(aChanges) {
 
-        aChanges.forEach(function(oChange){
-            var oStateDiffContent = merge({}, oChange.changeSpecificData.content);
-            var iIndex = oStateDiffContent.index;
-            delete oStateDiffContent.index;
+		var aState = [];
 
-            //set the position in case its explicitly provided and different to the current position
-            if (iIndex !== undefined) {
-                oStateDiffContent.position = iIndex;
-            }
+		aChanges.forEach(function(oChange){
+			var oStateDiffContent = merge({}, oChange.changeSpecificData.content);
+			var iIndex = oStateDiffContent.index;
+			delete oStateDiffContent.index;
+
+			//set the position in case its explicitly provided and different to the current position
+			if (iIndex !== undefined) {
+				oStateDiffContent.position = iIndex;
+			}
 
-            //set the presence attribute to false in case of an explicit remove
-            if (oChange.changeSpecificData.changeType === this.getChangeOperations()["remove"]) {
-                oStateDiffContent[this._getPresenceAttribute()] = false;
-            }
+			//set the presence attribute to false in case of an explicit remove
+			if (oChange.changeSpecificData.changeType === this.getChangeOperations()["remove"]) {
+				oStateDiffContent[this._getPresenceAttribute()] = false;
+			}
 
-            aState.push(oStateDiffContent);
-        }.bind(this));
+			aState.push(oStateDiffContent);
+		}.bind(this));
 
-        return aState;
-    };
+		return aState;
+	};
 
-    SelectionController.prototype.prepareAdaptationData = function(oPropertyHelper, fnEnhace, bGroupData) {
+	SelectionController.prototype.prepareAdaptationData = function(oPropertyHelper, fnEnhace, bGroupData) {
 
-        var aItems = [];
-        var mItemsGrouped = bGroupData ? {} : null;
+		var aItems = [];
+		var mItemsGrouped = bGroupData ? {} : null;
 
-        var bEnhance = fnEnhace instanceof Function;
+		var bEnhance = fnEnhace instanceof Function;
 
-        oPropertyHelper.getProperties().forEach(function(oProperty) {
+		oPropertyHelper.getProperties().forEach(function(oProperty) {
 
-            var mItem = {};
-            mItem.key = oProperty.name || oProperty.key;
-            mItem.name = oProperty.name || oProperty.key;
+			var mItem = {};
+			mItem.key = oProperty.name || oProperty.key;
+			mItem.name = oProperty.name || oProperty.key;
 
-            if (bEnhance) {
-                var bIsValid = fnEnhace(mItem, oProperty);
-                if (!bIsValid) {
-                    return;
-                }
-            }
+			if (bEnhance) {
+				var bIsValid = fnEnhace(mItem, oProperty);
+				if (!bIsValid) {
+					return;
+				}
+			}
 
-            mItem.label = oProperty.label || mItem.key;
-            mItem.tooltip = oProperty.tooltip;
+			mItem.label = oProperty.label || mItem.key;
+			mItem.tooltip = oProperty.tooltip;
 
-            if (mItemsGrouped) {
-                mItem.group = oProperty.group ? oProperty.group : "BASIC";
-                mItem.groupLabel = oProperty.groupLabel;
-                mItemsGrouped[mItem.group] = mItemsGrouped[mItem.group] ? mItemsGrouped[mItem.group] : [];
-                mItemsGrouped[mItem.group].push(mItem);
-            }
+			if (mItemsGrouped) {
+				mItem.group = oProperty.group ? oProperty.group : "BASIC";
+				mItem.groupLabel = oProperty.groupLabel;
+				mItemsGrouped[mItem.group] = mItemsGrouped[mItem.group] ? mItemsGrouped[mItem.group] : [];
+				mItemsGrouped[mItem.group].push(mItem);
+			}
 
-            aItems.push(mItem);
+			aItems.push(mItem);
 
-        });
+		});
 
-        var oAdaptationData = {
-            items: aItems
-        };
+		var oAdaptationData = {
+			items: aItems
+		};
 
-        if (mItemsGrouped) {
-            oAdaptationData.itemsGrouped = this._buildGroupStructure(mItemsGrouped);
-        }
+		if (mItemsGrouped) {
+			oAdaptationData.itemsGrouped = this._buildGroupStructure(mItemsGrouped);
+		}
 
-        return oAdaptationData;
+		return oAdaptationData;
 
-    };
+	};
 
 
-    SelectionController.prototype._buildGroupStructure = function(mItemsGrouped) {
-        var aGroupedItems = [];
-        Object.keys(mItemsGrouped).forEach(function(sGroupKey){
-            this.sortP13nData("generic", mItemsGrouped[sGroupKey]);
-            aGroupedItems.push({
-                group: sGroupKey,
-                groupLabel: mItemsGrouped[sGroupKey][0].groupLabel || sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("p13n.BASIC_DEFAULT_GROUP"),//Grouplabel might not be necessarily be propagated to every item
-                groupVisible: true,
-                items: mItemsGrouped[sGroupKey]
-            });
-        }.bind(this));
-        return aGroupedItems;
+	SelectionController.prototype._buildGroupStructure = function(mItemsGrouped) {
+		var aGroupedItems = [];
+		Object.keys(mItemsGrouped).forEach(function(sGroupKey){
+			this.sortP13nData("generic", mItemsGrouped[sGroupKey]);
+			aGroupedItems.push({
+				group: sGroupKey,
+				groupLabel: mItemsGrouped[sGroupKey][0].groupLabel || sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("p13n.BASIC_DEFAULT_GROUP"),//Grouplabel might not be necessarily be propagated to every item
+				groupVisible: true,
+				items: mItemsGrouped[sGroupKey]
+			});
+		}.bind(this));
+		return aGroupedItems;
 
-    };
+	};
 
-    SelectionController.prototype.sortP13nData = function (oSorting, aItems) {
+	SelectionController.prototype.sortP13nData = function (oSorting, aItems) {
 
-        var mP13nTypeSorting = oSorting;
+		var mP13nTypeSorting = oSorting;
 
-        var sPositionAttribute = mP13nTypeSorting.position;
-        var sSelectedAttribute = mP13nTypeSorting.visible;
+		var sPositionAttribute = mP13nTypeSorting.position;
+		var sSelectedAttribute = mP13nTypeSorting.visible;
 
-        var sLocale = Configuration.getLocale().toString();
+		var sLocale = Configuration.getLocale().toString();
 
-        var oCollator = window.Intl.Collator(sLocale, {});
+		var oCollator = window.Intl.Collator(sLocale, {});
 
-        // group selected / unselected --> sort alphabetically in each group
-        aItems.sort(function(mField1, mField2) {
-            if (mField1[sSelectedAttribute] && mField2[sSelectedAttribute]) {
-                return (mField1[sPositionAttribute] || 0) - (mField2[sPositionAttribute] || 0);
-            } else if (mField1[sSelectedAttribute]) {
-                return -1;
-            } else if (mField2[sSelectedAttribute]) {
-                return 1;
-            } else if (!mField1[sSelectedAttribute] && !mField2[sSelectedAttribute]) {
-                return oCollator.compare(mField1.label, mField2.label);
-            }
-        });
-    };
+		// group selected / unselected --> sort alphabetically in each group
+		aItems.sort(function(mField1, mField2) {
+			if (mField1[sSelectedAttribute] && mField2[sSelectedAttribute]) {
+				return (mField1[sPositionAttribute] || 0) - (mField2[sPositionAttribute] || 0);
+			} else if (mField1[sSelectedAttribute]) {
+				return -1;
+			} else if (mField2[sSelectedAttribute]) {
+				return 1;
+			} else if (!mField1[sSelectedAttribute] && !mField2[sSelectedAttribute]) {
+				return oCollator.compare(mField1.label, mField2.label);
+			}
+		});
+	};
 
-    SelectionController.prototype.arrayToMap = function(aArray) {
-        return aArray.reduce(function(mMap, oProp, iIndex){
-            mMap[oProp.key] = oProp;
-            mMap[oProp.key].position = iIndex;
-            return mMap;
-        }, {});
-    };
+	SelectionController.prototype.arrayToMap = function(aArray) {
+		return aArray.reduce(function(mMap, oProp, iIndex){
+			mMap[oProp.key] = oProp;
+			mMap[oProp.key].position = iIndex;
+			return mMap;
+		}, {});
+	};
 
-    SelectionController.prototype.destroy = function() {
+	SelectionController.prototype.destroy = function() {
 		BaseObject.prototype.destroy.apply(this, arguments);
-        this._oAdaptationControl = null;
-        this._bLiveMode = null;
-        this._oPanel = null;
-        this._bResetEnabled = null;
-        this._oAdaptationModel = null;
-    };
+		this._oAdaptationControl = null;
+		this._bLiveMode = null;
+		this._oPanel = null;
+		this._bResetEnabled = null;
+		this._oAdaptationModel = null;
+	};
 
 	return SelectionController;