@openui5/sap.m 1.103.1 → 1.106.0

package/src/sap/m/VariantManagement.js

@@ -1,23 +1,23 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 // Provides control sap.m.VariantManagement.
 sap.ui.define([
-	"sap/ui/model/Context",
-	"sap/ui/model/PropertyBinding",
 	"sap/ui/model/json/JSONModel",
+	"sap/ui/model/base/ManagedObjectModel",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
+	'sap/ui/base/ManagedObjectObserver',
 	"sap/ui/Device",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/core/Control",
 	"sap/ui/core/Icon",
+	"sap/ui/core/Item",
 	"sap/ui/layout/HorizontalLayout",
 	"sap/ui/layout/Grid",
-	'sap/base/Log',
 	"sap/m/SearchField",
 	"sap/m/RadioButton",
 	"sap/m/ColumnListItem",
@@ -43,21 +43,22 @@ sap.ui.define([
 	"sap/m/VBox",
 	'sap/m/HBox',
 	"sap/ui/events/KeyCodes",
+	'sap/base/Log',
 	"sap/ui/core/library",
 	"sap/m/library"
 ], function(
-	Context,
-	PropertyBinding,
 	JSONModel,
+	ManagedObjectModel,
 	Filter,
 	FilterOperator,
+	ManagedObjectObserver,
 	Device,
 	InvisibleText,
 	Control,
 	Icon,
+	Item,
 	HorizontalLayout,
 	Grid,
-	Log,
 	SearchField,
 	RadioButton,
 	ColumnListItem,
@@ -83,6 +84,7 @@ sap.ui.define([
 	VBox,
 	HBox,
 	KeyCodes,
+	Log,
 	coreLibrary,
 	mobileLibrary
 ) {
@@ -94,6 +96,9 @@ sap.ui.define([
 	// shortcut for sap.m.ButtonType
 	var ButtonType = mobileLibrary.ButtonType;
 
+	// shortcut for sap.m.FlexAlignItems
+	var FlexAlignItems = mobileLibrary.FlexAlignItems;
+
 	// shortcut for sap.m.PlacementType
 	var PlacementType = mobileLibrary.PlacementType;
 
@@ -103,12 +108,17 @@ sap.ui.define([
 	// shortcut for sap.m.ScreenSize
 	var ScreenSize = mobileLibrary.ScreenSize;
 
+	var ListKeyboardMode = mobileLibrary.ListKeyboardMode;
+
 	// shortcut for sap.ui.core.ValueState
 	var ValueState = coreLibrary.ValueState;
 
 	// shortcut for sap.ui.core.TextAlign
 	var TextAlign = coreLibrary.TextAlign;
 
+	// shortcut for sap.ui.core.TitleLevel
+	var TitleLevel = coreLibrary.TitleLevel;
+
 	/**
 	 * Constructor for a new <code>VariantManagement</code>.
 	 * @param {string} [sId] - ID for the new control, generated automatically if no ID is given
@@ -132,42 +142,121 @@ sap.ui.define([
 			designtime: "sap/m/designtime/VariantManagement.designtime",
 			properties: {
 				/**
-				 * Indicates that <i>Set as Default</i> is visible in the <i>Save View</i> and the <i>Manage Views</i> dialogs.
+				 * Indicates that default of variants is supported
 				 */
-				showSetAsDefault: {
+				supportDefault: {
 					type: "boolean",
 					group: "Misc",
 					defaultValue: true
 				},
 
 				/**
-				 * Indicates that the control is in error state. If set to <code>true</code>, an error message will be displayed whenever the variant is
-				 * opened.
+				 * Indicates that favorite handling is supported
 				 */
-				inErrorState: {
+				supportFavorites: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: true
+				},
+
+				/**
+				 * Indicates that apply automatically functionality is supported
+				 */
+				supportApplyAutomatically: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: true
+				},
+
+				/**
+				 *  Indicates that public functionality is supported
+				 */
+				supportPublic: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: true
+				},
+
+				/**
+				 *  Indicates that contexts functionality is supported
+				 */
+				supportContexts: {
 					type: "boolean",
 					group: "Misc",
 					defaultValue: false
 				},
 
+				/**
+				 * Identifies the currently selected item
+				 */
+				selectedKey: {
+					type: "string",
+					group: "Misc",
+					defaultValue: ""
+				},
+
+				/**
+				 * Identifies the defaulted item
+				 */
+				defaultKey: {
+					type: "string",
+					group: "Misc",
+					defaultValue: ""
+				},
+
+				/**
+				 * Controls the visibility of the 'SaveAs' button
+				 */
+				showSaveAs: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: true
+				},
+
+				/**
+				 * If set to <code>false</code> neither 'Save As' nor 'Save' buttons on the 'My Views' dialog are visible.
+				 */
+				creationAllowed: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: true
+				},
+
 				/**
 				 * Indicates that the control is in edit state. If set to <code>false</code>, the footer of the <i>Views</i> list will be hidden.
 				 */
-				editable: {
+				showFooter: {
 					type: "boolean",
 					group: "Misc",
 					defaultValue: true
 				},
 
 				/**
-				 * Determines the name of the model containing the variants.
-				 * <p>
-				 * Note: This property has be set only once, at a very early point in time and may not be changed afterwards.
+				 * Indicates the visible and selected item.
+				 */
+				modified: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: false
+				},
+
+				/**
+				 * Indicates the title in the 'My Views' popover.
 				 */
-				modelName: {
+				popoverTitle: {
 					type: "string",
 					group: "Misc",
-					defaultValue: null
+					defaultValue: ""
+				},
+
+				/**
+				 * Indicates that the control is in error state. If set to <code>true</code>, an error message will be displayed whenever the variant is
+				 * opened.
+				 */
+				inErrorState: {
+					type: "boolean",
+					group: "Misc",
+					defaultValue: false
 				},
 
 				/**
@@ -182,13 +271,33 @@ sap.ui.define([
 
 				/**
 				 * Defines the Apply Automatically text for the standard variant in the Manage Views dialog if the application controls this behavior.
-				 *
-				 * <br><b>Note:</b> the usage of this property is restricted to <code>sap.fe</code> components only.
 				 */
 				displayTextForExecuteOnSelectionForStandardVariant: {
 					type: "string",
 					group: "Misc",
 					defaultValue: ""
+				},
+
+				/**
+				 * Semantic level of the header.
+                 * For more information, see {@link sap.m.Title#setLevel}.
+				 */
+				level: {
+					type: "sap.ui.core.TitleLevel",
+                    group: "Appearance",
+                    defaultValue: TitleLevel.Auto
+				}
+			},
+			defaultAggregation: "items",
+			aggregations: {
+
+				/**
+				 * Items displayed by the <code>VariantManagement</code> control.
+				 */
+				items: {
+					type: "sap.m.VariantItem",
+					multiple: true,
+					singularName: "item"
 				}
 			},
 			events: {
@@ -233,6 +342,13 @@ sap.ui.define([
 							type: "boolean"
 						},
 
+						/**
+						 * Indicates the check box state for 'Public'.
+						 */
+						'public': {
+							type: "boolean"
+						},
+
 						/**
 						 * Indicates the check box state for 'Create Tile'.
 						 * <br>Note:</br>This event parameter is used only internally.
@@ -248,6 +364,11 @@ sap.ui.define([
 				 */
 				cancel: {},
 
+				/**
+				 * This event is fired when users presses the cancel button inside <i>Manage Views</i> dialog.
+				 */
+				manageCancel: {},
+
 				/**
 				 * This event is fired when users apply changes to variants in the <i>Manage Views</i> dialog.
 				 */
@@ -275,6 +396,13 @@ sap.ui.define([
 							type: "object[]"
 						},
 
+						/**
+						 * List of variant keys and the associated favorite indicator
+						 */
+						fav: {
+							type: "object[]"
+						},
+
 						/**
 						 * The default variant key
 						 */
@@ -330,11 +458,78 @@ sap.ui.define([
 
 		this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
+
+        this._oManagedObjectModel = new ManagedObjectModel(this);
+        this.setModel(this._oManagedObjectModel, "$mVariants");
+
+		this._oObserver = new ManagedObjectObserver(this._observeChanges.bind(this));
+		this._oObserver.observe(this, {
+			aggregations: [
+				"items"
+			]
+		});
+	};
+
+	VariantManagement.prototype._observeChanges = function(oChanges) {
+		var oVariantItem;
+
+		if (oChanges.type === "aggregation") {
+
+			if (oChanges.name === "items") {
+
+				oVariantItem = oChanges.child;
+
+				switch (oChanges.mutation) {
+					case "insert":
+						if (!this._oObserver.isObserved(oVariantItem, {properties: ["title"]})) {
+							this._oObserver.observe(oVariantItem, {properties: ["title"]});
+						}
+						break;
+					case "remove":
+						if (this._oObserver.isObserved(oVariantItem, {properties: ["title"]})) {
+							this._oObserver.unobserve(oVariantItem, {properties: ["title"]});
+						}
+						break;
+					default:
+						Log.error("operation " + oChanges.mutation + " not yet implemented");
+				}
+			}
+		} else if (oChanges.type === "property") {
+
+			if (oChanges.object.isA && oChanges.object.isA("sap.m.VariantItem")) {
+				oVariantItem = oChanges.object;
+				if (oVariantItem) {
+					if (this.getSelectedKey() === oVariantItem.getKey()) {
+						this.refreshTitle();
+					}
+				}
+			}
+		}
+	};
+
+	VariantManagement.prototype.applySettings = function(mSettings, oScope) {
+		Control.prototype.applySettings.apply(this, arguments);
+
 		this._createInnerModel();
+		this._initializeControl();
+	};
 
-		this._fRegisteredApplyAutomaticallyOnStandardVariant = null;
+	VariantManagement.prototype.setShowFooter = function(bValue) {
+		this.setProperty("showFooter", bValue);
+		return this;
 	};
 
+	VariantManagement.prototype.setDefaultKey = function(sValue) {
+		this.setProperty("defaultKey", sValue);
+		return this;
+	};
+
+	VariantManagement.prototype.setPopoverTitle = function(sValue) {
+		this.setProperty("popoverTitle", sValue);
+		return this;
+	};
+
+
 	VariantManagement.prototype._initializeControl = function() {
 		if (this.oVariantInvisibleText) {
 			return;
@@ -344,8 +539,8 @@ sap.ui.define([
 
 		this.oVariantText = new Title(this.getId() + "-text", {
 			text: {
-				path: '/currentVariant',
-				model: this._sModelName,
+				path: '/selectedKey',
+				model: "$mVariants",
 				formatter: function(sKey) {
 					var sText = "";
 					if (sKey) {
@@ -355,6 +550,10 @@ sap.ui.define([
 
 					return sText;
 				}.bind(this)
+			},
+			level: {
+				path: '/level',
+				model: "$mVariants"
 			}
 		});
 
@@ -371,9 +570,9 @@ sap.ui.define([
 			text: "*",
 			visible: {
 				path: "/modified",
-				model: this._sModelName,
+				model: "$mVariants",
 				formatter: function(bValue) {
-					var sKey = this.getCurrentVariantKey();
+					var sKey = this.getSelectedKey();
 
 					if (sKey) {
 						this._setInvisibleText(this.getSelectedVariantText(sKey), bValue);
@@ -412,55 +611,6 @@ sap.ui.define([
 		this.addDependent(this.oVariantLayout);
 	};
 
-	VariantManagement.prototype.applySettings = function(mSettings, oScope) {
-		Control.prototype.applySettings.apply(this, arguments);
-	};
-
-	VariantManagement.prototype.setModelName = function(sName) {
-		this.setProperty("modelName", sName);
-
-		this._sModelName = sName;
-
-		this._initializeControl();
-
-		return this;
-	};
-
-	/**
-	 * Registration of a callback function. The provided callback function is executed to check if apply automatically on standard variant should be considered.
-	 * @private
-	 * @ui5-restricted sap.fe
-	 * @since 1.103
-	 * @param {function} fCallBack Called when standard variant must be applied. It determines if apply automatically on standard variant should be considered.
-	 * As a convenience the current variant will be passed to the callback. This variant instance may not be changed in any ways. It is only intended to provide certain variant information.
-	 * @returns {this} Reference to this in order to allow method chaining.
-	 */
-	VariantManagement.prototype.registerApplyAutomaticallyOnStandardVariant = function(fCallBack) {
-		this._fRegisteredApplyAutomaticallyOnStandardVariant = fCallBack;
-
-		return this;
-	};
-
-	/**
-	 * Retrieves the apply automatically state for a variant.
-	 * @private
-	 * @ui5-restricted sap.mdc
-	 * @param {object} oVariant the inner variant object
-	 * @returns {boolean} apply automatically state
-	 */
-	VariantManagement.prototype.getApplyAutomaticallyOnVariant = function(oVariant) {
-		var bExecuteOnSelection = oVariant.executeOnSelect;
-
-		if (this._fRegisteredApplyAutomaticallyOnStandardVariant && this.getDisplayTextForExecuteOnSelectionForStandardVariant() && (oVariant.key === this.getStandardVariantKey())) {
-			try {
-				bExecuteOnSelection = this._fRegisteredApplyAutomaticallyOnStandardVariant(oVariant);
-			} catch (ex) {
-				Log.error("callback for determination of apply automatically on standard variant failed");
-			}
-		}
-
-		return bExecuteOnSelection;
-	};
 
 	/**
 	 * Required by the {@link sap.m.IOverflowToolbarContent} interface.
@@ -484,6 +634,9 @@ sap.ui.define([
 	VariantManagement.prototype.getTitle = function() {
 		return this.oVariantText;
 	};
+	VariantManagement.prototype.refreshTitle = function() {
+		this.oVariantText.getBinding("text").refresh(true);
+	};
 
 	VariantManagement.prototype._setInvisibleText = function(sText, bFlag) {
 		var sInvisibleTextKey;
@@ -500,68 +653,13 @@ sap.ui.define([
 
 	VariantManagement.prototype._createInnerModel = function() {
 		var oModel = new JSONModel({
-			showExecuteOnSelection: false,
-			showSetAsDefault: true,
-			showSaveAs: true,
-			showPublic: false,
-			showContexts: false,
-			editable: true,
 			showManualVariantKey: false,
-			showCreateTile: false,
-			popoverTitle: this._oRb.getText("VARIANT_MANAGEMENT_VARIANTS")
+			showCreateTile: false
 		});
 		this.setModel(oModel, VariantManagement.INNER_MODEL_NAME);
-
-		this._bindProperties();
-
-		this._updateInnerModelWithSettingsInfo();
-	};
-
-	VariantManagement.prototype._bindProperties = function() {
-		this.bindProperty("showSetAsDefault", {
-			path: "/showSetAsDefault",
-			model: VariantManagement.INNER_MODEL_NAME
-		});
-		this.bindProperty("editable", {
-			path: "/editable",
-			model: VariantManagement.INNER_MODEL_NAME
-		});
-	};
-
-	VariantManagement.prototype._setShowSaveAs = function(bValue) {
-		this._setInnerModelProperty("/showSaveAs", bValue);
-	};
-
-	VariantManagement.prototype._setShowFooter = function(bValue) {
-		this._setInnerModelProperty("/editable", bValue);
-	};
-
-	VariantManagement.prototype._setPopoverTitle = function(sText) {
-		this._setInnerModelProperty("/popoverTitle", sText);
-	};
-
-	VariantManagement.prototype._getShowPublic = function() {
-		return this._getInnerModelProperty("/showPublic");
-	};
-	VariantManagement.prototype._setShowPublic = function(bValue) {
-		this._setInnerModelProperty("/showPublic", bValue);
 	};
 
 
-	VariantManagement.prototype._getShowContexts = function() {
-		return this._getInnerModelProperty("/showContexts");
-	};
-	VariantManagement.prototype._setShowContexts = function(bValue) {
-		this._setInnerModelProperty("/showContexts", bValue);
-	};
-
-	VariantManagement.prototype._getShowExecuteOnSelection = function() {
-		return this._getInnerModelProperty("/showExecuteOnSelection");
-	};
-	VariantManagement.prototype._setShowExecuteOnSelection = function(bValue) {
-		this._setInnerModelProperty("/showExecuteOnSelection", bValue);
-	};
-
 	VariantManagement.prototype._getShowCreateTile = function() {
 		return this._getInnerModelProperty("/showCreateTile");
 	};
@@ -576,7 +674,6 @@ sap.ui.define([
 		this._setInnerModelProperty("/showManualVariantKey", bValue);
 	};
 
-
 	VariantManagement.prototype._setInnerModelProperty = function(sPropertyPath, vValue) {
 		var oInnerModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
 		if (oInnerModel) {
@@ -594,153 +691,21 @@ sap.ui.define([
 	};
 
 
-	/**
-	 * Gets the previous default variant key
-	 * @public
-	 * @abstract
-	 * @returns {string} Key of the previous dfault variant
-	 */
-	VariantManagement.prototype.getOriginalDefaultVariantKey = function() {
-	};
-
-	/**
-	 * Sets the default variant key
-	 * @public
-	 * @abstract
-	 * @param {string} sKey - the variant key should be set as default
-	 */
-	VariantManagement.prototype.setDefaultVariantKey = function(sKey) {
-	};
-
-	/**
-	 * Gets the default variant key
-	 * @public
-	 * @abstract
-	 * @returns {string} Key of the  default variant
-	 */
-	VariantManagement.prototype.getDefaultVariantKey = function() {
-	};
-
-	/**
-	 * Sets the currently selected variant key.
-	 * @public
-	 * @abstract
-	 * @param {string} sKey - the new current variant key
-	 */
-	VariantManagement.prototype.setCurrentVariantKey = function(sKey) {
-	};
-
-	/**
-	 * Gets the currently selected variant key.
-	 * @public
-	 * @abstract
-	 * @returns {string} Key of the currently selected variant. In case the model is not yet set <code>null</code> will be returned.
-	 */
-	VariantManagement.prototype.getCurrentVariantKey = function() {
-	};
-
-
-	/**
-	 * Retrieves all variants.
-	 * @public
-	 * @returns {array} All variants. In case the model is not yet set, an empty array will be returned.
-	 */
-	VariantManagement.prototype.getVariants = function() {
-		return this._getItems();
-	};
-
-	/**
-	 * Sets the modified flag
-	 * @public
-	 * @abstract
-	 * @param {boolean} bFlag - represents the variant modify state
-	 */
-	VariantManagement.prototype.setModified = function(bFlag) {
-	};
-
-	/**
-	 * Determines if the current variant is modified.
-	 * @public
-	 * @abstract
-	 * @returns {boolean} If the current variant is modified <code>true</code>, otherwise <code>false</code>
-	 */
-	VariantManagement.prototype.getModified = function() {
-	};
-
-	/**
-	 * Gets the information, if favorites should be shown.
-	 * @public
-	 * @abstract
-	 * @returns {boolean} The information if favorites should be shown
-	 */
-	VariantManagement.prototype.getShowFavorites = function() {
-	};
-
 	/**
 	 * Gets all the variants
 	 * @private
-	 * @abstract
 	 * @returns {array} Of variants
 	 */
 	VariantManagement.prototype._getItems = function() {
+		return this.getItems();
 	};
 
-	/**
-	 * Gets all the binding path
-	 * @private
-	 * @abstract
-	 * @returns {array} Of variants
-	 */
-	VariantManagement.prototype._getBindingPath = function() {
-		return "";
-	};
-
-	/**
-	 * Propagate information about public and save as
-	 * @private
-	 * @abstract
-	 */
-	VariantManagement.prototype._updateInnerModelWithSettingsInfo = function() {
-	};
-
-	/**
-	 * Check if the item is delete enabled.
-	 * @private
-	 * @abstract
-	 * @param {object} oItem - represents the variant
-	 * @returns {boolean} indicator if the item is delete enabled
-	 */
-	VariantManagement.prototype.isItemDeleteEnabled = function(oItem) {
-		return true;
-	};
-
-	/**
-	 * Check if the item is delete enabled.
-	 * @private
-	 * @abstract
-	 * @param {object} oItem - represents the variant
-	 * @returns {boolean} indicator if the item is delete enabled
-	 */
-	VariantManagement.prototype.isItemDeleteVisible = function(oItem) {
-		return oItem.remove;
-	};
-
-	/**
-	 * Check if the item is delete enabled.
-	 * @private
-	 * @abstract
-	 * @param {object} oItem - represents the variant
-	 * @returns {boolean} indicator if the item is delete enabled
-	 */
-	VariantManagement.prototype.isItemRenameAllowed = function(oItem) {
-		return oItem.rename;
-	};
 
 	VariantManagement.prototype.getSelectedVariantText = function(sKey) {
 		var oItem = this._getItemByKey(sKey);
 
 		if (oItem) {
-			return oItem.title;
+			return oItem.getTitle();
 		}
 
 		return "";
@@ -749,7 +714,7 @@ sap.ui.define([
 	VariantManagement.prototype.getStandardVariantKey = function() {
 		var aItems = this._getItems();
 		if (aItems && aItems[0]) {
-			return aItems[0].key;
+			return aItems[0].getKey();
 		}
 
 		return null;
@@ -761,20 +726,46 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype._addDeletedItem = function(oItem) {
-		this._aDeletedItems.push(oItem);
+		var sKey = oItem.getKey();
+		if (this._aDeletedItems.indexOf(sKey) < 0) {
+			this._aDeletedItems.push(sKey);
+		}
 	};
 
 	VariantManagement.prototype._getDeletedItems = function() {
 		return this._aDeletedItems;
 	};
 
+	VariantManagement.prototype._clearRenamedItems = function() {
+		this._aRenamedItems = [];
+	};
+
+	VariantManagement.prototype._addRenamedItem = function(oItem) {
+		var sKey = oItem.getKey();
+		if (this._aRenamedItems.indexOf(sKey) < 0) {
+			this._aRenamedItems.push(sKey);
+		}
+	};
+
+	VariantManagement.prototype._removeRenamedItem = function(oItem) {
+		var sKey = oItem.getKey();
+		var nIdx = this._aRenamedItems.indexOf(sKey);
+		if ( nIdx >= 0) {
+			this._aRenamedItems.splice(nIdx, 1);
+		}
+	};
+
+	VariantManagement.prototype._getRenamedItems = function() {
+		return this._aRenamedItems;
+	};
+
 
 	VariantManagement.prototype._getItemByKey = function(sKey) {
 		var oItem = null;
 		var aItems = this._getItems();
 		if (aItems) {
 			aItems.some(function(oEntry) {
-				if (oEntry.key === sKey) {
+				if (oEntry.getKey() === sKey) {
 					oItem = oEntry;
 				}
 
@@ -785,38 +776,6 @@ sap.ui.define([
 		return oItem;
 	};
 
-	VariantManagement.prototype._rebindControl = function() {
-		this.oVariantText.unbindProperty("text");
-		this.oVariantText.bindProperty("text", {
-			path: 'currentVariant',
-			model: this._sModelName,
-			formatter: function(sKey) {
-				var sText = "";
-				if (sKey) {
-					sText = this.getSelectedVariantText(sKey);
-					this._setInvisibleText(sText, this.getModified());
-				}
-
-				return sText;
-			}.bind(this)
-		});
-
-		this.oVariantModifiedText.unbindProperty("visible");
-		this.oVariantModifiedText.bindProperty("visible", {
-			path: "modified",
-			model: this._sModelName,
-			formatter: function(bValue) {
-				var sKey = this.getCurrentVariantKey();
-
-				if (sKey) {
-					this._setInvisibleText(this.getSelectedVariantText(sKey), bValue);
-				}
-
-				return ((bValue === null) || (bValue === undefined)) ? false : bValue;
-			}.bind(this)
-		});
-	};
-
 
 	VariantManagement.prototype._obtainControl = function(oEvent) {
 		if (oEvent && oEvent.target && oEvent.target.id) {
@@ -879,17 +838,17 @@ sap.ui.define([
 		if (!this.oErrorVariantPopOver) {
 			oVBox = new VBox({
 				fitContainer: true,
-				alignItems: sap.m.FlexAlignItems.Center,
+				alignItems: FlexAlignItems.Center,
 				items: [
 					new Icon({
 						size: "4rem",
 						color: "lightgray",
 						src: "sap-icon://message-error"
 					}), new Title({
-						titleStyle: sap.ui.core.TitleLevel.H2,
+						titleStyle: TitleLevel.H2,
 						text: this._oRb.getText("VARIANT_MANAGEMENT_ERROR_TEXT1")
 					}), new Text({
-						textAlign: sap.ui.core.TextAlign.Center,
+						textAlign: TextAlign.Center,
 						text: this._oRb.getText("VARIANT_MANAGEMENT_ERROR_TEXT2")
 					})
 				]
@@ -900,7 +859,7 @@ sap.ui.define([
 			this.oErrorVariantPopOver = new ResponsivePopover(this.getId() + "-errorpopover", {
 				title: {
 					path: "/popoverTitle",
-					model: VariantManagement.INNER_MODEL_NAME
+					model: "$mVariants"
 				},
 				contentWidth: "400px",
 				placement: PlacementType.VerticalPreferredBottom,
@@ -964,11 +923,22 @@ sap.ui.define([
 				this._handleVariantSave();
 			}.bind(this),
 			visible: {
-				path: "modified",
-				model: this._sModelName,
-				formatter: function(bValue) {
-					return bValue;
+				parts: [{
+					path: '$mVariants>/creationAllowed'
+				},{
+					path: '$mVariants>/modified'
+				},{
+					path: '$mVariants>/selectedKey'
 				}
+				],
+				formatter: function(bCreationAllowed, bModified, sSelectedKey) {
+					var bItemChangeable = false;
+					var oItem = this._getItemByKey(sSelectedKey);
+					if (oItem) {
+						bItemChangeable = oItem.getChangeable();
+					}
+					return bCreationAllowed && bModified && bItemChangeable;
+				}.bind(this)
 			},
 			type: ButtonType.Emphasized,
 			layoutData: new OverflowToolbarLayoutData({
@@ -985,15 +955,22 @@ sap.ui.define([
 				priority: OverflowToolbarPriority.Low
 			}),
 			visible: {
-				path: "/showSaveAs",
-				model: VariantManagement.INNER_MODEL_NAME
+				parts: [{
+					path: '$mVariants>/creationAllowed'
+				},{
+					path: '$mVariants>/showSaveAs'
+				}],
+				formatter: function(bCreationAllowed, bShowSaveAs) {
+					return bCreationAllowed && bShowSaveAs;
+				}
 			}
+
 		});
 
 		this.oVariantList = new SelectList(this.getId() + "-list", {
 			selectedKey: {
-				path: this._checkForFinalBindingPath("currentVariant"),
-				model: this._sModelName
+				path: "/selectedKey",
+				model: "$mVariants"
 			},
 			itemPress: function(oEvent) {
 				var sSelectionKey = null;
@@ -1005,7 +982,7 @@ sap.ui.define([
 				}
 				if (sSelectionKey) {
 					// this.setModified(false);
-					this.setCurrentVariantKey(sSelectionKey);
+					this.setSelectedKey(sSelectionKey);
 
 					this.fireSelect({
 						key: sSelectionKey
@@ -1016,14 +993,16 @@ sap.ui.define([
 		});
 		this.oVariantList.setNoDataText(this._oRb.getText("VARIANT_MANAGEMENT_NODATA"));
 
-		var oItemTemplate = new sap.ui.core.Item({
-			key: '{' + this._sModelName + ">key}",
-			text: '{' + this._sModelName + ">title}"
+
+		var oItemTemplate = new Item({
+			key: "{$mVariants>key}",
+			text: "{$mVariants>title}"
 		});
 
+
 		this.oVariantList.bindAggregation("items", {
-			path: this._checkForFinalBindingPath("variants"),
-			model: this._sModelName,
+			path: "/items",
+			model: "$mVariants",
 			template: oItemTemplate
 		});
 
@@ -1048,21 +1027,17 @@ sap.ui.define([
 			}),
 			showNavButton: false,
 			showHeader: false
-//			showFooter: {
-//				path: "/editable",
-//				model: VariantManagement.INNER_MODEL_NAME
-//			}
 		});
 
 		this.oVariantSelectionPage.bindProperty("showFooter", {
-			path: "/editable",
-			model: VariantManagement.INNER_MODEL_NAME
+			path: "/showFooter",
+			model: "$mVariants"
 		});
 
 		this.oVariantPopOver = new ResponsivePopover(this.getId() + "-popover", {
 			title: {
 				path: "/popoverTitle",
-				model: VariantManagement.INNER_MODEL_NAME
+				model: "$mVariants"
 			},
 			titleAlignment: "Auto",
 			contentWidth: "400px",
@@ -1094,29 +1069,22 @@ sap.ui.define([
 		// this.oVariantList.getBinding("items").filter(this._getFilters());
 	};
 
-	/**
-	 * Hide or show <i>Save</i> button and emphasize "most positive action" - either <i>Save</i> button if it is visible, or <i>Save As</i> button if <i>Save</i> is hidden.
-	 * @param {boolean} bShow - Indicator if <i>Save</i> button should be visible
-	 * @private
-	 */
-	VariantManagement.prototype.showSaveButton = function(bShow) {
-		if (bShow === false) {
-			this.oVariantSaveAsBtn.setType(ButtonType.Emphasized);
-			this.oVariantSaveBtn.setVisible(false);
-		} else {
+
+	VariantManagement.prototype._determineEmphasizedFooterButton = function() {
+		if (this.oVariantSaveBtn.getVisible()) {
+			this.oVariantSaveBtn.setType(ButtonType.Emphasized);
 			this.oVariantSaveAsBtn.setType(ButtonType.Default);
-			this.oVariantSaveBtn.setVisible(true);
+		} else {
+			this.oVariantSaveAsBtn.setType(ButtonType.Emphasized);
 		}
 	};
 
-
-	VariantManagement.prototype._checkForFinalBindingPath = function(sPath) {
-		return this._getBindingPath() ? sPath : ('/' + sPath);
+	VariantManagement.prototype.setModified = function(bValue) {
+		this.setProperty("modified", bValue);
+		return this;
 	};
 
 	VariantManagement.prototype._openVariantList = function() {
-		var oItem;
-
 		if (this.getInErrorState()) {
 			this._openInErrorState();
 			return;
@@ -1126,11 +1094,6 @@ sap.ui.define([
 			return;
 		}
 
-		// proceed only if context is available
-//		if (!this.oContext) {
-//			return;
-//		}
-
 		this._createVariantList();
 		this._oSearchField.setValue("");
 
@@ -1138,13 +1101,11 @@ sap.ui.define([
 
 		this.oVariantSelectionPage.setShowSubHeader(this.oVariantList.getItems().length > 9);
 
-		this.showSaveButton(false);
+		this._determineEmphasizedFooterButton();
 
-		if (this.getModified()) {
-			oItem = this._getItemByKey(this.getCurrentVariantKey());
-			if (oItem && oItem.change) {
-				this.showSaveButton(true);
-			}
+		var oSelectedItem = this.oVariantList.getSelectedItem();
+		if (oSelectedItem) {
+			this.oVariantPopOver.setInitialFocus(oSelectedItem.getId());
 		}
 
 		var oControlRef = this._oCtrlRef ? this._oCtrlRef : this.oVariantLayout;
@@ -1192,8 +1153,8 @@ sap.ui.define([
 			this.oDefault = new CheckBox(this.getId() + "-default", {
 				text: this._oRb.getText("VARIANT_MANAGEMENT_SETASDEFAULT"),
 				visible: {
-					path: "/showSetAsDefault",
-					model: VariantManagement.INNER_MODEL_NAME
+					path: "/supportDefault",
+					model: "$mVariants"
 				},
 				width: "100%"
 			});
@@ -1201,8 +1162,8 @@ sap.ui.define([
 			this.oPublic = new CheckBox(this.getId() + "-public", {
 				text: this._oRb.getText("VARIANT_MANAGEMENT_SETASPUBLIC"),
 				visible: {
-					path: "/showPublic",
-					model: VariantManagement.INNER_MODEL_NAME
+					path: "/supportPublic",
+					model: "$mVariants"
 				},
 				width: "100%"
 			});
@@ -1210,8 +1171,8 @@ sap.ui.define([
 			this.oExecuteOnSelect = new CheckBox(this.getId() + "-execute", {
 				text: this._oRb.getText("VARIANT_MANAGEMENT_EXECUTEONSELECT"),
 				visible: {
-					path: "/showExecuteOnSelection",
-					model: VariantManagement.INNER_MODEL_NAME
+					path: "/supportApplyAutomatically",
+					model: "$mVariants"
 				},
 				width: "100%"
 			});
@@ -1283,7 +1244,7 @@ sap.ui.define([
 					this._bSaveOngoing = false;
 
 					if (this._sStyleClass) {
-						this._setShowPublic(this._bShowPublic);
+						this.setSupportPublic(this._bShowPublic);
 						this.oSaveAsDialog.removeStyleClass(this._sStyleClass);
 
 						if (this._oRolesComponentContainer) {
@@ -1293,6 +1254,7 @@ sap.ui.define([
 						this._sStyleClass = undefined;
 						this._oRolesComponentContainer = null;
 					}
+
 				}.bind(this),
 				beginButton: this.oSaveSave,
 				endButton: new Button(this.getId() + "-variantcancel", {
@@ -1411,10 +1373,10 @@ sap.ui.define([
 	VariantManagement.prototype._openRolesDialog = function(oItem, oTextControl) {
 		this._createRolesDialog();
 
-		this._oCurrentContextsKey = oItem.key;
+		this._oCurrentContextsKey = oItem.getKey();
 		this._oTextControl = oTextControl;
 
-		this._setSelectedContexts(oItem.contexts);
+		this._setSelectedContexts(oItem.getContexts());
 
 		this._oRolesDialog.open();
 	};
@@ -1428,7 +1390,7 @@ sap.ui.define([
 
 						var oItem = this._getItemByKey(sKey);
 						if (oItem) {
-							oItem.contexts = mContexts;
+							oItem.setContexts(mContexts);
 							this._determineRolesSpecificText(mContexts, oTextControl);
 						}
 					} else {
@@ -1464,20 +1426,23 @@ sap.ui.define([
 
 	/**
 	 * Opens the <i>Save As</i> dialog.
-	 * @param {string} sRtaStyleClassName - style-class to be used
+	 * @param {string} sStyleClassName - style-class to be used
 	 * @param {object} oRolesComponentContainer - component for roles handling
 	 */
-	VariantManagement.prototype.openSaveAsDialogForKeyUser = function (sRtaStyleClassName, oRolesComponentContainer) {
+	VariantManagement.prototype.openSaveAsDialog = function (sStyleClassName, oRolesComponentContainer) {
 		this._openSaveAsDialog(true);
-		this.oSaveAsDialog.addStyleClass(sRtaStyleClassName);
-		this._sStyleClass = sRtaStyleClassName; // indicates that dialog is running in key user scenario
+		this.oSaveAsDialog.addStyleClass(sStyleClassName);
+		this._sStyleClass = sStyleClassName; // indicates that dialog is running in key user scenario
 
-		this._bShowPublic = this._getShowPublic();
-		this._setShowPublic(false);
+		this._bShowPublic = this.getSupportPublic();
+		this.setSupportPublic(false);
 
 		if (oRolesComponentContainer) {
 			Promise.all([oRolesComponentContainer]).then(function(vArgs) {
 				this._oRolesComponentContainer = vArgs[0];
+
+				this.setSupportContexts(!!this._oRolesComponentContainer );
+
 				this._checkAndAddRolesContainerToSaveAsDialog();
 
 				this.oSaveAsDialog.open();
@@ -1487,10 +1452,13 @@ sap.ui.define([
 		}
 	};
 
+
 	VariantManagement.prototype._openSaveAsDialog = function(bDoNotOpen) {
 		this._createSaveAsDialog();
 
-		this.oInputName.setValue(this.getSelectedVariantText(this.getCurrentVariantKey()));
+		this.setSupportContexts(false);
+
+		this.oInputName.setValue(this.getSelectedVariantText(this.getSelectedKey()));
 		this.oInputName.setEnabled(true);
 		this.oInputName.setValueState(ValueState.None);
 		this.oInputName.setValueStateText(null);
@@ -1520,7 +1488,7 @@ sap.ui.define([
 		}
 	};
 
-	VariantManagement.prototype._handleVariantSaveAs = function(sNewVariantName, bKeyUser) {
+	VariantManagement.prototype._handleVariantSaveAs = function(sNewVariantName) {
 		var sKey = null;
 		var sName = sNewVariantName.trim();
 		var sManualKey = this.oInputManualKey.getValue().trim();
@@ -1544,14 +1512,8 @@ sap.ui.define([
 			this.oSaveAsDialog.close();
 		}
 
-//		if (this.oDefault.getSelected()) {
-//			this.setDefaultVariantKey(sKey);
-//		}
-
-		this.setModified(false);
-
-		if (bKeyUser) {
-			return true;
+		if (this.oDefault.getSelected()) {
+			this.setDefaultKey(this.oDefault.getSelected());
 		}
 
 		var oObj = {
@@ -1560,11 +1522,11 @@ sap.ui.define([
 				overwrite: false,
 				def: this.oDefault.getSelected(),
 				execute: this.oExecuteOnSelect.getSelected(),
-				"public": this._sStyleClass ? undefined : this.oPublic.getSelected(),
-				contexts: this._sStyleClass ? this._getContextInfoChanges() : undefined
+				"public": this.getSupportPublic() ? this.oPublic.getSelected() : undefined,
+				contexts: this._getContextInfoChanges()
 		};
 
-		if (!this._sStyleClass && this._getShowCreateTile() && this.oCreateTile) {
+		if (this._getShowCreateTile() && this.oCreateTile) {
 			oObj.tile = this.oCreateTile.getSelected();
 		}
 
@@ -1580,18 +1542,18 @@ sap.ui.define([
 					return this._getSelectedContexts();
 				}
 			} catch (ex) {
-				return null;
+				return undefined;
 			}
 		}
 
-		return null;
+		return undefined;
 	};
 
 	VariantManagement.prototype._handleVariantSave = function() {
-		var oItem = this._getItemByKey(this.getCurrentVariantKey());
+		var oItem = this._getItemByKey(this.getSelectedKey());
 
 		var bDefault = false;
-		if (this.getDefaultVariantKey() === oItem.key) {
+		if (this.getDefaultKey() === oItem.getKey()) {
 			bDefault = true;
 		}
 
@@ -1600,40 +1562,47 @@ sap.ui.define([
 		}
 
 		this.fireSave({
-			name: oItem.title,
+			name: oItem.getTitle(),
 			overwrite: true,
-			key: oItem.key,
+			key: oItem.getKey(),
 			def: bDefault
 		});
-
-		this.setModified(false);
 	};
 
 	// Manage Views dialog
 
+	VariantManagement.prototype.destroyManageDialog = function() {
+		if (this.oManagementDialog) {
+			this.oManagementDialog.destroy();
+			this.oManagementDialog = undefined;
+		}
+	};
+
 	/**
 	 * Opens the <i>Manage Views</i> dialog.
 	 * @param {boolean} bCreateAlways - Indicates that if this is set to <code>true</code>, the former dialog will be destroyed before a new one is created
-	 * @param {string} sClass - style-class to be used
+	 * @param {string} sStyleClass - style-class to be used
 	 * @param {object} oRolesComponentContainer - component for roles handling
 	 */
-	VariantManagement.prototype.openManagementDialog = function(bCreateAlways, sClass, oRolesComponentContainer) {
+	VariantManagement.prototype.openManagementDialog = function(bCreateAlways, sStyleClass, oRolesComponentContainer) {
 		if (bCreateAlways && this.oManagementDialog) {
 			this.oManagementDialog.destroy();
 			this.oManagementDialog = undefined;
 		}
 
-		if (sClass) {
-			this._sStyleClass = sClass;
-			this._bShowPublic = this._getShowPublic();
-			this._setShowPublic(false);
+		if (sStyleClass) {
+			this._sStyleClass = sStyleClass;
+			this._bShowPublic = this.getSupportPublic();
+			this.setSupportPublic(false);
+
+			this.setSupportContexts(false);
 		}
 
 		if (oRolesComponentContainer) {
 			Promise.all([oRolesComponentContainer]).then(function(vArgs) {
 				this._oRolesComponentContainer = vArgs[0];
 
-				this._setShowContexts(!!this._oRolesComponentContainer);
+				this.setSupportContexts(!!this._oRolesComponentContainer);
 				this._openManagementDialog();
 
 				if (this._sStyleClass) {
@@ -1641,7 +1610,6 @@ sap.ui.define([
 				}
 			}.bind(this));
 		} else {
-			this._setShowContexts(false);
 			this._openManagementDialog();
 
 			if (this._sStyleClass) {
@@ -1660,7 +1628,17 @@ sap.ui.define([
 			return;
 		}
 
-		var sValue = parameters.newValue ? parameters.newValue : "";
+		var sValue;
+		if (parameters.query) {
+			sValue = parameters.query;
+		} else {
+			sValue = parameters.newValue ? parameters.newValue : "";
+		}
+
+		this._triggerSearchInManageDialogByValue(sValue, oManagementTable);
+	};
+
+	VariantManagement.prototype._triggerSearchInManageDialogByValue = function(sValue, oManagementTable) {
 
 		var aFilters = [
 			this._getVisibleFilter(), new Filter({
@@ -1690,16 +1668,18 @@ sap.ui.define([
 
 	VariantManagement.prototype._createManagementDialog = function() {
 		if (!this.oManagementDialog || this.oManagementDialog.bIsDestroyed) {
+
 			this.oManagementTable = new Table(this.getId() + "-managementTable", {
 				contextualWidth: "Auto",
 				fixedLayout: false,
 				growing: true,
+				keyboardMode: ListKeyboardMode.Edit,
 				columns: [
 					new Column({
 						width: "3rem",
 						visible: {
-							path: this._checkForFinalBindingPath("showFavorites"),
-							model: this._sModelName
+							path: "/supportFavorites",
+							model: "$mVariants"
 						}
 					}), new Column({
 						header: new Text({
@@ -1712,8 +1692,8 @@ sap.ui.define([
 							wrappingType: "Hyphenated"
 						}),
 						visible: {
-							path: "/showPublic",
-							model: VariantManagement.INNER_MODEL_NAME
+							path: "/supportPublic",
+							model: "$mVariants"
 						},
 						demandPopin: true,
 						popinDisplay: PopinDisplay.Inline,
@@ -1728,8 +1708,8 @@ sap.ui.define([
 						popinDisplay: PopinDisplay.Block,
 						minScreenWidth: ScreenSize.Tablet,
 						visible: {
-							path: "/showSetAsDefault",
-							model: VariantManagement.INNER_MODEL_NAME
+							path: "/supportDefault",
+							model: "$mVariants"
 						}
 					}), new Column({
 						header: new Text({
@@ -1741,8 +1721,8 @@ sap.ui.define([
 						popinDisplay: PopinDisplay.Block,
 						minScreenWidth: ScreenSize.Tablet,
 						visible: {
-							path: "/showExecuteOnSelection",
-							model: VariantManagement.INNER_MODEL_NAME
+							path: "/supportApplyAutomatically",
+							model: "$mVariants"
 						}
 					}), new Column({
 						header: new Text({
@@ -1754,8 +1734,8 @@ sap.ui.define([
 						popinDisplay: PopinDisplay.Inline,
 						minScreenWidth: ScreenSize.Tablet,
 						visible: {
-							path: "/showContexts",
-							model: VariantManagement.INNER_MODEL_NAME
+							path: "/supportContexts",
+							model: "$mVariants"
 						}
 					}), new Column({
 						header: new Text({
@@ -1778,6 +1758,7 @@ sap.ui.define([
 				type: ButtonType.Emphasized,
 				press: function() {
 					this._handleManageSavePressed();
+					//this.oManagementDialog.close();
 				}.bind(this)
 			});
 
@@ -1785,8 +1766,10 @@ sap.ui.define([
 				text: this._oRb.getText("VARIANT_MANAGEMENT_CANCEL"),
 				press: function() {
 					this._resumeManagementTableBinding();
-					this.oManagementDialog.close();
 					this._handleManageCancelPressed();
+					if (this.oManagementDialog) { // can be deleted during manageCancel event
+						this.oManagementDialog.close();
+					}
 				}.bind(this)
 			});
 
@@ -1799,7 +1782,7 @@ sap.ui.define([
 				endButton: this.oManagementCancel,
 				afterClose: function() {
 					if (this._sStyleClass) {
-						this._setShowPublic(this._bShowPublic);
+						this.setSupportPublic(this._bShowPublic, true);
 						this.oManagementDialog.removeStyleClass(this._sStyleClass);
 						this._sStyleClass = undefined;
 						this._oRolesComponentContainer = null;
@@ -1821,6 +1804,10 @@ sap.ui.define([
 				this._triggerSearchInManageDialog(oEvent, this.oManagementTable);
 			}.bind(this));
 
+			this._oSearchFieldOnMgmtDialog.attachSearch(function(oEvent) {
+				this._triggerSearchInManageDialog(oEvent, this.oManagementTable);
+			}.bind(this));
+
 			var oSubHeader = new Bar(this.getId() + "-mgmHeaderSearch", {
 				contentMiddle: [
 					this._oSearchFieldOnMgmtDialog
@@ -1828,14 +1815,16 @@ sap.ui.define([
 			});
 			this.oManagementDialog.setSubHeader(oSubHeader);
 
+			this.oManagementDialog.setInitialFocus(this._oSearchFieldOnMgmtDialog);
+
 			if (this.oVariantLayout.$().closest(".sapUiSizeCompact").length > 0) {
 				this.oManagementDialog.addStyleClass("sapUiSizeCompact");
 			}
 			this.addDependent(this.oManagementDialog);
 
 			this.oManagementTable.bindAggregation("items", {
-				path: this._checkForFinalBindingPath("variants"),
-				model: this._sModelName,
+				path: "/items",
+				model: "$mVariants",
 				factory: this._templateFactoryManagementDialog.bind(this),
 				filters: this._getVisibleFilter()
 			});
@@ -1855,33 +1844,41 @@ sap.ui.define([
 	VariantManagement.prototype._templateFactoryManagementDialog = function(sId, oContext) {
 		var sTooltip = null;
 		var oDeleteButton;
-		var sBindingPath;
 		var oNameControl;
 		var oExecuteOnSelectCtrl;
 		var oRolesCell;
 		var oItem = oContext.getObject();
 		if (!oItem) {
+			Log.error("couldn't obtain the item for '" + oContext.getPath() + "'");
 			return undefined;
 		}
 
+		var nPos = this._determineIndex(oContext.getPath());
+		if (nPos < 0) {
+			Log.error("couldn't obtain item position for '" + oContext.getPath() + "'");
+			return undefined;
+		}
+
+		var sIdPrefix = this.getId() + "-manage";
+
+		var sModelName = "$mVariants";
+
 		var fLiveChange = function(oEvent) {
-			this._checkVariantNameConstraints(oEvent.oSource, oEvent.oSource.getBindingContext(this._sModelName).getObject().key);
+			var oItem = oEvent.oSource.getBindingContext(sModelName).getObject();
+			this._handleManageTitleChange(oEvent.oSource, oItem);
 		}.bind(this);
 
 		var fChange = function(oEvent) {
-			this._handleManageTitleChanged(oEvent.oSource.getBindingContext(this._sModelName).getObject());
+			var oItem = oEvent.oSource.getBindingContext(sModelName).getObject();
+			this._handleManageTitleChange(oEvent.oSource, oItem);
 		}.bind(this);
 
 		var fSelectRB = function(oEvent) {
-			this._handleManageDefaultVariantChange(oEvent.oSource, oEvent.oSource.getBindingContext(this._sModelName).getObject(), oEvent.getParameters().selected);
-		}.bind(this);
-
-		var fSelectCB = function(oEvent) {
-			this._handleManageExecuteOnSelectionChanged(oEvent.oSource.getBindingContext(this._sModelName).getObject());
+			this._handleManageDefaultVariantChange(oEvent.oSource, oEvent.oSource.getBindingContext(sModelName).getObject(), oEvent.getParameters().selected);
 		}.bind(this);
 
 		var fPress = function(oEvent) {
-			this._handleManageDeletePressed(oEvent.oSource.getBindingContext(this._sModelName).getObject());
+			this._handleManageDeletePressed(oEvent.oSource.getBindingContext(sModelName).getObject());
 			var oListItem = oEvent.oSource.getParent();
 			if (oListItem) {
 				oListItem.setVisible(false);
@@ -1891,141 +1888,132 @@ sap.ui.define([
 		}.bind(this);
 
 		var fSelectFav = function(oEvent) {
-			this._handleManageFavoriteChanged(oEvent.oSource, oEvent.oSource.getBindingContext(this._sModelName).getObject());
+			this._handleManageFavoriteChanged(oEvent.oSource, oEvent.oSource.getBindingContext(sModelName).getObject());
 		}.bind(this);
 
 		var fRolesPressed = function(oEvent) {
-			var oItem = oEvent.oSource.getBindingContext(this._sModelName).getObject();
+			var oItem = oEvent.oSource.getBindingContext(sModelName).getObject();
 			this._openRolesDialog(oItem, oEvent.oSource.getParent().getItems()[0]);
 		}.bind(this);
 
-		var bRenameEnabled = this.isItemRenameAllowed(oItem);
-		if (bRenameEnabled) {
-			oNameControl = new Input({
+		if (oItem.getRename()) {
+			oNameControl = new Input(sIdPrefix + "-input-" + nPos, {
 				liveChange: fLiveChange,
 				change: fChange,
-				value: '{' + this._sModelName + ">title}"
+				value: '{' + sModelName + ">title}"
 			});
+
+			if (oItem.getTitle() !== oItem.getOriginalTitle()) {
+				this._verifyVariantNameConstraints(oNameControl, oItem.getKey(), oItem.getTitle());
+			}
+
+
 		} else {
-			oNameControl = new ObjectIdentifier({
-				title: '{' + this._sModelName + ">title}"
+			oNameControl = new ObjectIdentifier(sIdPrefix + "-text-" + nPos, {
+				title: '{' + sModelName + ">title}"
 			});
 			if (sTooltip) {
 				oNameControl.setTooltip(sTooltip);
 			}
 		}
 
-		var bDeleteEnabled = this.isItemDeleteEnabled(oItem);
-		var bDeleteVisible = this.isItemDeleteVisible(oItem);
-
-		oDeleteButton = new Button({
+		oDeleteButton = new Button(sIdPrefix + "-del-" + nPos, {
 			icon: "sap-icon://decline",
-			enabled: bDeleteEnabled,
+			enabled: true,
 			type: ButtonType.Transparent,
 			press: fPress,
 			tooltip: this._oRb.getText("VARIANT_MANAGEMENT_DELETE"),
-			visible: bDeleteVisible
+			visible: oItem.getRemove()
 		});
 
-
-
-		this._assignColumnInfoForDeleteButton(oDeleteButton);
-
-		sBindingPath = this._getBindingPath();
-
-		var oFavoriteIcon = new Icon({
+		var oFavoriteIcon = new Icon(sIdPrefix + "-fav-" + nPos, {
 			src: {
 				path: "favorite",
-				model: this._sModelName,
+				model: sModelName,
 				formatter: function(bFlagged) {
 					return bFlagged ? "sap-icon://favorite" : "sap-icon://unfavorite";
 				}
 			},
 			tooltip: {
 				path: 'favorite',
-				model: this._sModelName,
+				model: sModelName,
 				formatter: function(bFlagged) {
 					return this._oRb.getText(bFlagged ? "VARIANT_MANAGEMENT_FAV_DEL_TOOLTIP" : "VARIANT_MANAGEMENT_FAV_ADD_TOOLTIP");
 				}.bind(this)
 			},
-			press: fSelectFav
+			press: fSelectFav,
+			decorative: false
 		});
 
-		if ((this.getStandardVariantKey() === oItem.key) || (this.getDefaultVariantKey() === oItem.key)) {
+		if ((this.getStandardVariantKey() === oItem.getKey()) || (this.getDefaultKey() === oItem.getKey())) {
 			oFavoriteIcon.addStyleClass("sapMVarMngmtFavNonInteractiveColor");
 		} else {
 			oFavoriteIcon.addStyleClass("sapMVarMngmtFavColor");
 		}
 
-		if (this.getDisplayTextForExecuteOnSelectionForStandardVariant() && (this.getStandardVariantKey() === oItem.key)) {
-			oExecuteOnSelectCtrl = new CheckBox(this.getId() + "-manage-exe-0",{
+		if (this.getDisplayTextForExecuteOnSelectionForStandardVariant() && (this.getStandardVariantKey() === oItem.getKey())) {
+			oExecuteOnSelectCtrl = new CheckBox(sIdPrefix + "-exe-" + nPos, {
 				wrapping: true,
-				text: this.getDisplayTextForExecuteOnSelectionForStandardVariant(),
-				select: fSelectCB,
-				selected: '{' + this._sModelName + ">executeOnSelect}"
-			});
-		} else if (this.getStandardVariantKey() === oItem.key) {
-			oExecuteOnSelectCtrl = new CheckBox(this.getId() + "-manage-exe-0",{
-				text: "",
-				select: fSelectCB,
-				selected: '{' + this._sModelName + ">executeOnSelect}"
+				text: '{' + sModelName + ">/displayTextForExecuteOnSelectionForStandardVariant}",
+				selected: '{' + sModelName + ">executeOnSelect}"
 			});
 		} else {
-			oExecuteOnSelectCtrl = new CheckBox({
+			oExecuteOnSelectCtrl = new CheckBox(sIdPrefix + "-exe-" + nPos, {
 				text: "",
-				select: fSelectCB,
-				selected: '{' + this._sModelName + ">executeOnSelect}"
+				selected: '{' + sModelName + ">executeOnSelect}"
 			});
 		}
 
 		// roles
-		if (this._sStyleClass && (oItem.key !== this.getStandardVariantKey())) {
+		if (this._sStyleClass && (oItem.getKey() !== this.getStandardVariantKey())) {
 			var oText = new Text({ wrapping: false });
-			this._determineRolesSpecificText(oItem.contexts, oText);
+			this._determineRolesSpecificText(oItem.getContexts(), oText);
 			var oIcon = new Icon({
 				src: "sap-icon://edit",
 				press: fRolesPressed
 			});
 			oIcon.addStyleClass("sapMVarMngmtRolesEdit");
 			oIcon.setTooltip(this._oRb.getText("VARIANT_MANAGEMENT_VISIBILITY_ICON_TT"));
-			oRolesCell = new HBox({
+			oRolesCell = new HBox(sIdPrefix + "-role-" + nPos, {
 				items: [oText, oIcon]
 			});
 		} else {
 			oRolesCell = new Text();
 		}
 
+
 		return new ColumnListItem({
 			cells: [
-				oFavoriteIcon, oNameControl, new Text({
+				oFavoriteIcon, oNameControl, new Text(sIdPrefix + "-type-" + nPos, {
 					text: {
 						path: "sharing",
-						model: this._sModelName,
+						model: sModelName,
 						formatter: function(sValue) {
 							return this._oRb.getText(sValue === "private" ? "VARIANT_MANAGEMENT_PRIVATE" : "VARIANT_MANAGEMENT_PUBLIC");
 						}.bind(this)
 					},
 					textAlign: "Center"
-				}), new RadioButton({
+				}), new RadioButton(sIdPrefix + "-def-" + nPos, {
 					groupName: this.getId(),
 					select: fSelectRB,
 					selected: {
-						path: sBindingPath + "/defaultVariant",
-						model: this._sModelName,
+						path: "/defaultKey",
+						model: sModelName,
 						formatter: function(sKey) {
-							return oItem.key === sKey;
+							return oItem.getKey() === sKey;
 						}
 					}
-				}), oExecuteOnSelectCtrl, oRolesCell, new Text({
-					text: '{' + this._sModelName + ">author}",
+				}), oExecuteOnSelectCtrl, oRolesCell, new Text(sIdPrefix + "-author-" + nPos, {
+					text: '{' + sModelName + ">author}",
 					textAlign: "Begin"
 				}), oDeleteButton, new Text({
-					text: '{' + this._sModelName + ">key}"
+					text: '{' + sModelName + ">key}"
 				})
 			]
 		});
 	};
 
+
 	VariantManagement.prototype._openManagementDialog = function() {
 		this._createManagementDialog();
 
@@ -2036,39 +2024,25 @@ sap.ui.define([
 		this._suspendManagementTableBinding();
 
 		this._clearDeletedItems();
-		//		this.oManagementSave.setEnabled(false);
+		this._clearRenamedItems();
+		this._sDefaultKey = this.getDefaultKey();
+		this._sOriginalDefaultKey = this._sDefaultKey;
+
+
 		this._oSearchFieldOnMgmtDialog.setValue("");
 
-		// Ideally, this should be done only once in <code>_createtManagementDialog</code>. However, the binding does not recognize a change if filtering is involved.
+		// Ideally, this should be done only once in <code>_createManagementDialog</code>. However, the binding does not recognize a change if filtering is involved.
 		// After a deletion on the UI, the item is filtered out <code>.visible=false</code>. The real deletion will occur only when <i>OK</i> is pressed.
 		// Since the filtered items and the result after the real deletion are identical, no change is detected. Based on this, the context on the table is
 		// not invalidated....
 		// WA: Always do the binding while opening the dialog.
 		if (this._bDeleteOccured) {
 			this._bDeleteOccured = false;
-			this.oManagementTable.bindAggregation("items", {
-				path: "variants",
-				model: this._sModelName,
-				factory: this._templateFactoryManagementDialog.bind(this),
-				filters: this._getVisibleFilter()
-			});
-		}
 
-		this.oManagementDialog.open();
-	};
-
-	VariantManagement.prototype._assignColumnInfoForDeleteButton = function(oDeleteButton) {
-		if (!this._oInvisibleDeleteColumnName) {
-			this._oInvisibleDeleteColumnName = new InvisibleText({
-				text: this._oRb.getText("VARIANT_MANAGEMENT_ACTION_COLUMN")
-			});
-
-			this.oManagementDialog.addContent(this._oInvisibleDeleteColumnName);
+			this.oManagementTable.getBinding("items").filter(this._getVisibleFilter());
 		}
 
-		if (this._oInvisibleDeleteColumnName) {
-			oDeleteButton.addAriaLabelledBy(this._oInvisibleDeleteColumnName);
-		}
+		this.oManagementDialog.open();
 	};
 
 	VariantManagement.prototype._toggleIconActivityState = function(oIcon, oItem, bToInActive) {
@@ -2076,7 +2050,7 @@ sap.ui.define([
 			return;
 		}
 
-		if (oItem.key === this.getStandardVariantKey()) {
+		if (oItem.getKey() === this.getStandardVariantKey()) {
 			return;
 		}
 
@@ -2089,19 +2063,36 @@ sap.ui.define([
 		}
 	};
 
+
+	VariantManagement.prototype._handleManageTitleChange = function(oInput, oItem) {
+		this._checkVariantNameConstraints(oInput, oItem.getKey());
+
+		this._addRenamedItem(oItem);
+	};
+
 	VariantManagement.prototype._handleManageDefaultVariantChange = function(oRadioButton, oItem, bSelected) {
-		var sKey = oItem.key;
+		var sKey = oItem.getKey();
 
 		if (oRadioButton) {
 			var oIcon = oRadioButton.getParent().getCells()[VariantManagement.COLUMN_FAV_IDX];
 
 			if (bSelected) {
-				if (this.getShowFavorites() && !oItem.favorite) {
-					oItem.favorite = true;
-					this._setFavoriteIcon(oIcon, true);
+				if (this.getSupportFavorites() && !oItem.getFavorite()) {
+					oItem.setFavorite(true);
+
+					var oRow = this._getRowForKey(oItem.getKey());
+					if (oRow) {
+						var aCells = oRow.getCells();
+						if (aCells) {
+							oIcon = aCells[VariantManagement.COLUMN_FAV_IDX];
+							this._setFavoriteIcon(oIcon, true);
+
+							aCells[VariantManagement.COLUMN_FAV_IDX + 3].focus();  // focus on default
+						}
+					}
 				}
 
-				this.setDefaultVariantKey(sKey);
+				this.setDefaultKey(sKey);
 			}
 
 			this._toggleIconActivityState(oIcon, oItem, bSelected);
@@ -2109,51 +2100,74 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype._handleManageCancelPressed = function() {
-		var sDefaultVariantKey;
-		var oModel;
-		this._getDeletedItems().forEach(function(oItem) {
-			oItem.visible = true;
-		});
 
-		this._getItems().forEach(function(oItem) {
-			oItem.title = oItem.originalTitle;
-			oItem.favorite = oItem.originalFavorite;
-			oItem.executeOnSelect = oItem.originalExecuteOnSelect;
-			oItem.contexts = oItem.originalContexts;
+		if (this._getDeletedItems().length > 0) {
+			this._bDeleteOccured = true;
+
+			this._getDeletedItems().forEach(function(sKey) {
+				var oItem = this._getItemByKey(sKey);
+				if (oItem) {
+					oItem.setVisible(true);
+				}
+			}.bind(this));
+		}
+
+		this.getItems().forEach(function(oItem) {
+			if (oItem.getVisible()) {
+				oItem.setTitle(oItem.getOriginalTitle());
+				oItem.setFavorite(oItem.getOriginalFavorite());
+				oItem.setExecuteOnSelect(oItem.getOriginalExecuteOnSelect());
+				oItem.setContexts(oItem.getOriginalContexts());
+			}
 		});
 
-		sDefaultVariantKey = this.getOriginalDefaultVariantKey();
-		if (sDefaultVariantKey !== this.getDefaultVariantKey()) {
-			this.setDefaultVariantKey(sDefaultVariantKey);
+		if (this._sOriginalDefaultKey !== this.getDefaultKey()) {
+			this.setDefaultKey(this._sOriginalDefaultKey);
 		}
 
-		oModel = this.getModel(this._sModelName);
-		if (oModel) {
-			oModel.checkUpdate();
+		this._clearRenamedItems();
+		this._clearDeletedItems();
+
+		if (this._oManagedObjectModel) {
+			this._oManagedObjectModel.checkUpdate();
 		}
+
+		this.fireManageCancel();
+
+		//fireManageCancel may have deleted the ManageViews dialog
+//		if (this.oManagementDialog) {
+//			this.oManagementTable.getBinding("items").filter(this._getVisibleFilter());
+//		}
 	};
 
 	VariantManagement.prototype._handleManageFavoriteChanged = function(oIcon, oItem) {
 		//		if (!this._anyInErrorState(this.oManagementTable)) {
 		//			this.oManagementSave.setEnabled(true);
 		//		}
-		if (this.getStandardVariantKey() === oItem.key) {
+		if (this.getStandardVariantKey() === oItem.getKey()) {
 			return;
 		}
 
-		if ((this.getDefaultVariantKey() === oItem.key) && oItem.favorite) {
+		if ((this.getDefaultKey() === oItem.getKey()) && oItem.getFavorite()) {
 			return;
 		}
 
-		oItem.favorite = !oItem.favorite;
-		this._setFavoriteIcon(oIcon, oItem.favorite);
+		oItem.setFavorite(!oItem.getFavorite());
+		var oRow = this._getRowForKey(oItem.getKey());
+		if (oRow) {
+			oRow.getCells()[VariantManagement.COLUMN_FAV_IDX].focus();
+		}
 	};
 
+
+
 	VariantManagement.prototype._getRowForKey = function(sKey) {
 		var oRowForKey = null;
 		if (this.oManagementTable) {
 			this.oManagementTable.getItems().some(function(oRow) {
-				if (sKey === oRow.getCells()[0].getBindingContext(this._sModelName).getObject().key) {
+				var oColumnItem = oRow.getCells()[0].getParent();
+				var oItem = this.getModel("$mVariants").getObject(oColumnItem.getBindingContextPath());
+				if (sKey === oItem.getKey()) {
 					oRowForKey = oRow;
 				}
 
@@ -2164,50 +2178,104 @@ sap.ui.define([
 		return oRowForKey;
 	};
 
+	VariantManagement.prototype._determineIndex = function(sPath) {
+		var nIdx = -1;
+		var nPos = sPath.indexOf('/', 1);
+		if (nPos > 0) {
+			nIdx = parseInt(sPath.substring(nPos + 1));
+		}
+
+		return nIdx;
+	};
+
 	VariantManagement.prototype._handleManageDeletePressed = function(oItem) {
-		var oModel;
-		var sKey = oItem.key;
+		var sKey = oItem.getKey();
 
 		// do not allow the deletion of the standard
 		if (this.getStandardVariantKey() === sKey) {
 			return;
 		}
 
-		oItem.visible = false;
+		oItem.setVisible(false);
 		this._addDeletedItem(oItem);
 
-		if ((sKey === this.getDefaultVariantKey())) {
-			this.setDefaultVariantKey(this.getStandardVariantKey());
-			if (this.getShowFavorites()) {
+		if (sKey === this.getDefaultKey()) {
+			this.setDefaultKey(this.getStandardVariantKey());
+			if (this.getSupportFavorites()) {
 				var oNewDefaultItem = this._getItemByKey(this.getStandardVariantKey());
-				if (oNewDefaultItem && !oNewDefaultItem.favorite) {
+				if (oNewDefaultItem && !oNewDefaultItem.getFavorite()) {
 					var oRow = this._getRowForKey(this.getStandardVariantKey());
 					if (oRow) {
-						oNewDefaultItem.favorite = true;
+						oNewDefaultItem.setFavorite(true);
 						this._setFavoriteIcon(oRow.getCells()[VariantManagement.COLUMN_FAV_IDX], true);
 					}
 				}
 			}
 		}
 
-		oModel = this.getModel(this._sModelName);
-		if (oModel) {
-			oModel.checkUpdate();
-		}
+//		var oModel = this.oManagementTable.getModel("$mVariants");
+//		if (oModel) {
+//			oModel.checkUpdate();
+//		}
+
+		this.oManagementTable.getBinding("items").filter(this._getVisibleFilter());
 
 		this.oManagementCancel.focus();
 	};
 
-	VariantManagement.prototype._handleManageExecuteOnSelectionChanged = function() {
-		//		if (!this._anyInErrorState(this.oManagementTable)) {
-		//			this.oManagementSave.setEnabled(true);
-		//		}
+	VariantManagement.prototype._collectManageData = function() {
+
+		var oVariantInfo = {};
+
+		var sDefault = this.getDefaultKey();
+		if (sDefault !== this._sOriginalDefaultKey){
+			oVariantInfo.def = sDefault;
+		}
+
+		this.getItems().forEach(function(oItem) {
+
+			if (!oItem.getVisible()) {
+				if (!oVariantInfo.deleted) {
+					oVariantInfo.deleted = [];
+				}
+				oVariantInfo.deleted.push(oItem.getKey());
+			}
+
+			if (oItem.getVisible() && (oItem.getFavorite() !== oItem.getOriginalFavorite())) {
+				if (!oVariantInfo.fav) {
+					oVariantInfo.fav = [];
+				}
+				oVariantInfo.fav.push({ key: oItem.getKey(), visible: oItem.getFavorite()});
+			}
+
+			if (oItem.getVisible() && (oItem.getTitle() !== oItem.getOriginalTitle())) {
+				if (!oVariantInfo.renamed) {
+					oVariantInfo.renamed = [];
+				}
+				oVariantInfo.renamed.push({ key: oItem.getKey(), name: oItem.getTitle()});
+			}
+
+			if (oItem.getVisible()  && (oItem.getExecuteOnSelect() !== oItem.getOriginalExecuteOnSelect())) {
+				if (!oVariantInfo.exe) {
+					oVariantInfo.exe = [];
+				}
+				oVariantInfo.exe.push({ key: oItem.getKey(), exe: oItem.getExecuteOnSelect()});
+			}
+
+			if (oItem.getVisible() && this._hasContextsChanged(oItem)) {
+				if (!oVariantInfo.contexts) {
+					oVariantInfo.contexts = [];
+				}
+				oVariantInfo.contexts.push({ key: oItem.getKey(), contexts: oItem.getContexts()});
+			}
+
+		}.bind(this));
+
+		return oVariantInfo;
 	};
 
-	VariantManagement.prototype._handleManageTitleChanged = function() {
-		//		if (!this._anyInErrorState(this.oManagementTable)) {
-		//			this.oManagementSave.setEnabled(true);
-		//		}
+	VariantManagement.prototype._hasContextsChanged = function(oItem) {
+		return (JSON.stringify(oItem.getContexts()) !== JSON.stringify(oItem.getOriginalContexts()));
 	};
 
 	VariantManagement.prototype._handleManageSavePressed = function() {
@@ -2215,12 +2283,14 @@ sap.ui.define([
 			return;
 		}
 
-		this._getDeletedItems().some(function(oItem) {
-			if (oItem.key === this.getCurrentVariantKey()) {
+		this.oManagementDialog.close();
+
+		this._getDeletedItems().some(function(sItemKey) {
+			if (sItemKey === this.getSelectedKey()) {
 				var sKey = this.getStandardVariantKey();
 
 				this.setModified(false);
-				this.setCurrentVariantKey(sKey);
+				this.setSelectedKey(sKey);
 
 				this.fireSelect({
 					key: sKey
@@ -2231,12 +2301,19 @@ sap.ui.define([
 			return false;
 		}.bind(this));
 
-		this.fireManage({
+		if (this._getRenamedItems().indexOf(this.getSelectedKey()) >= 0) {
+			var oBinding = this.oVariantText.getBinding("text");
+			if (oBinding) {
+				oBinding.checkUpdate(true);
+			}
+		}
 
-		});
+		this.fireManage(this._collectManageData());
 
-		this._resumeManagementTableBinding();
-		this.oManagementDialog.close();
+		// the manage views dialog may be deleted.
+		if (this.oManagementDialog) {
+			this._resumeManagementTableBinding();
+		}
 	};
 
 	VariantManagement.prototype._resumeManagementTableBinding = function() {
@@ -2257,14 +2334,28 @@ sap.ui.define([
 		}
 	};
 
-	VariantManagement.prototype._anyInErrorState = function(oManagementTable) {
-		var aItems;
+	VariantManagement.prototype._focusOnFirstInputInErrorState = function(oManagementTable) {
+		if (oManagementTable) {
+			oManagementTable.getItems().some(function(oItem) {
+				var oInput = oItem.getCells()[VariantManagement.COLUMN_NAME_IDX];
+				if (oInput && oInput.getValueState && (oInput.getValueState() === ValueState.Error)) {
+					oInput.getDomRef().scrollIntoView();
+					oInput.focus();
+					return true;
+				}
+
+				return false;
+			});
+		}
+	};
+
+
+	VariantManagement.prototype._anyInErrorStateManageTable = function(oManagementTable) {
 		var oInput;
 		var bInError = false;
 
 		if (oManagementTable) {
-			aItems = oManagementTable.getItems();
-			aItems.some(function(oItem) {
+			oManagementTable.getItems().some(function(oItem) {
 				oInput = oItem.getCells()[VariantManagement.COLUMN_NAME_IDX];
 				if (oInput && oInput.getValueState && (oInput.getValueState() === ValueState.Error)) {
 					bInError = true;
@@ -2276,6 +2367,42 @@ sap.ui.define([
 		return bInError;
 	};
 
+	VariantManagement.prototype._anyInErrorState = function(oManagementTable) {
+		if (this._anyInErrorStateManageTable(oManagementTable)) {
+			return true;
+		}
+
+		var aRenamedKeys = this._getRenamedItems();
+
+		for (var i = aRenamedKeys.length - 1; i >= 0; i--) {
+			var oItem = this._getItemByKey(aRenamedKeys[i]);
+			if (oItem) {
+				if (oItem.getTitle() === oItem.getOriginalTitle()) {
+					this._removeRenamedItem(oItem);
+				}
+			}
+		}
+
+		var bError = false;
+		this._getRenamedItems().some(function(sKey, nIdx) {
+			var oItem = this._getItemByKey(sKey);
+			if (oItem) {
+				bError = this._checkIsDuplicateInModel(oItem.getTitle(), sKey);
+			}
+			return bError;
+
+		}.bind(this));
+
+		if (bError) {
+			this._oSearchFieldOnMgmtDialog.setValue("");
+			this._triggerSearchInManageDialogByValue("", oManagementTable);
+
+			this._focusOnFirstInputInErrorState(oManagementTable);
+		}
+
+		return bError;
+	};
+
 	// UTILS
 
 	VariantManagement.prototype._getFilters = function(oFilter) {
@@ -2287,7 +2414,7 @@ sap.ui.define([
 
 		aFilters.push(this._getVisibleFilter());
 
-		if (this.getShowFavorites()) {
+		if (this.getSupportFavorites()) {
 			aFilters.push(this._getFilterFavorites());
 		}
 
@@ -2311,12 +2438,12 @@ sap.ui.define([
 	};
 
 
-	VariantManagement.prototype._verifyVariantNameConstraints = function(oInputField, sKey) {
+	VariantManagement.prototype._verifyVariantNameConstraints = function(oInputField, sKey, sTitle) {
 		if (!oInputField) {
 			return;
 		}
 
-		var sValue = oInputField.getValue();
+		var sValue = sTitle || oInputField.getValue();
 		sValue = sValue.trim();
 
 		if (!this._checkIsDuplicate(sValue, sKey)) {
@@ -2339,7 +2466,13 @@ sap.ui.define([
 			}
 		} else {
 			oInputField.setValueState(ValueState.Error);
-			oInputField.setValueStateText(this._oRb.getText("VARIANT_MANAGEMENT_ERROR_DUPLICATE"));
+
+			if (this._oSearchFieldOnMgmtDialog && this._oSearchFieldOnMgmtDialog.getValue()) {
+				oInputField.setValueStateText(this._oRb.getText("VARIANT_MANAGEMENT_ERROR_DUPLICATE_SAVE"));
+			} else {
+				oInputField.setValueStateText(this._oRb.getText("VARIANT_MANAGEMENT_ERROR_DUPLICATE"));
+			}
+
 		}
 	};
 
@@ -2358,11 +2491,11 @@ sap.ui.define([
 		if (this.oManagementTable) {
 			aItems = this.oManagementTable.getItems();
 			aItems.some(function(oItem) {
-				var oObject = oItem.getBindingContext(this._sModelName).getObject();
-				if (oObject && oObject.visible) {
+				var oObject = oItem.getBindingContext("$mVariants").getObject();
+				if (oObject && oObject.getVisible()) {
 					var oInput = oItem.getCells()[VariantManagement.COLUMN_NAME_IDX];
 					if (oInput && oInput.getValueState && (oInput.getValueState() === ValueState.Error)) {
-						this._verifyVariantNameConstraints(oInput, oObject.key);
+						this._verifyVariantNameConstraints(oInput, oObject.getKey());
 						if (oInput.getValueState() === ValueState.Error) {
 							bInError = true;
 						}
@@ -2378,7 +2511,10 @@ sap.ui.define([
 
 	VariantManagement.prototype._checkIsDuplicate = function(sValue, sKey) {
 		if (this.oManagementDialog && this.oManagementDialog.isOpen()) {
-			return this._checkIsDuplicateInManageTable(sValue, sKey);
+			var bResult = this._checkIsDuplicateInManageTable(sValue, sKey);
+			if (this._oSearchFieldOnMgmtDialog && this._oSearchFieldOnMgmtDialog.getValue() && bResult) {
+				return bResult;
+			}
 		}
 
 		return this._checkIsDuplicateInModel(sValue, sKey);
@@ -2389,8 +2525,8 @@ sap.ui.define([
 		var aItems = this._getItems();
 		var sLowerCaseValue = sValue.toLowerCase();
 		aItems.some(function(oItem) {
-			if (oItem.title.toLowerCase() === sLowerCaseValue) {
-				if (sKey && (sKey === oItem.key)) {
+			if (oItem.getTitle().toLowerCase() === sLowerCaseValue) {
+				if (sKey && (sKey === oItem.getKey())) {
 					return false;
 				}
 				bDublicate = true;
@@ -2411,11 +2547,11 @@ sap.ui.define([
 			aItems = this.oManagementTable.getItems();
 			aItems.some(function(oItem) {
 				var sTitleLowerCase;
-				var oObject = oItem.getBindingContext(this._sModelName).getObject();
-				if (oObject && oObject.visible) {
+				var oObject = oItem.getBindingContext("$mVariants").getObject();
+				if (oObject && oObject.getVisible()) {
 					var oInput = oItem.getCells()[VariantManagement.COLUMN_NAME_IDX];
 
-					if (oInput && (oObject.key !== sKey)) {
+					if (oInput && (oObject.getKey() !== sKey)) {
 						if (oInput.isA("sap.m.Input")) {
 							sTitleLowerCase = oInput.getValue().toLowerCase();
 						} else {
@@ -2427,7 +2563,7 @@ sap.ui.define([
 					}
 				}
 				return bInError;
-			}.bind(this));
+			});
 		}
 
 		return bInError;
@@ -2437,7 +2573,14 @@ sap.ui.define([
 	VariantManagement.prototype.exit = function() {
 		var oModel;
 
-		if (this.oVariantInvisibleText) {
+		this._oObserver.disconnect();
+		this._oObserver = undefined;
+
+		Control.prototype.exit.apply(this, arguments);
+		this._clearDeletedItems();
+		this._clearRenamedItems();
+
+		if (this.oVariantInvisibleText && !this.oVariantInvisibleText._bIsBeingDestroyed) {
 			this.oVariantInvisibleText.destroy(true);
 			this.oVariantInvisibleText = undefined;
 		}
@@ -2471,18 +2614,21 @@ sap.ui.define([
 		this.oVariantPopoverTrigger = undefined;
 		this._oSearchField = undefined;
 		this._oSearchFieldOnMgmtDialog = undefined;
+		this._sDefaultKey = undefined;
 
 		oModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
 		if (oModel) {
 			oModel.destroy();
 		}
+		if (this._oManagedObjectModel) {
+			this._oManagedObjectModel.destroy();
+			this._oManagedObjectModel = undefined;
+		}
 
 		this._oRolesComponentContainer = null;
-		this._sStyleClass = null;
 
-		this._fRegisteredApplyAutomaticallyOnStandardVariant = null;
 
-		if (this._oRolesDialog) {
+		if (this._oRolesDialog && !this._oRolesDialog._bIsBeingDestroyed) {
 			this._oRolesDialog.destroy();
 			this._oRolesDialog = null;
 		}