@openui5/sap.ui.core 1.105.0 → 1.106.0

package/src/sap/ui/base/ManagedObject.js

@@ -6,20 +6,11 @@
 
 // Provides the base class for all objects with managed properties and aggregations.
 sap.ui.define([
-	'./BindingParser',
-	'./DataType',
-	'./EventProvider',
-	'./ManagedObjectMetadata',
-	'./Object',
-	'../model/BindingMode',
-	'../model/StaticBinding',
-	'../model/CompositeBinding',
-	'../model/Context',
-	'../model/FormatException',
-	'../model/ParseException',
-	'../model/Type',
-	'../model/ValidateException',
-	"sap/ui/base/SyncPromise",
+	"./DataType",
+	"./EventProvider",
+	"./ManagedObjectMetadata",
+	"./Object",
+	"./BindingInfo",
 	"sap/ui/util/ActivityDetection",
 	"sap/base/util/ObjectPath",
 	"sap/base/Log",
@@ -30,20 +21,11 @@ sap.ui.define([
 	"sap/base/util/extend",
 	"sap/base/util/isEmptyObject"
 ], function(
-	BindingParser,
 	DataType,
 	EventProvider,
 	ManagedObjectMetadata,
 	BaseObject,
-	BindingMode,
-	StaticBinding,
-	CompositeBinding,
-	Context,
-	FormatException,
-	ParseException,
-	Type,
-	ValidateException,
-	SyncPromise,
+	BindingInfo,
 	ActivityDetection,
 	ObjectPath,
 	Log,
@@ -266,7 +248,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 * @public
 	 * @alias sap.ui.base.ManagedObject
 	 */
@@ -556,8 +538,42 @@ sap.ui.define([
 
 	}, /* Metadata constructor */ ManagedObjectMetadata);
 
-	// Marker to not 'forget' ui5Objects
-	var sUI5ObjectMarker = Symbol("ui5object");
+	// The current BindingParser implementation is exposed via "ManagedObject.bindingParser".
+	// This is used in tests for switching the BindingParser implementation on the fly.
+	// We delegate any changes to this property back to the BindingInfo.
+	Object.defineProperty(ManagedObject, "bindingParser", {
+		set: function(v) {
+			BindingInfo.parse = v;
+		},
+		get: function() {
+			return BindingInfo.parse;
+		}
+	});
+
+	function assertModelName(sModelName) {
+		assert(sModelName === undefined || (typeof sModelName === "string" && !/^(undefined|null)?$/.test(sModelName)), "sModelName must be a string or omitted");
+	}
+
+	// Binding support Marker
+	var _bHasBindingSupport = false;
+
+	/**
+	 * Checks if the <code>ManagedObjectBindingSupport</code> mixin is introduced
+	 * via a model instance.
+	 * If so, it is applied to the <code>ManagedObject.prototype</code> once.
+	 *
+	 * @param {Object<string, sap.ui.model.Model>} mModels a map of models, keyed by the model name.
+	 */
+	function checkForBindingSupport(mModels) {
+		if (!_bHasBindingSupport ) {
+			var oModel = Object.values(mModels)[0];
+			// In theory an application could pass an object that does not extend from sap.ui.model.Model
+			if (oModel && oModel.mixinBindingSupport) {
+				oModel.mixinBindingSupport(ManagedObject.prototype);
+				_bHasBindingSupport = true;
+			}
+		}
+	}
 
 	/**
 	 * Returns the metadata for the ManagedObject class.
@@ -600,7 +616,7 @@ sap.ui.define([
 	 *
 	 * Example:
 	 * <pre>
-	 * ManagedObect.extend('sap.mylib.MyClass', {
+	 * ManagedObject.extend('sap.mylib.MyClass', {
 	 *   metadata : {
 	 *     library: 'sap.mylib',
 	 *     properties : {
@@ -1117,7 +1133,8 @@ sap.ui.define([
 			if ( typeof mSettings.bindingContexts !== "object" ) {
 				throw new Error("bindingContexts must be a simple object");
 			}
-			if ( mSettings.bindingContexts instanceof Context) {
+			var oBindingContexts = mSettings.bindingContexts;
+			if ( BaseObject.isA(oBindingContexts, "sap.ui.model.Context")) {
 				this.setBindingContext(mSettings.bindingContexts);
 			} else {
 				for (sKey in mSettings.bindingContexts ) {
@@ -1235,7 +1252,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ManagedObject.escapeSettingsValue = function(vValue) {
-		return (typeof vValue === "string") ? ManagedObject.bindingParser.escape(vValue) : vValue;
+		return (typeof vValue === "string") ? BindingInfo.escape(vValue) : vValue;
 	};
 
 	/**
@@ -1612,9 +1629,9 @@ sap.ui.define([
 	 * Use the concrete method get<i>XYZ</i> for association 'XYZ' instead.
 	 *
 	 * @param {string} sAssociationName the name of the association
-	 * @param {object}
-	 *			  oDefaultForCreation the object that is used in case the current aggregation is empty (only null or empty array allowed)
-	 * @return {string | string[]} the ID of the associated managed object or an array of such IDs; may be null if the association has not been populated
+	 * @param {object} oDefaultForCreation
+	 *            the object that is used in case the current aggregation is empty (only null or empty array allowed)
+	 * @returns {string | string[] | null} the ID of the associated managed object or an array of such IDs; may be null if the association has not been populated
 	 * @protected
 	 */
 	ManagedObject.prototype.getAssociation = function(sAssociationName, oDefaultForCreation) {
@@ -1855,7 +1872,7 @@ sap.ui.define([
 			return oObject;
 		}
 
-		if ( oObject instanceof BaseObject && oObject.isA(oAggregation.type) ) {
+		if ( BaseObject.isA(oObject, oAggregation.type) ) {
 			return oObject;
 		}
 
@@ -2763,7 +2780,7 @@ sap.ui.define([
 	 *
 	 * <b>Note: </b> There is no API to determine the original API parent.
 	 *
-	 * @return {sap.ui.base.ManagedObject} The technical parent managed object or <code>null</code>
+	 * @returns {sap.ui.base.ManagedObject|null} The technical parent managed object or <code>null</code>
 	 * @public
 	 */
 	ManagedObject.prototype.getParent = function() {
@@ -2785,7 +2802,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ManagedObject.prototype.destroy = function(bSuppressInvalidate) {
-		var sName;
+		var sName, oBindingInfo;
 		// ignore repeated calls
 		if (this.bIsDestroyed) {
 			return;
@@ -2803,15 +2820,21 @@ sap.ui.define([
 
 		// Data Binding
 		for (sName in this.mBindingInfos) {
-			if (this.mBindingInfos[sName].factory) {
-				this._detachAggregationBindingHandlers(sName);
-			} else {
-				this._detachPropertyBindingHandlers(sName);
+			oBindingInfo = this.mBindingInfos[sName];
+			if (oBindingInfo.binding) {
+				if (oBindingInfo.factory) {
+					this._detachAggregationBindingHandlers(sName);
+				} else {
+					this._detachPropertyBindingHandlers(sName);
+				}
 			}
 		}
 
 		for (sName in this.mObjectBindingInfos) {
-			this._detachObjectBindingHandlers(sName);
+			oBindingInfo = this.mObjectBindingInfos[sName];
+			if (oBindingInfo.binding) {
+				this._detachObjectBindingHandlers(oBindingInfo);
+			}
 		}
 
 		if (this.exit) {
@@ -2877,13 +2900,6 @@ sap.ui.define([
 		this.bIsDestroyed = true;
 	};
 
-
-	// DataBinding
-	/**
-	 * Binding parser to use.
-	 */
-	ManagedObject.bindingParser = BindingParser.simpleParser;
-
 	/**
 	 * Determines whether a given object contains binding information instead of a
 	 * value or aggregated controls. The method is used in applySettings for processing
@@ -2933,32 +2949,15 @@ sap.ui.define([
 	 * @private
 	 */
 	ManagedObject.prototype.extractBindingInfo = function(oValue, oScope, bDetectValue) {
+		var oBindingInfo = BindingInfo.extract(oValue, oScope, bDetectValue);
 		// property:{path:"path", template:oTemplate}
-		if (oValue && typeof oValue === "object") {
-			if (oValue.Type) {
-				// if value contains the 'Type' property (capital 'T'), this is not a binding info.
-				return undefined;
-			} else if (oValue[sUI5ObjectMarker]) {
-				// no bindingInfo, delete marker
-				delete oValue[sUI5ObjectMarker];
-			} else if (oValue.ui5object) {
-				// if value contains ui5object property, this is not a binding info,
-				// remove it and not check for path or parts property
-				delete oValue.ui5object;
-			} else if (oValue.path != undefined || oValue.parts || (bDetectValue && oValue.value != undefined)) {
-				// allow JSON syntax for templates
-				if (oValue.template) {
-					oValue.template = ManagedObject.create(oValue.template);
-				}
-				return oValue;
-			}
-		}
-
-		// property:"{path}" or "\{path\}"
-		if (typeof oValue === "string") {
-			// either returns a binding info or an unescaped string or undefined - depending on binding syntax
-			return ManagedObject.bindingParser(oValue, oScope, true);
+		// Binding templates should only be constructed from object syntax,
+		// string representation for templates is not supported
+		if (typeof oValue === "object" && oBindingInfo && oBindingInfo.template) {
+			// allow JSON syntax for templates
+			oBindingInfo.template = ManagedObject.create(oBindingInfo.template);
 		}
+		return oBindingInfo;
 	};
 
 	/**
@@ -2984,6 +2983,23 @@ sap.ui.define([
 		return this.mBindingInfos[sName];
 	};
 
+	/**
+	 * Returns the object binding info for the given model.
+	 *
+	 * The binding info contains information about path, binding object, format options, sorter, filter etc.
+	 * for the model. As the binding object is only created when the model becomes available,
+	 * the <code>binding</code> property may be undefined.
+	 *
+	 * @param {string} [sModelName=undefined] Non-empty name of the model or <code>undefined</code>
+	 *    Omitting the model name (or using the value <code>undefined</code>) is explicitly allowed and
+	 *    refers to the default model.
+	 * @returns {object} A binding info object, containing at least a <code>path</code> and additional properties
+	 * @private
+	 */
+	ManagedObject.prototype._getObjectBindingInfo = function(sModelName) {
+		return this.mObjectBindingInfos[sModelName];
+	};
+
 	/**
 	 * Configuration for the binding of a managed object
 	 *
@@ -3038,8 +3054,7 @@ sap.ui.define([
 	 */
 	ManagedObject.prototype.bindObject = function(oBindingInfo) {
 		var sModelName,
-			sPath,
-			iSeparatorPos;
+			sPath;
 
 		// support legacy notation (sPath, mParameters)
 		if (typeof oBindingInfo == "string") {
@@ -3048,21 +3063,13 @@ sap.ui.define([
 				path: sPath,
 				parameters: arguments[1]
 			};
-		} else {
-			sPath = oBindingInfo.path;
-		}
-
-		// if a model separator is found in the path, extract model name and path
-		iSeparatorPos = sPath.indexOf(">");
-		if (iSeparatorPos > 0) {
-			oBindingInfo.model = sPath.substr(0, iSeparatorPos);
-			oBindingInfo.path = sPath.substr(iSeparatorPos + 1);
 		}
 
+		oBindingInfo = BindingInfo.createObject(oBindingInfo);
 		sModelName = oBindingInfo.model;
 
 		// if old binding exists, clean it up
-		if ( this.mObjectBindingInfos[sModelName] ) {
+		if ( this.getObjectBinding(sModelName) ) {
 			this.unbindObject(sModelName, /* _bSkipUpdateBindingContext */ true);
 			// We don't push down context changes here
 			// Either this will happen with the _bindObject call below or the model
@@ -3079,75 +3086,25 @@ sap.ui.define([
 		return this;
 	};
 
+	function logError(sFunctionName) {
+		Log.error("Unexpected call of '" + sFunctionName + "'.");
+	}
+
 	/**
 	 * Create object binding.
 	 *
 	 * @param {sap.ui.base.ManagedObject.ObjectBindingInfo} oBindingInfo The bindingInfo object
 	 * @private
 	 */
-	ManagedObject.prototype._bindObject = function(oBindingInfo) {
-		var oBinding,
-			oContext,
-			sModelName,
-			oModel,
-			that = this;
-
-		var fnChangeHandler = function(oEvent) {
-			that.setElementBindingContext(oBinding.getBoundContext(), sModelName);
-		};
-
-		var fnDataStateChangeHandler = function(oEvent) {
-			var oDataState = oBinding.getDataState();
-			if (!oDataState) {
-				return;
-			}
-			//inform generic refreshDataState method
-			if (that.refreshDataState) {
-				that.refreshDataState('', oDataState);
-			}
-		};
-
-		sModelName = oBindingInfo.model;
-		oModel = this.getModel(sModelName);
-
-		oContext = this.getBindingContext(sModelName);
-
-		oBinding = oModel.bindContext(oBindingInfo.path, oContext, oBindingInfo.parameters);
-		if (oBindingInfo.suspended) {
-			oBinding.suspend(true);
-		}
-		oBinding.attachChange(fnChangeHandler);
-		oBindingInfo.binding = oBinding;
-		oBindingInfo.modelChangeHandler = fnChangeHandler;
-		oBindingInfo.dataStateChangeHandler = fnDataStateChangeHandler;
-
-		oBinding.attachEvents(oBindingInfo.events);
-
-		if (this.refreshDataState) {
-			oBinding.attachAggregatedDataStateChange(fnDataStateChangeHandler);
-		}
-
-		oBinding.initialize();
-	};
+	ManagedObject.prototype._bindObject = logError.bind(null, "_bindObject");
 
 	/**
 	 * Detach all object binding event handler
 	 *
-	 * @param {string} sModelName Name of the model to detach the handler for.
+	 * @param {sap.ui.base.ManagedObject.ObjectBindingInfo} oBindingInfo The BindingInfo to detach the handler for.
 	 * @private
 	 */
-	ManagedObject.prototype._detachObjectBindingHandlers = function(sModelName) {
-		var oBindingInfo = this.mObjectBindingInfos[sModelName];
-		if (oBindingInfo) {
-			if (oBindingInfo.binding) {
-				oBindingInfo.binding.detachChange(oBindingInfo.modelChangeHandler);
-				oBindingInfo.binding.detachEvents(oBindingInfo.events);
-				if (this.refreshDataState) {
-					oBindingInfo.binding.detachAggregatedDataStateChange(oBindingInfo.dataStateChangeHandler);
-				}
-			}
-		}
-	};
+	ManagedObject.prototype._detachObjectBindingHandlers = logError.bind(null, "_detachObjectBindingHandlers");
 
 	/**
 	 * Removes the defined binding context of this object, all bindings will now resolve
@@ -3160,23 +3117,16 @@ sap.ui.define([
 	ManagedObject.prototype.unbindObject = function(sModelName, /* internal use only */ _bSkipUpdateBindingContext) {
 		var oBindingInfo = this.mObjectBindingInfos[sModelName];
 		if (oBindingInfo) {
-			if (oBindingInfo.binding) {
-				if (!this._bIsBeingDestroyed) {
-					this._detachObjectBindingHandlers(sModelName);
-				}
-				oBindingInfo.binding.destroy();
-			}
 			delete this.mObjectBindingInfos[sModelName];
-			delete this.mElementBindingContexts[sModelName];
-			if ( !_bSkipUpdateBindingContext ) {
-				this.updateBindingContext(false, sModelName);
-				this.propagateProperties(sModelName);
-				this.fireModelContextChange();
+			if (oBindingInfo.binding) {
+				this._unbindObject(oBindingInfo, sModelName, /* internal use only */ _bSkipUpdateBindingContext);
 			}
 		}
 		return this;
 	};
 
+	ManagedObject.prototype._unbindObject = logError.bind(null, "_unbindObject");
+
 	/**
 	 * Bind the object to the referenced entity in the model, which is used as the binding context
 	 * to resolve bound properties or aggregations of the object itself and all of its children
@@ -3264,11 +3214,16 @@ sap.ui.define([
 	 *   subclass of <code>sap.ui.model.PropertyBinding</code>
 	 * @property {object} [events=null]
 	 *   Map of event handler functions keyed by the name of the binding events that they should be attached to
-	 * @property {sap.ui.base.ManagedObject.PropertyBindingInfo[]} [parts]
+	 * @property {Array<string|sap.ui.base.ManagedObject.PropertyBindingInfo>} [parts]
 	 *   Array of binding info objects for the parts of a composite binding; the structure of
 	 *   each binding info is the same as described for the <code>oBindingInfo</code> as a whole.
 	 *
-	 *   <b>Note</b>: recursive composite bindings are currently not supported
+	 *   If a part is not specified as a binding info object but as a simple string, a binding info object
+	 *   will be created with that string as <code>path</code>. The string may start with a model name prefix
+	 *   (see property <code>path</code>).
+	 *
+	 *   <b>Note</b>: recursive composite bindings are currently not supported. Therefore, a part must not
+	 *   contain a <code>parts</code> property.
 	 *
 	 * @public
 	 */
@@ -3345,8 +3300,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ManagedObject.prototype.bindProperty = function(sName, oBindingInfo, /* undocumented, old API only: */ _vFormat, _sMode) {
-		var iSeparatorPos,
-			bAvailable = true,
+		var bAvailable = true,
 			oProperty = this.getMetadata().getPropertyLikeSetting(sName);
 
 		// check whether property or alternative type on aggregation exists
@@ -3359,71 +3313,20 @@ sap.ui.define([
 			oBindingInfo = {
 				parts: [ {
 					path: oBindingInfo,
-					type: _vFormat instanceof Type ? _vFormat : undefined,
+					type: BaseObject.isA(_vFormat, "sap.ui.model.Type") ? _vFormat : undefined,
 					mode: _sMode
 				} ],
 				formatter: typeof _vFormat === 'function' ? _vFormat : undefined
 			};
 		}
 
-		// only one binding object with one binding specified
-		if (!oBindingInfo.parts) {
-			oBindingInfo.parts = [];
-			oBindingInfo.parts[0] = {
-				path: oBindingInfo.path,
-				targetType: oBindingInfo.targetType,
-				type: oBindingInfo.type,
-				suspended: oBindingInfo.suspended,
-				formatOptions: oBindingInfo.formatOptions,
-				constraints: oBindingInfo.constraints,
-				model: oBindingInfo.model,
-				mode: oBindingInfo.mode,
-				value: oBindingInfo.value
-			};
-			delete oBindingInfo.path;
-			delete oBindingInfo.targetType;
-			delete oBindingInfo.mode;
-			delete oBindingInfo.model;
-			delete oBindingInfo.value;
-		}
-
-		for ( var i = 0; i < oBindingInfo.parts.length; i++ ) {
-
-			// Plain strings as parts are taken as paths of bindings
-			var oPart = oBindingInfo.parts[i];
-			if (typeof oPart == "string") {
-				oPart = { path: oPart };
-				oBindingInfo.parts[i] = oPart;
-			}
-
-			// if a model separator is found in the path, extract model name and path
-			if (oPart.path !== undefined) {
-				iSeparatorPos = oPart.path.indexOf(">");
-				if (iSeparatorPos > 0) {
-					oPart.model = oPart.path.substr(0, iSeparatorPos);
-					oPart.path = oPart.path.substr(iSeparatorPos + 1);
-				}
-			}
-			// if a formatter exists the binding mode can be one way or one time only
-			if (oBindingInfo.formatter && oPart.mode != BindingMode.OneWay && oPart.mode != BindingMode.OneTime) {
-				oPart.mode = BindingMode.OneWay;
-			}
-
-			// Check for model availability for model bindings
-			if (oPart.value === undefined && !this.getModel(oPart.model)) {
-				bAvailable = false;
-			}
-		}
-
-		//Initialize skip properties
-		oBindingInfo.skipPropertyUpdate = 0;
-		oBindingInfo.skipModelUpdate = 0;
-
 		// if property is already bound, unbind it first
 		if (this.isBound(sName)) {
 			this.unbindProperty(sName, true);
 		}
 
+		oBindingInfo = BindingInfo.createProperty(oBindingInfo);
+
 		// store binding info to create the binding, as soon as the model is available, or when the model is changed
 		this.mBindingInfos[sName] = oBindingInfo;
 
@@ -3431,6 +3334,14 @@ sap.ui.define([
 			this._observer.bindingChange(this, sName, "prepare", oBindingInfo, "property");
 		}
 
+		// Check if all models are available before creating bindings
+		for ( var i = 0; i < oBindingInfo.parts.length; i++ ) {
+			if (oBindingInfo.parts[i].value === undefined && !this.getModel(oBindingInfo.parts[i].model)) {
+				bAvailable = false;
+				break;
+			}
+		}
+
 		// if the models are already available, create the binding
 		if (bAvailable) {
 			this._bindProperty(sName, oBindingInfo);
@@ -3439,127 +3350,35 @@ sap.ui.define([
 	};
 
 	ManagedObject.prototype._bindProperty = function(sName, oBindingInfo) {
-		var oModel,
-			oContext,
-			oBinding,
-			sMode,
-			sCompositeMode = BindingMode.TwoWay,
-			oType,
-			clType,
-			oPropertyInfo = this.getMetadata().getPropertyLikeSetting(sName), // TODO fix handling of hidden entities?
-			sInternalType = oPropertyInfo._iKind === /* PROPERTY */ 0 ? oPropertyInfo.type : oPropertyInfo.altTypes[0],
-			that = this,
-			aBindings = [],
-			fnModelChangeHandler = function(oEvent){
-				that.updateProperty(sName);
-				//clear Messages from messageManager
-				var oDataState = oBinding.getDataState();
-				if (oDataState) {
-					var oControlMessages = oDataState.getControlMessages();
-					if (oControlMessages && oControlMessages.length > 0) {
-						var oMessageManager = sap.ui.getCore().getMessageManager();
-						oDataState.setControlMessages([]); //remove the controlMessages before informing manager to avoid 'dataStateChange' event to fire
-						if (oControlMessages) {
-							oMessageManager.removeMessages(oControlMessages);
-						}
-					}
-					oDataState.setInvalidValue(undefined); //assume that the model always sends valid data
-				}
-				if (oBinding.getBindingMode() === BindingMode.OneTime && oBinding.isResolved()) {
-					// if binding is one time but not resolved yet we don't destroy it yet.
-					oBinding.detachChange(fnModelChangeHandler);
-					if (this.refreshDataState) {
-						oBinding.detachAggregatedDataStateChange(fnDataStateChangeHandler);
-					}
-					oBinding.detachEvents(oBindingInfo.events);
-				}
-			},
-			fnDataStateChangeHandler = function(){
-				var oDataState = oBinding.getDataState();
-				if (!oDataState) {
-					return;
-				}
-				//inform generic refreshDataState method
-				if (that.refreshDataState) {
-					that.refreshDataState(sName, oDataState);
-				}
-			};
-
-		oBindingInfo.parts.forEach(function(oPart) {
-			// get context and model for this part
-			oContext = that.getBindingContext(oPart.model);
-			oModel = that.getModel(oPart.model);
-
-			// Create type instance if needed
-			oType = oPart.type;
-			if (typeof oType == "string") {
-				clType = ObjectPath.get(oType);
-				if (typeof clType !== "function") {
-					throw new Error("Cannot find type \"" + oType + "\" used in control \"" + that.getId() + "\"!");
-				}
-				oType = new clType(oPart.formatOptions, oPart.constraints);
-			}
-
-			if (oPart.value !== undefined) {
-				oBinding = new StaticBinding(oPart.value);
-			} else {
-				oBinding = oModel.bindProperty(oPart.path, oContext, oPart.parameters || oBindingInfo.parameters);
-			}
-			oBinding.setType(oType, oPart.targetType || sInternalType);
-			oBinding.setFormatter(oPart.formatter);
-			if (oPart.suspended) {
-				oBinding.suspend(true);
+		/* Special case for handling StaticBindings:
+		If all parts are a StaticBinding no mixin of the binding relevant code
+		is done via a Model. In this case we need to handle these static
+		bindings manually by simulating its static behavior:
+		  - call formatter
+		  - call property mutator
+		If at least one part refers to a real Model this
+		code will be overwritten by the mixin and works as before.*/
+		var bIsStaticOnly = true;
+		for (var i = 0; i < oBindingInfo.parts.length; i++) {
+			if (oBindingInfo.parts[i].value === undefined) {
+				bIsStaticOnly = false;
+				break;
 			}
-
-			sMode = oPart.mode || (oModel && oModel.getDefaultBindingMode()) || BindingMode.TwoWay;
-			oBinding.setBindingMode(sMode);
-
-			// Only if all parts have twoway binding enabled, the composite binding will also have twoway binding
-			if (sMode !== BindingMode.TwoWay) {
-				sCompositeMode = BindingMode.OneWay;
-			}
-
-			aBindings.push(oBinding);
-		});
-
-		// check if we have a composite binding or a formatter function created by the BindingParser which has property textFragments
-		if (aBindings.length > 1 || ( oBindingInfo.formatter && oBindingInfo.formatter.textFragments )) {
-			// Create type instance if needed
-			oType = oBindingInfo.type;
-			if (typeof oType == "string") {
-				clType = ObjectPath.get(oType);
-				oType = new clType(oBindingInfo.formatOptions, oBindingInfo.constraints);
-			}
-			oBinding = new CompositeBinding(aBindings, oBindingInfo.useRawValues, oBindingInfo.useInternalValues);
-			oBinding.setType(oType, oBindingInfo.targetType || sInternalType);
-			oBinding.setBindingMode(oBindingInfo.mode || sCompositeMode);
-		} else {
-			oBinding = aBindings[0];
-		}
-
-		oBinding.attachChange(fnModelChangeHandler);
-		if (this.refreshDataState) {
-			oBinding.attachAggregatedDataStateChange(fnDataStateChangeHandler);
 		}
-
-		// set only one formatter function if any
-		// because the formatter gets the context of the element, we have to set the context via proxy to ensure compatibility
-		// for formatter function which is now called by the property binding
-		// proxy formatter here because "this" is the correct cloned object
-		if (typeof oBindingInfo.formatter === "function") {
-			oBinding.setFormatter(oBindingInfo.formatter.bind(this));
-		}
-
-		// Set additional information on the binding info
-		oBindingInfo.binding = oBinding;
-		oBindingInfo.modelChangeHandler = fnModelChangeHandler;
-		oBindingInfo.dataStateChangeHandler = fnDataStateChangeHandler;
-		oBinding.attachEvents(oBindingInfo.events);
-
-		oBinding.initialize();
-
-		if (this._observer) {
-			this._observer.bindingChange(this, sName, "ready", oBindingInfo, "property");
+		// The special treatment of early 'static-only' StaticBindings is making compromises on a couple of things:
+		//   - no async type can be supported
+		//   - no handling of parse/validate exceptions
+		//   - observers won't be called
+		if (bIsStaticOnly) {
+			var aValues = [];
+			oBindingInfo.parts.forEach(function(oPart) {
+				aValues.push(oPart.formatter ? oPart.formatter(oPart.value) : oPart.value);
+			});
+			var vValue = oBindingInfo.formatter ? oBindingInfo.formatter(aValues) : aValues.join(" ");
+			var oPropertyInfo = this.getMetadata().getPropertyLikeSetting(sName);
+			this[oPropertyInfo._sMutator](vValue);
+		} else {
+			logError.call(this, "_bindProperty");
 		}
 	};
 
@@ -3573,22 +3392,7 @@ sap.ui.define([
 	 * @param {string} sName the name of the property
 	 * @private
 	 */
-	ManagedObject.prototype._detachPropertyBindingHandlers = function(sName) {
-		var oBindingInfo = this.mBindingInfos[sName],
-			oBinding;
-		if (oBindingInfo) {
-			oBinding = oBindingInfo.binding;
-			if (oBinding) {
-				oBinding.detachChange(oBindingInfo.modelChangeHandler);
-				oBinding.detachEvents(oBindingInfo.events);
-				/* to reset messages on a control we need to detach the datastate handler after destroy,
-				as binding destroy clears up validation messages */
-				if (this.refreshDataState && this._bIsBeingDestroyed) {
-					oBinding.detachAggregatedDataStateChange(oBindingInfo.dataStateChangeHandler);
-				}
-			}
-		}
-	};
+	ManagedObject.prototype._detachPropertyBindingHandlers = function(sName) { };
 
 	/**
 	 * Unbind the property from the model
@@ -3598,21 +3402,11 @@ sap.ui.define([
 	 * @returns {this} reference to the instance itself
 	 * @public
 	 */
-	ManagedObject.prototype.unbindProperty = function(sName, bSuppressReset){
-		var oBindingInfo = this.mBindingInfos[sName],
-			oBinding;
+	ManagedObject.prototype.unbindProperty = function(sName, bSuppressReset) {
+		var oBindingInfo = this.mBindingInfos[sName];
 		if (oBindingInfo) {
-			oBinding = oBindingInfo.binding;
-			if (oBinding) {
-				if (!this._bIsBeingDestroyed) {
-					this._detachPropertyBindingHandlers(sName);
-				}
-				oBinding.destroy();
-				/* to reset messages on a control we need to detach the datastate handler after destroy,
-				   as binding destroy clears up validation messages */
-				if (this.refreshDataState && !this._bIsBeingDestroyed) {
-					oBinding.detachAggregatedDataStateChange(oBindingInfo.dataStateChangeHandler);
-				}
+			if (oBindingInfo.binding) {
+				this._unbindProperty(oBindingInfo, sName);
 			}
 
 			if (this._observer && !this._bIsBeingDestroyed) {
@@ -3627,6 +3421,8 @@ sap.ui.define([
 		return this;
 	};
 
+	ManagedObject.prototype._unbindProperty = logError.bind(null, "_unbindProperty");
+
 	/**
 	 * Generic method which is called, whenever a property binding is changed.
 	 *
@@ -3637,50 +3433,7 @@ sap.ui.define([
 	 *   Name of the property to update
 	 * @private
 	 */
-	ManagedObject.prototype.updateProperty = function(sName) {
-		var oBindingInfo = this.mBindingInfos[sName],
-			oBinding = oBindingInfo.binding,
-			oPropertyInfo = this.getMetadata().getPropertyLikeSetting(sName),
-			that = this;
-
-		function handleException(oException) {
-			if (oException instanceof FormatException) {
-				that.fireFormatError({
-					element : that,
-					property : sName,
-					type : oBinding.getType(),
-					newValue : oBinding.getValue(),
-					oldValue : that[oPropertyInfo._sGetter](),
-					exception: oException,
-					message: oException.message
-				}, false, true); // bAllowPreventDefault, bEnableEventBubbling
-				Log.error("FormatException in property '" + sName + "' of '" + that + "': " + oException.message +
-					"\nHint: single properties referenced in composite bindings and within binding expressions are automatically converted " +
-					"into the type of the bound control property, unless a different 'targetType' is specified. targetType:'any' may avoid " +
-					"the conversion and lead to the expected behavior.");
-				oBindingInfo.skipModelUpdate++;
-				that.resetProperty(sName);
-				oBindingInfo.skipModelUpdate--;
-			} else {
-				throw oException;
-			}
-		}
-
-		// If model change was triggered by the property itself, don't call the setter again
-		if (oBindingInfo.skipPropertyUpdate) {
-			return;
-		}
-
-		SyncPromise.resolve().then(function() {
-			return oBinding.getExternalValue();
-		}).then(function(oValue) {
-			oBindingInfo.skipModelUpdate++;
-			that[oPropertyInfo._sMutator](oValue);
-			oBindingInfo.skipModelUpdate--;
-		}).catch(function(oException) {
-			handleException(oException);
-		}).unwrap();
-	};
+	ManagedObject.prototype.updateProperty = function(sName) { };
 
 	/**
 	 * Update the property in the model if two way data binding mode is enabled
@@ -3690,72 +3443,7 @@ sap.ui.define([
 	 * @param {any} oOldValue the previous value of the property
 	 * @private
 	 */
-	ManagedObject.prototype.updateModelProperty = function(sName, oValue, oOldValue){
-		var oBindingInfo, oBinding,
-			that = this;
-
-		function handleException(oException) {
-			var mErrorParameters = {
-				element: that,
-				property: sName,
-				type: oBinding.getType(),
-				newValue: oValue,
-				oldValue: oOldValue,
-				exception: oException,
-				message: oException.message
-			};
-			if (oException instanceof ParseException) {
-				that.fireParseError(mErrorParameters, false, true); // mParameters, bAllowPreventDefault, bEnableEventBubbling
-			} else if (oException instanceof ValidateException) {
-				that.fireValidationError(mErrorParameters, false, true); // mParameters, bAllowPreventDefault, bEnableEventBubbling
-			} else {
-				throw oException;
-			}
-		}
-
-		function handleSuccess() {
-			var mSuccessParameters = {
-				element: that,
-				property: sName,
-				type: oBinding.getType(),
-				newValue: oValue,
-				oldValue: oOldValue
-			};
-			// Only fire validation success, if a type is used
-			if (oBinding.hasValidation()) {
-				that.fireValidationSuccess(mSuccessParameters, false, true); // bAllowPreventDefault, bEnableEventBubbling
-			}
-		}
-
-		if (this.isBound(sName)) {
-			var oBindingInfo = this.mBindingInfos[sName],
-				oBinding = oBindingInfo.binding;
-
-			// If property change was triggered by the model, don't update the model again
-			if (oBindingInfo.skipModelUpdate || (oBinding && oBinding.isSuspended())) {
-				return;
-			}
-
-			// only two-way bindings allow model updates
-			if (oBinding && oBinding.getBindingMode() == BindingMode.TwoWay) {
-				oBindingInfo.skipPropertyUpdate++;
-				SyncPromise.resolve(oValue).then(function(oValue) {
-					return oBinding.setExternalValue(oValue);
-				}).then(function() {
-					oBindingInfo.skipPropertyUpdate--;
-					return oBinding.getExternalValue();
-				}).then(function(oExternalValue) {
-					if (oValue != oExternalValue) {
-						that.updateProperty(sName);
-					}
-					handleSuccess();
-				}).catch(function(oException) {
-					oBindingInfo.skipPropertyUpdate--;
-					handleException(oException);
-				}).unwrap();
-			}
-		}
-	};
+	ManagedObject.prototype.updateModelProperty = function(sName, oValue, oOldValue) { };
 
 	// a non-falsy value used as default for 'templateShareable'.
 	var MAYBE_SHAREABLE_OR_NOT = 1;
@@ -3884,26 +3572,11 @@ sap.ui.define([
 			return this;
 		}
 
-
 		// if aggregation is already bound, unbind it first
 		if (this.isBound(sName)) {
 			this.unbindAggregation(sName);
 		}
 
-		// check whether a template has been provided, which is required for proper processing of the binding
-		// If aggregation is marked correspondingly in the metadata, factory can be omitted (usually requires an updateXYZ method)
-		if (!(oBindingInfo.template || oBindingInfo.factory)) {
-			if ( oAggregationInfo._doesNotRequireFactory ) {
-				// add a dummy factory as property 'factory' is used to distinguish between property- and list-binding
-				oBindingInfo.factory = function() {
-					throw new Error("dummy factory called unexpectedly ");
-				};
-			} else {
-				throw new Error("Missing template or factory function for aggregation " + sName + " of " + this + " !");
-			}
-		}
-
-		// if we have a template we will create a factory function
 		if (oBindingInfo.template) {
 			// set default for templateShareable
 			if ( oBindingInfo.template._sapui_candidateForDestroy ) {
@@ -3918,21 +3591,16 @@ sap.ui.define([
 			if (oBindingInfo.templateShareable === undefined) {
 				oBindingInfo.templateShareable = MAYBE_SHAREABLE_OR_NOT;
 			}
-			oBindingInfo.factory = function(sId) {
-				return oBindingInfo.template.clone(sId);
-			};
-		}
-
-		// if a model separator is found in the path, extract model name and path
-		var iSeparatorPos = oBindingInfo.path.indexOf(">");
-		if (iSeparatorPos > 0) {
-			oBindingInfo.model = oBindingInfo.path.substr(0, iSeparatorPos);
-			oBindingInfo.path = oBindingInfo.path.substr(iSeparatorPos + 1);
 		}
+		oBindingInfo = BindingInfo.createAggregation(oBindingInfo, oAggregationInfo._doesNotRequireFactory);
 
 		// store binding info to create the binding, as soon as the model is available, or when the model is changed
 		this.mBindingInfos[sName] = oBindingInfo;
 
+		if (!(oBindingInfo.template || oBindingInfo.factory)) {
+			throw new Error("Missing template or factory function for aggregation " + sName + " of " + this + " !");
+		}
+
 		if (this._observer) {
 			this._observer.bindingChange(this, sName, "prepare", oBindingInfo, "aggregation");
 		}
@@ -3951,71 +3619,7 @@ sap.ui.define([
 	 * @param {object} oBindingInfo The bindingInfo object
 	 * @private
 	 */
-	ManagedObject.prototype._bindAggregation = function(sName, oBindingInfo) {
-		var that = this,
-			oBinding,
-			oAggregationInfo = this.getMetadata().getAggregation(sName),
-			fnModelChangeHandler = function(oEvent){
-				var sOldOwnerId = ManagedObject._sOwnerId;
-				try {
-					ManagedObject._sOwnerId = that._sOwnerId;
-					oAggregationInfo.update(that, oEvent.getParameter("reason"), {
-						detailedReason: oEvent.getParameter("detailedReason")
-					});
-				} finally {
-					ManagedObject._sOwnerId = sOldOwnerId;
-				}
-			},
-			fnModelRefreshHandler = function(oEvent){
-				oAggregationInfo.refresh(that, oEvent.getParameter("reason"));
-			},
-			fnDataStateChangeHandler = function(oEvent) {
-				var oDataState = oBinding.getDataState();
-				if (!oDataState) {
-					return;
-				}
-				//inform generic refreshDataState method
-				if (that.refreshDataState) {
-					that.refreshDataState(sName, oDataState);
-				}
-			};
-
-			var oModel = this.getModel(oBindingInfo.model);
-			if (this.isTreeBinding(sName)) {
-				oBinding = oModel.bindTree(oBindingInfo.path, this.getBindingContext(oBindingInfo.model), oBindingInfo.filters, oBindingInfo.parameters, oBindingInfo.sorter);
-			} else {
-				oBinding = oModel.bindList(oBindingInfo.path, this.getBindingContext(oBindingInfo.model), oBindingInfo.sorter, oBindingInfo.filters, oBindingInfo.parameters);
-				if (this.bUseExtendedChangeDetection) {
-					assert(!this.oExtendedChangeDetectionConfig || !this.oExtendedChangeDetectionConfig.symbol, "symbol function must not be set by controls");
-					oBinding.enableExtendedChangeDetection(!oBindingInfo.template, oBindingInfo.key, this.oExtendedChangeDetectionConfig);
-				}
-			}
-
-		if (oBindingInfo.suspended) {
-			oBinding.suspend(true);
-		}
-
-		oBindingInfo.binding = oBinding;
-		oBindingInfo.modelChangeHandler = fnModelChangeHandler;
-		oBindingInfo.modelRefreshHandler = fnModelRefreshHandler;
-		oBindingInfo.dataStateChangeHandler = fnDataStateChangeHandler;
-
-		oBinding.attachChange(fnModelChangeHandler);
-
-		oBinding.attachRefresh(fnModelRefreshHandler);
-
-		oBinding.attachEvents(oBindingInfo.events);
-
-		if (this.refreshDataState) {
-			oBinding.attachAggregatedDataStateChange(fnDataStateChangeHandler);
-		}
-
-		oBinding.initialize();
-
-		if (this._observer) {
-			this._observer.bindingChange(this, sName, "ready", oBindingInfo, "aggregation");
-		}
-	};
+	ManagedObject.prototype._bindAggregation = logError.bind(null, "_bindAggregation");
 
 	/**
 	 * Detach all aggregation binding event handler
@@ -4023,19 +3627,7 @@ sap.ui.define([
 	 * @param {string} sName the name of the aggregation
 	 * @private
 	 */
-	ManagedObject.prototype._detachAggregationBindingHandlers = function(sName) {
-		var oBindingInfo = this.mBindingInfos[sName];
-		if (oBindingInfo) {
-			if (oBindingInfo.binding) {
-				oBindingInfo.binding.detachChange(oBindingInfo.modelChangeHandler);
-				oBindingInfo.binding.detachRefresh(oBindingInfo.modelRefreshHandler);
-				oBindingInfo.binding.detachEvents(oBindingInfo.events);
-				if (this.refreshDataState) {
-					oBindingInfo.binding.detachAggregatedDataStateChange(oBindingInfo.dataStateChangeHandler);
-				}
-			}
-		}
-	};
+	ManagedObject.prototype._detachAggregationBindingHandlers = logError.bind(null, "_detachAggregationBindingHandlers");
 
 	/**
 	 * Unbind the aggregation from the model.
@@ -4048,7 +3640,7 @@ sap.ui.define([
 	 * @returns {this} Reference to this instance itself
 	 * @public
 	 */
-	ManagedObject.prototype.unbindAggregation = function(sName, bSuppressReset){
+	ManagedObject.prototype.unbindAggregation = function(sName, bSuppressReset) {
 		var oForwarder = this.getMetadata().getAggregationForwarder(sName);
 		if (oForwarder && oForwarder.forwardBinding) {
 			oForwarder.getTarget(this).unbindAggregation(oForwarder.targetAggregationName, bSuppressReset);
@@ -4059,10 +3651,7 @@ sap.ui.define([
 			oAggregationInfo = this.getMetadata().getAggregation(sName);
 		if (oBindingInfo) {
 			if (oBindingInfo.binding) {
-				if (!this._bIsBeingDestroyed) {
-					this._detachAggregationBindingHandlers(sName);
-				}
-				oBindingInfo.binding.destroy();
+				this._unbindAggregation(oBindingInfo, sName);
 			}
 			// remove template if any
 			if (oBindingInfo.template ) {
@@ -4084,6 +3673,8 @@ sap.ui.define([
 		return this;
 	};
 
+	ManagedObject.prototype._unbindAggregation = logError.bind(null, "_unbindAggregation");
+
 	/**
 	 * Generic method which is called whenever an aggregation binding has changed.
 	 *
@@ -4109,146 +3700,7 @@ sap.ui.define([
 	 *   reason, and describe under what circumstances each value will be used.
 	 * @protected
 	 */
-	ManagedObject.prototype.updateAggregation = function(sName, sChangeReason, oEventInfo) {
-		var oBindingInfo = this.mBindingInfos[sName],
-			oBinding = oBindingInfo.binding,
-			fnFactory = oBindingInfo.factory,
-			oAggregationInfo = this.getMetadata().getAggregation(sName),  // TODO fix handling of hidden aggregations
-			sGroup,
-			bGrouped,
-			aContexts,
-			sGroupFunction = oAggregationInfo._sMutator + "Group",
-			that = this;
-
-		function getIdSuffix(oControl, iIndex) {
-			if (that.bUseExtendedChangeDetection) {
-				return ManagedObjectMetadata.uid('clone');
-			} else {
-				return oControl.getId() + "-" + iIndex;
-			}
-		}
-
-		// Update a single aggregation with the array of contexts. Reuse existing children
-		// and just append or remove at the end, if some are missing or too many.
-		function update(oControl, aContexts, fnBefore, fnAfter) {
-			var aChildren = oControl[oAggregationInfo._sGetter]() || [],
-				oContext,
-				oClone;
-			if (aChildren.length > aContexts.length) {
-				for (var i = aContexts.length; i < aChildren.length; i++) {
-					oClone = aChildren[i];
-					oControl[oAggregationInfo._sRemoveMutator](oClone);
-					oClone.destroy("KeepDom");
-				}
-			}
-			for (var i = 0; i < aContexts.length; i++) {
-				oContext = aContexts[i];
-				oClone = aChildren[i];
-				if (fnBefore) {
-					fnBefore(oContext);
-				}
-				if (oClone) {
-					oClone.setBindingContext(oContext, oBindingInfo.model);
-				} else {
-					oClone = fnFactory(getIdSuffix(oControl, i), oContext);
-					oClone.setBindingContext(oContext, oBindingInfo.model);
-					oControl[oAggregationInfo._sMutator](oClone);
-				}
-				if (fnAfter) {
-					fnAfter(oContext, oClone);
-				}
-			}
-		}
-
-		// Update a single aggregation with the array of contexts. Use the calculated diff to
-		// only add/remove children as the data has changed to minimize control updates and rendering
-		function updateDiff(oControl, aContexts) {
-			var aDiff = aContexts.diff,
-				aChildren = oControl[oAggregationInfo._sGetter]() || [],
-				oDiff, oClone, oContext, i;
-
-			// If no diff exists or aggregation is empty, fall back to default update
-			if (!aDiff || aChildren.length === 0) {
-				update(oControl, aContexts);
-				return;
-			}
-
-			// Loop through the diff and apply it
-			for (i = 0; i < aDiff.length; i++) {
-				oDiff = aDiff[i];
-				switch (oDiff.type) {
-					case "insert":
-						oContext = aContexts[oDiff.index];
-						oClone = fnFactory(getIdSuffix(oControl, oDiff.index), oContext);
-						oClone.setBindingContext(oContext, oBindingInfo.model);
-						oControl[oAggregationInfo._sInsertMutator](oClone, oDiff.index);
-						break;
-					case "delete":
-						oClone = oControl[oAggregationInfo._sRemoveMutator](oDiff.index);
-						oClone.destroy("KeepDom");
-						break;
-					default:
-						Log.error("Unknown diff type \"" + oDiff.type + "\"");
-				}
-			}
-
-			// Loop through all children and set the binding context again. This is needed for
-			// indexed contexts, where inserting/deleting entries shifts the index of all following items
-			aChildren = oControl[oAggregationInfo._sGetter]() || [];
-			for (i = 0; i < aChildren.length; i++) {
-				aChildren[i].setBindingContext(aContexts[i], oBindingInfo.model);
-			}
-		}
-
-		// Check the current context for its group. If the group key changes, call the
-		// group function on the control.
-		function updateGroup(oContext) {
-			var oNewGroup = oBinding.getGroup(oContext);
-			if (oNewGroup.key !== sGroup) {
-				var oGroupHeader;
-				//If factory is defined use it
-				if (oBindingInfo.groupHeaderFactory) {
-					oGroupHeader = oBindingInfo.groupHeaderFactory(oNewGroup);
-				}
-				that[sGroupFunction](oNewGroup, oGroupHeader);
-				sGroup = oNewGroup.key;
-			}
-		}
-
-		// Update the tree recursively
-		function updateRecursive(oControl, oContexts) {
-			update(oControl, oContexts, null, function(oContext, oClone) {
-				updateRecursive(oClone, oBinding.getNodeContexts(oContext));
-			});
-		}
-
-		if (BaseObject.isA(oBinding, "sap.ui.model.ListBinding")) {
-			aContexts = oBinding.getContexts(oBindingInfo.startIndex, oBindingInfo.length);
-			bGrouped = oBinding.isGrouped() && that[sGroupFunction];
-			if (bGrouped || oBinding.bWasGrouped) {
-				// If grouping is enabled, destroy aggregation and use updateGroup as fnBefore to create groups
-				this[oAggregationInfo._sDestructor]();
-				update(this, aContexts, bGrouped ? updateGroup : undefined);
-			} else if (this.bUseExtendedChangeDetection) {
-				// With extended change detection just update according to the diff
-				updateDiff(this, aContexts);
-			} else {
-				// If factory function is used without extended change detection, destroy aggregation
-				if (!oBindingInfo.template) {
-					this[oAggregationInfo._sDestructor]();
-				}
-				update(this, aContexts);
-			}
-			oBinding.bWasGrouped = bGrouped;
-		} else if (BaseObject.isA(oBinding, "sap.ui.model.TreeBinding")) {
-			// Destroy all children in case a factory function is used
-			if (!oBindingInfo.template) {
-				this[oAggregationInfo._sDestructor]();
-			}
-			// In fnAfter call update recursively for the child nodes of the current tree node
-			updateRecursive(this, oBinding.getRootContexts());
-		}
-	};
+	ManagedObject.prototype.updateAggregation = function(sName, sChangeReason, oEventInfo) { };
 
 	/**
 	 * Generic method which can be called, when an aggregation needs to be refreshed.
@@ -4262,11 +3714,7 @@ sap.ui.define([
 	 * @param {string} sName name of the aggregation to refresh
 	 * @protected
 	 */
-	ManagedObject.prototype.refreshAggregation = function(sName) {
-		var oBindingInfo = this.mBindingInfos[sName],
-			oBinding = oBindingInfo.binding;
-		oBinding.getContexts(oBindingInfo.startIndex, oBindingInfo.length);
-	};
+	ManagedObject.prototype.refreshAggregation = function(sName) { };
 
 	/**
 	* Generic method which is called, whenever messages for this object exist.
@@ -4306,139 +3754,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ManagedObject.prototype.updateBindings = function(bUpdateAll, sModelName) {
-		var that = this,
-			sName,
-			bCanCreate,
-			oBindingInfo;
-
-		/*
-		 * Checks whether the binding for the given oBindingInfo became invalid because
-		 * of the current model change (as identified by bUpdateAll and sModelName).
-		 *
-		 * Precondition: oBindingInfo contains a 'binding' object
-		 *
-		 * @param {object} oBindingInfo
-		 * @returns {boolean} Whether the binding info became invalid
-		 * @private
-		 */
-		function becameInvalid(oBindingInfo) {
-			var aParts = oBindingInfo.parts,
-				i;
-
-			if (aParts) {
-				if (aParts.length == 1) {
-					// simple property binding: invalid when the model has the same name (or updateall) and when the model instance differs
-					return (bUpdateAll || aParts[0].model == sModelName) && !oBindingInfo.binding.updateRequired(that.getModel(aParts[0].model));
-				} else {
-					// simple or composite binding: invalid when for any part the model has the same name (or updateall) and when the model instance for that part differs
-					for (i = 0; i < aParts.length; i++) {
-						if ( (bUpdateAll || aParts[i].model == sModelName) && !oBindingInfo.binding.aBindings[i].updateRequired(that.getModel(aParts[i].model)) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				// list or object binding: invalid when  the model has the same name (or updateall) and when the model instance differs
-				return (bUpdateAll || oBindingInfo.model == sModelName) && !oBindingInfo.binding.updateRequired(that.getModel(oBindingInfo.model));
-			}
-		}
-
-		/*
-		 * Checks whether a binding can be created for the given oBindingInfo.
-		 *
-		 * @param {object} oBindingInfo
-		 * @returns {boolean} Whether a binding can be created
-		 * @private
-		 */
-		function canCreate(oBindingInfo) {
-			var aParts = oBindingInfo.parts,
-				i;
-
-			if (aParts) {
-				for (i = 0; i < aParts.length; i++) {
-					// check if model exists - ignore static bindings
-					if ( !that.getModel(aParts[i].model) && aParts[i].value === undefined) {
-						return false;
-					}
-				}
-				return true;
-			} else { // List or object binding
-				return !!that.getModel(oBindingInfo.model);
-			}
-		}
-
-		/*
-		 * Remove binding, detach all events and destroy binding object
-		 */
-		function removeBinding(oBindingInfo) {
-			var oBinding = oBindingInfo.binding;
-			// Also tell the Control that the messages have been removed (if any)
-			if (that.refreshDataState) {
-				that.refreshDataState(sName, oBinding.getDataState());
-			}
-
-			oBinding.detachChange(oBindingInfo.modelChangeHandler);
-			if (oBindingInfo.modelRefreshHandler) { // only list bindings currently have a refresh handler attached
-				oBinding.detachRefresh(oBindingInfo.modelRefreshHandler);
-			}
-			oBinding.detachEvents(oBindingInfo.events);
-			oBinding.destroy();
-			// remove all binding related data from the binding info
-			delete oBindingInfo.binding;
-			delete oBindingInfo.modelChangeHandler;
-			delete oBindingInfo.dataStateChangeHandler;
-			delete oBindingInfo.modelRefreshHandler;
-		}
-
-		// create object bindings if they don't exist yet
-		for ( sName in this.mObjectBindingInfos ) {
-			oBindingInfo = this.mObjectBindingInfos[sName];
-			bCanCreate = canCreate(oBindingInfo);
-			// if there is a binding and if it became invalid through the current model change, then remove it
-			if ( oBindingInfo.binding && becameInvalid(oBindingInfo) ) {
-				removeBinding(oBindingInfo);
-				// if model does not exists anymore, also delete the BindingContext
-				if (!bCanCreate) {
-					delete this.mElementBindingContexts[sName];
-				}
-			}
-
-			// if there is no binding and if all required information is available, create a binding object
-			if ( !oBindingInfo.binding && bCanCreate ) {
-				this._bindObject(oBindingInfo);
-			}
-		}
-
-		// create property and aggregation bindings if they don't exist yet
-		for ( sName in this.mBindingInfos ) {
-
-			oBindingInfo = this.mBindingInfos[sName];
-
-			// if there is a binding and if it became invalid through the current model change, then remove it
-			if ( oBindingInfo.binding && becameInvalid(oBindingInfo) ) {
-				if (this._observer) {
-					var sMember = oBindingInfo.factory ? "aggregation" : "property";
-					this._observer.bindingChange(this, sName, "remove", oBindingInfo, sMember);
-				}
-
-				removeBinding(oBindingInfo);
-			}
-
-			// if there is no binding and if all required information is available, create a binding object
-			if ( !oBindingInfo.binding && canCreate(oBindingInfo) ) {
-				if (oBindingInfo.factory) {
-					this._bindAggregation(sName, oBindingInfo);
-				} else {
-					this._bindProperty(sName, oBindingInfo);
-				}
-			}
-
-		}
-
-
-	};
-
+	ManagedObject.prototype.updateBindings = function(bUpdateAll, sModelName) { };
 
 	/**
 	 * Find out whether a property or aggregation is bound
@@ -4464,18 +3780,20 @@ sap.ui.define([
 	 * refers to the default model.
 	 *
 	 * @param {string} [sModelName=undefined] Non-empty name of the model or <code>undefined</code>
-	 * @return {sap.ui.model.ContextBinding} Context binding for the given model name or <code>undefined</code>
+	 * @returns {sap.ui.model.ContextBinding|undefined} Context binding for the given model name or <code>undefined</code>
 	 * @public
 	 */
 	ManagedObject.prototype.getObjectBinding = function(sModelName){
-		return this.mObjectBindingInfos[sModelName] && this.mObjectBindingInfos[sModelName].binding;
+		assertModelName(sModelName);
+		var oInfo = this._getObjectBindingInfo(sModelName);
+		return oInfo && oInfo.binding;
 	};
 
 	/**
 	 * Returns the parent managed object as new eventing parent to enable control event bubbling
 	 * or <code>null</code> if this object hasn't been added to a parent yet.
 	 *
-	 * @return {sap.ui.base.EventProvider} the parent event provider
+	 * @returns {sap.ui.base.EventProvider|null} the parent event provider
 	 * @protected
 	 */
 	ManagedObject.prototype.getEventingParent = function() {
@@ -4483,10 +3801,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Get the binding object for a specific aggregation/property
+	 * Get the binding object for a specific aggregation/property.
 	 *
 	 * @param {string} sName the name of the property or aggregation
-	 * @return {sap.ui.model.Binding} the binding for the given name
+	 * @returns {sap.ui.model.Binding|undefined} the binding for the given name
 	 * @public
 	 */
 	ManagedObject.prototype.getBinding = function(sName){
@@ -4495,10 +3813,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Get the binding path for a specific aggregation/property
+	 * Get the binding path for a specific aggregation/property.
 	 *
 	 * @param {string} sName the name of the property or aggregation
-	 * @return {string} the binding path for the given name
+	 * @return {string|undefined} the binding path for the given name
 	 * @protected
 	 */
 	ManagedObject.prototype.getBindingPath = function(sName){
@@ -4531,9 +3849,9 @@ sap.ui.define([
 	 * @public
 	 */
 	ManagedObject.prototype.setBindingContext = function(oContext, sModelName){
-		assert(sModelName === undefined || (typeof sModelName === "string" && !/^(undefined|null)?$/.test(sModelName)), "sModelName must be a string or omitted");
+		assertModelName(sModelName);
 		var oOldContext = this.oBindingContexts[sModelName];
-		if (Context.hasChanged(oOldContext, oContext)) {
+		if (oOldContext !== oContext || oContext && oContext.hasChanged()) {
 			if (oContext === undefined) {
 				delete this.oBindingContexts[sModelName];
 			} else {
@@ -4558,106 +3876,13 @@ sap.ui.define([
 	 * @param {string} [sModelName] the name of the model to set the context for or <code>undefined</code>
 	 * @private
 	 */
-	ManagedObject.prototype.setElementBindingContext = function(oContext, sModelName){
-		assert(sModelName === undefined || (typeof sModelName === "string" && !/^(undefined|null)?$/.test(sModelName)), "sModelName must be a string or omitted");
-		var oOldContext = this.mElementBindingContexts[sModelName];
-
-		if (Context.hasChanged(oOldContext, oContext)) {
-			if (oContext === undefined) {
-				delete this.mElementBindingContexts[sModelName];
-			} else {
-				this.mElementBindingContexts[sModelName] = oContext;
-			}
-			this.updateBindingContext(true, sModelName);
-			this.propagateProperties(sModelName);
-			this.fireModelContextChange();
-		}
-		return this;
-	};
+	ManagedObject.prototype.setElementBindingContext = function(oContext, sModelName) { };
 
 	/**
 	 * Update the binding context in this object and all aggregated children
 	 * @private
 	 */
-	ManagedObject.prototype.updateBindingContext = function(bSkipLocal, sFixedModelName, bUpdateAll){
-
-		var oModel,
-			oModelNames = {},
-			sModelName,
-			oContext,
-			sName,
-			oBindingInfo,
-			aParts;
-
-		// Whether the binding part with the given index belongs to the current model name and is
-		// not a static binding
-		function isPartForModel(iPartIndex) {
-			return aParts[iPartIndex].model == sModelName && aParts[iPartIndex].value === undefined;
-		}
-
-		// find models that need a context update
-		if (bUpdateAll) {
-			for (sModelName in this.oModels) {
-				if ( this.oModels.hasOwnProperty(sModelName) ) {
-					oModelNames[sModelName] = sModelName;
-				}
-			}
-			for (sModelName in this.oPropagatedProperties.oModels) {
-				if ( this.oPropagatedProperties.oModels.hasOwnProperty(sModelName) ) {
-					oModelNames[sModelName] = sModelName;
-				}
-			}
-		} else {
-			oModelNames[sFixedModelName] = sFixedModelName;
-		}
-
-		for (sModelName in oModelNames ) {
-			if ( oModelNames.hasOwnProperty(sModelName) ) {
-				sModelName = sModelName === "undefined" ? undefined : sModelName;
-				oModel = this.getModel(sModelName);
-				oBindingInfo = this.mObjectBindingInfos[sModelName];
-
-				if (oModel && oBindingInfo && !bSkipLocal) {
-					if (!oBindingInfo.binding) {
-						this._bindObject(oBindingInfo);
-					} else {
-						oContext = this._getBindingContext(sModelName);
-						if (Context.hasChanged(oBindingInfo.binding.getContext(), oContext)) {
-							oBindingInfo.binding.setContext(oContext);
-						}
-					}
-					continue;
-				}
-
-				oContext = this.getBindingContext(sModelName);
-
-				// update context in existing bindings
-				for ( sName in this.mBindingInfos ){
-					var oBindingInfo = this.mBindingInfos[sName],
-						oBinding = oBindingInfo.binding;
-
-					aParts = oBindingInfo.parts;
-
-					if (!oBinding) {
-						continue;
-					}
-					if (oBinding instanceof CompositeBinding) {
-						oBinding.setContext(oContext, {fnIsBindingRelevant : isPartForModel});
-					} else if (oBindingInfo.factory) {
-						// list binding: update required when the model has the same name (or updateall)
-						if ( oBindingInfo.model == sModelName) {
-							oBinding.setContext(oContext);
-						}
-
-					} else if (isPartForModel(0)) {
-						// simple property binding: update required when the model has the same name
-						oBinding.setContext(oContext);
-					}
-				}
-			}
-		}
-
-	};
+	ManagedObject.prototype.updateBindingContext = function(bSkipLocal, sFixedModelName, bUpdateAll) { };
 
 
 	/**
@@ -4870,6 +4095,9 @@ sap.ui.define([
 			sAggregationName, oAggregation, i,
 			mAllAggregations = Object.assign({}, this.mAggregations, this.mForwardedAggregations);
 
+		// introduce data binding capabilities via mixin if available
+		checkForBindingSupport(oProperties.oModels);
+
 		for (sAggregationName in mAllAggregations) {
 			if (this.mSkipPropagation[sAggregationName]) {
 				continue;
@@ -4898,6 +4126,10 @@ sap.ui.define([
 			bUpdateListener = vName === false;
 			sName = bUpdateAll ? undefined : vName;
 		}
+
+		// introduce data binding capabilities via mixin if available
+		checkForBindingSupport(oProperties.oModels);
+
 		if (oObject.oPropagatedProperties !== oProperties) {
 			oObject.oPropagatedProperties = oProperties;
 			// if propagation triggered by adding a listener no binding updates needed
@@ -4970,7 +4202,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ManagedObject.prototype.getModel = function(sModelName) {
-		assert(sModelName === undefined || (typeof sModelName === "string" && !/^(undefined|null)?$/.test(sModelName)), "sModelName must be a string or omitted");
+		assertModelName(sModelName);
 		return this.oModels[sModelName] || this.oPropagatedProperties.oModels[sModelName];
 	};
 
@@ -5093,7 +4325,7 @@ sap.ui.define([
 			sKey,
 			sName,
 			oClone,
-			escape = ManagedObject.bindingParser.escape,
+			escape = BindingInfo.escape,
 			i,
 			oTarget;
 
@@ -5113,7 +4345,7 @@ sap.ui.define([
 					vValue = oProperty.byValue ? deepClone(mProps[sKey]) : mProps[sKey];
 					if (vValue && typeof vValue === "object" && !Object.isFrozen(vValue)) {
 						//mark objects to not interpret it as bindingInfos
-						vValue[sUI5ObjectMarker] = true;
+						vValue[BindingInfo.UI5ObjectMarker] = true;
 					}
 					mSettings[sKey] = vValue;
 				}
@@ -5179,15 +4411,15 @@ sap.ui.define([
 		 * Clones the BindingInfo for the aggregation/property with the given name of this ManagedObject and binds
 		 * the aggregation/property with the given target name on the given clone using the same BindingInfo.
 		 *
-		 * @param {sap.ui.base.ManagedObject} oSource Source of the clone operation
-		 * @param {string} sName the name of the binding to clone
+		 * @param {sap.ui.base.ManagedObject.ObjectBindingInfo|sap.ui.base.ManagedObject.AggregationBindingInfo|sap.ui.base.ManagedObject.PropertyBindingInfo} oBindingInfo the original binding info
 		 * @param {sap.ui.base.ManagedObject} oClone the object on which to establish the cloned binding
-		 * @param {string} sTargetName the name of the clone's aggregation to bind
+		 * @param {string} [sTargetName] the name of the clone's aggregation/property to bind, omitted for object bindings
+		 * @param {sap.ui.base.ManagedObject} [oSource] Source of the clone operation
+		 * @param {string} [sName] the name of the aggregation/property
 		 * @private
 		 */
-		function cloneBinding(oSource, sName, oClone, sTargetName) {
-			var oBindingInfo = oSource.mBindingInfos[sName];
-			oBindingInfo = oBindingInfo || oSource.getBindingInfo(sName); // fallback for forwarded bindings
+		function cloneBinding(oBindingInfo, oClone, sTargetName, oSource, sName) {
+			var bIsObjectBinding = !sTargetName;
 			var oCloneBindingInfo = Object.assign({}, oBindingInfo);
 
 			// clone the template if it is not sharable
@@ -5210,21 +4442,15 @@ sap.ui.define([
 			delete oCloneBindingInfo.dataStateChangeHandler;
 			delete oCloneBindingInfo.modelRefreshHandler;
 
-			if (oBindingInfo.factory || oBindingInfo.template) {
+			if (bIsObjectBinding) {
+				oClone.bindObject(oCloneBindingInfo);
+			} else if (oBindingInfo.factory) {
 				oClone.bindAggregation(sTargetName, oCloneBindingInfo);
 			} else {
 				oClone.bindProperty(sTargetName, oCloneBindingInfo);
 			}
 		}
 
-		/* Clone element bindings: Clone the objects not the parameters
-		 * Context will only be updated when adding the control to the control tree;
-		 * Maybe we have to call updateBindingContext() here?
-		 */
-		for (sName in this.mObjectBindingInfos) {
-			oClone.mObjectBindingInfos[sName] = Object.assign({}, this.mObjectBindingInfos[sName]);
-		}
-
 		// Clone events
 		for (sName in this.mEventRegistry) {
 			oClone.mEventRegistry[sName] = this.mEventRegistry[sName].slice();
@@ -5232,8 +4458,12 @@ sap.ui.define([
 
 		// Clone bindings
 		if (bCloneBindings) {
+			for (sName in this.mObjectBindingInfos) {
+				cloneBinding(this.mObjectBindingInfos[sName], oClone);
+			}
+
 			for (sName in this.mBindingInfos) {
-				cloneBinding(this, sName, oClone, sName);
+				cloneBinding(this.mBindingInfos[sName], oClone, sName, this, sName);
 			}
 		}
 
@@ -5253,7 +4483,7 @@ sap.ui.define([
 				if (oForwarder) {
 					oTarget = oForwarder.getTarget(oClone, true);
 					if (oForwarder.forwardBinding && this.isBound(sName)) { // forwarded bindings have not been cloned yet
-						cloneBinding(this, sName, oTarget, oForwarder.targetAggregationName);
+						cloneBinding(this.getBindingInfo(sName), oTarget, oForwarder.targetAggregationName, this, sName);
 					}
 				}
 			}