@openui5/sap.ui.core 1.120.0 → 1.120.2

package/src/sap/ui/core/util/ExportCell.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportColumn.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportRow.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/ManagedObject'],
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportTypeCSV.js

@@ -38,7 +38,7 @@ sap.ui.define(['./ExportType'],
 	 * @extends sap.ui.core.util.ExportType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/File.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 	 * Utility class to handle files.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @namespace
 	 *
 	 * @public

package/src/sap/ui/core/util/LibraryInfo.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @private
 	 * @alias sap.ui.core.util.LibraryInfo
 	 */

package/src/sap/ui/core/util/MockServer.js

@@ -33,7 +33,7 @@ sap.ui
 			 * @extends sap.ui.base.ManagedObject
 			 * @abstract
 			 * @author SAP SE
-			 * @version 1.120.0
+			 * @version 1.120.2
 			 * @public
 			 * @alias sap.ui.core.util.MockServer
 			 */
@@ -1224,7 +1224,8 @@ sap.ui
 						"type": aEntityTypeParts[3],
 						"keys": [],
 						"keysType": {},
-						"navprops": {}
+						"navprops": {},
+						"props": {}
 					};
 				});
 
@@ -1270,6 +1271,15 @@ sap.ui
 						oEntitySet.keys.push(sKeyName);
 						oEntitySet.keysType[sKeyName] = jQuery($EntityType).find("Property[Name='" + sKeyName + "']").attr("Type");
 					});
+					// find the props
+					var aProps = jQuery(oMetadata).find("EntityType[Name='" + oEntitySet.type + "'] Property");
+					jQuery.each(aProps, function(iIndex, oProp) {
+						var $Prop = jQuery(oProp);
+						oEntitySet.props[$Prop.attr("Name")] = {
+							"name": $Prop.attr("Name"),
+							"type": $Prop.attr("Type")
+						};
+					});
 					// resolve the navigation properties
 					var aNavProps = jQuery(oMetadata).find("EntityType[Name='" + oEntitySet.type + "'] NavigationProperty");
 					jQuery.each(aNavProps, function(iIndex, oNavProp) {
@@ -1516,9 +1526,30 @@ sap.ui
 				});
 				//enhance the mock data with metadata
 				jQuery.each(mEntitySets, function(sEntitySetName, oEntitySet) {
-					// enhance with OData metadata if exists
 					if (that._oMockdata[sEntitySetName].length > 0) {
+						// enhance with OData metadata if exists
 						that._enhanceWithMetadata(oEntitySet, that._oMockdata[sEntitySetName]);
+						// allow to specify the Edm.DateTime as "2023-11-13T09:36" and the
+						// Edm.DateTimeOffset as "2023-11-13T09:36Z" to simplfy definition
+						// in mockdata - if format is already /Date(%timestamp%)/ it is not
+						// handled by this function as the mock data string must be a Date
+						that._oMockdata[sEntitySetName].forEach(function(oRecord) {
+							Object.keys(oEntitySet.props).forEach(function(sPropName) {
+								switch (oEntitySet.props[sPropName].type) {
+									case "Edm.DateTime":
+									case "Edm.DateTimeOffset":
+										if (oRecord[sPropName] != null) {
+											var oDate = new Date(oRecord[sPropName]);
+											if (oDate && !isNaN(oDate)) {
+												oRecord[sPropName] = "/Date(" + oDate.getTime() + ")/";
+											}
+										}
+										break;
+									default:
+										// do nothing
+								}
+							});
+						});
 					}
 				});
 				// return the new mockdata

package/src/sap/ui/core/util/PasteHelper.js

@@ -13,7 +13,7 @@ sap.ui.define([ "sap/ui/core/Core", "sap/ui/model/ParseException", "sap/ui/model
 	 *
 	 * @class Parses and validates data on the <code>paste</code> event of an SAPUI5 table.
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @private
 	 * @ui5-restricted sap.ui.table.Table, sap.m.Table, sap.m.plugins.PasteProvider
 	 * @alias sap.ui.core.util.PasteHelper

package/src/sap/ui/core/util/_LocalizationHelper.js

@@ -0,0 +1,122 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/Event",
+	"sap/base/Log",
+	"sap/base/i18n/Formatting",
+	"sap/base/i18n/Localization",
+	"sap/ui/thirdparty/jquery"
+], (
+	BaseEvent,
+	Log,
+	Formatting,
+	Localization,
+	jQuery
+) => {
+	'use strict';
+
+	const mRegistry = {};
+
+	function getObjectsToUpdate() {
+		let aObjectsToUpdate = [];
+		for (const fnGetObjects of Object.values(mRegistry)) {
+			aObjectsToUpdate = [...aObjectsToUpdate, ...Object.values(fnGetObjects())];
+		}
+		return aObjectsToUpdate;
+	}
+
+	function handleLocalizationChange(oEvent) {
+		let sEventId = "LocalizationChanged";
+		/**
+		 * @deprecated As of Version 1.120
+		 */
+		sEventId = "localizationChanged";
+
+		const mChanges = BaseEvent.getParameters(oEvent),
+			oBrowserEvent = jQuery.Event(sEventId, {changes : mChanges}),
+			aObjectsToUpdate = getObjectsToUpdate(),
+			bRTLChanged = mChanges.rtl !== undefined;
+
+		Log.info("localization settings changed: " + Object.keys(mChanges).join(","), null, "sap/ui/core/util/LocalizationHelper");
+
+		// special handling for changes of the RTL mode
+		if (bRTLChanged) {
+			// update the dir attribute of the document
+			document.documentElement.setAttribute("dir", mChanges.rtl ? "rtl" : "ltr");
+			Log.info("RTL mode " + mChanges.rtl ? "activated" : "deactivated");
+		}
+
+		/*
+		 * phase 1: update the models
+		 */
+		for (const oObject of aObjectsToUpdate) {
+			for (const sName in oObject.oModels) {
+				const oModel = oObject.oModels[sName];
+				oModel?._handleLocalizationChange?.();
+			}
+		}
+
+		/*
+		 * phase 2: update bindings and types
+		 */
+		for (const oObject of aObjectsToUpdate) {
+			for (const sName in oObject.mBindingInfos) {
+				const oBindingInfo = oObject.mBindingInfos[sName];
+				const aParts = oBindingInfo.parts;
+				if (aParts) {
+					// property or composite binding: visit all parts
+					for (let i = 0; i < aParts.length; i++) {
+						oBindingInfo.type?._handleLocalizationChange?.();
+					}
+					oBindingInfo.modelChangeHandler?.();
+				}
+			}
+			// invalidate all UIAreas if RTL changed
+			if (bRTLChanged && oObject.isA("sap.ui.core.UIArea")) {
+				oObject.invalidate();
+			}
+			// notify Elements via a pseudo browser event (onLocalizationChanged)
+			if (oObject.isA("sap.ui.core.Element")) {
+				oObject._handleEvent(oBrowserEvent);
+			}
+		}
+	}
+
+	Formatting.attachChange(handleLocalizationChange);
+	Localization.attachChange(handleLocalizationChange);
+
+	/**
+	 * Update all localization dependent objects that this managed object can reach,
+	 * except for its aggregated children (which will be updated by the Core).
+	 *
+	 * To make the update work as smooth as possible, it happens in two phases:
+	 * <ol>
+	 *  <li>In phase 1 all known models are updated.</li>
+	 *  <li>In phase 2 all bindings are updated.</li>
+	 * </ol>
+	 * This separation is necessary as the models for the bindings might be updated
+	 * in some ManagedObject or in the Core and the order in which the objects are visited
+	 * is not defined.
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.core
+	 */
+	const _LocalizationHelper = {
+		init() {
+			const sDir = Localization.getRTL() ? "rtl" : "ltr";
+
+			// Set the document's dir property
+			document.documentElement.setAttribute("dir", sDir); // webkit does not allow setting document.dir before the body exists
+			Log.info("Content direction set to '" + sDir + "'", null, "sap/ui/core/util/_LocalizationHelper");
+		},
+		registerForUpdate(sType, fnGetObjects) {
+			mRegistry[sType] = fnGetObjects;
+		}
+	};
+
+	return _LocalizationHelper;
+});

package/src/sap/ui/core/util/serializer/HTMLViewSerializer.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './Serializer', './delegate/HTML', '
 	 * @class HTMLViewSerializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.HTMLViewSerializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/Serializer.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	 * @class Serializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.Serializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/ViewSerializer.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './HTMLViewSerializer', './XMLViewSe
 	 * @class ViewSerializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.ViewSerializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/XMLViewSerializer.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './Serializer', './delegate/XML', 's
 	 * @class XMLViewSerializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.XMLViewSerializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/delegate/Delegate.js

@@ -17,7 +17,7 @@ sap.ui.define(['sap/ui/base/EventProvider'],
 	 * @class Abstract serializer delegate class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.delegate.Delegate
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/delegate/HTML.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Delegate', "sap/base/strings/hyphenate", "sap/base/util/deepEq
 	 * @class HTML serializer delegate class.
 	 * @extends sap.ui.core.util.serializer.delegate.Delegate
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.delegate.HTML
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/delegate/XML.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class XML serializer delegate class.
 	 * @extends sap.ui.core.util.serializer.delegate.Delegate
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.util.serializer.delegate.XML
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/webc/WebComponent.js

@@ -108,7 +108,7 @@ function(
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @public
 	 * @since 1.118.0
 	 * @alias sap.ui.core.webc.WebComponent

package/src/sap/ui/core/webc/WebComponentMetadata.js

@@ -23,7 +23,7 @@ function(ElementMetadata, WebComponentRenderer, camelize) {
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.118.0
 	 * @experimental Since 1.118.0 The API might change. It is not intended for productive usage yet!
 	 * @alias sap.ui.core.webc.WebComponentMetadata

package/src/sap/ui/core/ws/ReadyState.js

@@ -12,7 +12,7 @@ sap.ui.define(function() {
 	/**
 	 * Defines the different ready states for a WebSocket connection.
 	 *
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @enum {int}
 	 * @public
 	 * @alias sap.ui.core.ws.ReadyState

package/src/sap/ui/core/ws/SapPcpWebSocket.js

@@ -21,7 +21,7 @@ sap.ui.define(['./WebSocket', "sap/base/Log"],
 	 * @class WebSocket class implementing the pcp-protocol.
 	 * @extends sap.ui.core.ws.WebSocket
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.ws.SapPcpWebSocket
 	 */
 	var SapPcpWebSocket = WebSocket.extend("sap.ui.core.ws.SapPcpWebSocket", /** @lends sap.ui.core.ws.SapPcpWebSocket.prototype */ {

package/src/sap/ui/core/ws/WebSocket.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class Basic WebSocket class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.core.ws.WebSocket
 	 */
 	var WebSocket = EventProvider.extend("sap.ui.core.ws.WebSocket", /** @lends sap.ui.core.ws.WebSocket.prototype */ {

package/src/sap/ui/debug/ControlTree.js

@@ -34,7 +34,7 @@ sap.ui.define('sap/ui/debug/ControlTree', [
 	 * @class Control Tree used for the Debug Environment
 	 * @extends sap.ui.base.EventProvider
 	 * @author Martin Schaus, Frank Weigel
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.debug.ControlTree
 	 * @private
 	 */

package/src/sap/ui/debug/DebugEnv.js

@@ -37,7 +37,7 @@ sap.ui.define('sap/ui/debug/DebugEnv', [
 	 * @class Central Class for the Debug Environment
 	 *
 	 * @author Martin Schaus, Frank Weigel
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @private
 	 * @alias sap.ui.debug.DebugEnv
 	 * @deprecated As of Version 1.120

package/src/sap/ui/debug/PropertyList.js

@@ -32,7 +32,7 @@ sap.ui.define('sap/ui/debug/PropertyList', [
 	 *
 	 * @extends sap.ui.base.EventProvider
 	 * @author Martin Schaus
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @param {sap.ui.core.Core}
 	 *            oCore Core instance of the app; version might differ!

package/src/sap/ui/model/Binding.js

@@ -768,8 +768,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes all control messages for this binding from the MessageManager in addition to the
-	 * standard clean-up tasks.
+	 * Removes all control messages for this binding from {@link sap.ui.core.Messaging} in addition
+	 * to the standard clean-up tasks.
 	 * @see sap.ui.base.EventProvider#destroy
 	 *
 	 * @public

package/src/sap/ui/model/ClientListBinding.js

@@ -47,7 +47,7 @@ sap.ui.define([
 			ListBinding.apply(this, arguments);
 
 			this.mNormalizeCache = {};
-			this.oModel.checkFilterOperation(this.aApplicationFilters);
+			this.oModel.checkFilter(this.aApplicationFilters);
 			this.oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
 			this.bIgnoreSuspend = false;
 			// the serialized context data for the contexts returned by the last call of getContexts
@@ -324,11 +324,14 @@ sap.ui.define([
 	 *  be adjusted; if no type is given, then any previously configured application filters are
 	 *  cleared and the given filters are used as control filters
 	 * @returns {this} returns <code>this</code> to facilitate method chaining
-	 * @throws {Error} When one of the filters uses an operator that is not supported by the underlying model implementation
+	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
+	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
+	 *   <code>aFilters</code> together with other filters
+	 *
 	 * @public
 	 */
 	ClientListBinding.prototype.filter = function(aFilters, sFilterType){
-		this.oModel.checkFilterOperation(aFilters);
+		this.oModel.checkFilter(aFilters);
 
 		if (this.bSuspended) {
 			this.checkUpdate(true);

package/src/sap/ui/model/ClientModel.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @param {string} [oData] URL where to load the data from
 	 * @public

package/src/sap/ui/model/ClientTreeBinding.js

@@ -60,7 +60,7 @@ sap.ui.define([
 			this.mNormalizeCache = {};
 
 			if (aApplicationFilters) {
-				this.oModel.checkFilterOperation(aApplicationFilters);
+				this.oModel.checkFilter(aApplicationFilters);
 
 				if (this.oModel._getObject(this.sPath, this.oContext)) {
 					this.filter(aApplicationFilters, FilterType.Application);
@@ -269,7 +269,10 @@ sap.ui.define([
 	 *   is given, any previously configured application filters are cleared, and the given filters
 	 *   are used as control filters
 	 * @return {this} <code>this</code> to facilitate method chaining
-	 * @throws {Error} When one of the filters uses an operator that is not supported by the underlying model implementation
+	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
+	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
+	 *   <code>aFilters</code> together with other filters
+	 *
 	 * @public
 	 */
 	ClientTreeBinding.prototype.filter = function(aFilters, sFilterType){
@@ -281,7 +284,7 @@ sap.ui.define([
 		}
 
 		// check filter integrity
-		this.oModel.checkFilterOperation(aFilters);
+		this.oModel.checkFilter(aFilters);
 
 		if (sFilterType == FilterType.Application) {
 			this.aApplicationFilters = aFilters || [];

package/src/sap/ui/model/CompositeDataState.js

@@ -14,7 +14,7 @@ sap.ui.define(['./DataState', "sap/base/util/deepEqual", "sap/base/util/each"],
 	 * @extends sap.ui.model.DataState
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.CompositeDataState
@@ -107,7 +107,7 @@ sap.ui.define(['./DataState', "sap/base/util/deepEqual", "sap/base/util/each"],
 	/**
 	 * Returns the array of current state messages of the model.
 	 *
-	 * @returns {sap.ui.core.Message[]} The array of messages of the model
+	 * @returns {sap.ui.core.message.Message[]} The array of messages of the model
 	 *
 	 * @public
 	 */
@@ -118,7 +118,7 @@ sap.ui.define(['./DataState', "sap/base/util/deepEqual", "sap/base/util/each"],
 	/**
 	 * Returns the array of current state messages of the control.
 	 *
-	 * @return {sap.ui.core.Message[]} The array of control messages
+	 * @return {sap.ui.core.message.Message[]} The array of control messages
 	 *
 	 * @public
 	 */
@@ -130,7 +130,7 @@ sap.ui.define(['./DataState', "sap/base/util/deepEqual", "sap/base/util/each"],
 	 * Returns an array of all model and control messages of all parts of the composite binding,
 	 * regardless of whether they are old or new.
 	 *
-	 * @returns {sap.ui.core.Message[]} The array of all messages
+	 * @returns {sap.ui.core.message.Message[]} The array of all messages
 	 *
 	 * @public
 	 * @since 1.98.0
@@ -148,7 +148,7 @@ sap.ui.define(['./DataState', "sap/base/util/deepEqual", "sap/base/util/each"],
 	/**
 	 * Returns the array of all current state messages combining the model and control messages.
 	 *
-	 * @returns {sap.ui.core.Message[]} The array of all messages
+	 * @returns {sap.ui.core.message.Message[]} The array of all messages
 	 *
 	 * @public
 	 */

package/src/sap/ui/model/CompositeType.js

@@ -39,7 +39,7 @@ sap.ui.define(['./SimpleType'],
 	 *   <code>true</code>.
 	 * @extends sap.ui.model.SimpleType
 	 * @public
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var CompositeType = SimpleType.extend("sap.ui.model.CompositeType", /** @lends sap.ui.model.CompositeType.prototype */ {
 

package/src/sap/ui/model/DataState.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.DataState
@@ -126,7 +126,7 @@ sap.ui.define([
 	 * Returns an array of all model and control messages, regardless of whether they are old or
 	 * new.
 	 *
-	 * @returns {sap.ui.core.Message[]} The array of all messages
+	 * @returns {sap.ui.core.message.Message[]} The array of all messages
 	 *
 	 * @public
 	 * @since 1.98.0
@@ -144,7 +144,7 @@ sap.ui.define([
 	 * Returns the array of this data state's current messages combining the model and control
 	 * messages. The array is sorted descendingly by message severity.
 	 *
-	 * @returns {sap.ui.core.Message[]} The sorted array of all messages
+	 * @returns {sap.ui.core.message.Message[]} The sorted array of all messages
 	 *
 	 * @public
 	 */
@@ -156,7 +156,7 @@ sap.ui.define([
 	 * Returns the array of this data state's old messages combining the model and control messages.
 	 * The array is sorted descendingly by message severity.
 	 *
-	 * @returns {sap.ui.core.Message[]} The sorted array of all old messages
+	 * @returns {sap.ui.core.message.Message[]} The sorted array of all old messages
 	 * @private
 	 */
 	DataState.prototype._getOldMessages = function() {
@@ -169,8 +169,8 @@ sap.ui.define([
 	 *
 	 * @param {object} mProperties
 	 *   Object with properties <code>controlMessages</code> and <code>modelMessages</code> which
-	 *   are both arrays of <code>sap.ui.core.Message</code> objects
-	 * @returns {sap.ui.core.Message[]} The sorted array of messages
+	 *   are both arrays of <code>sap.ui.core.message.Message</code> objects
+	 * @returns {sap.ui.core.message.Message[]} The sorted array of messages
 	 * @private
 	 */
 	DataState.getMessagesForProperties = function (mProperties) {
@@ -188,7 +188,7 @@ sap.ui.define([
 	/**
 	 * Sets an array of model state messages.
 	 *
-	 * @param {sap.ui.core.Message[]} [aMessages=[]] The model messages for this data state.
+	 * @param {sap.ui.core.message.Message[]} [aMessages=[]] The model messages for this data state.
 	 * @returns {this} <code>this</code> to allow method chaining
 	 * @public
 	 */
@@ -200,7 +200,7 @@ sap.ui.define([
 	/**
 	 * Returns the array of this data state's current model messages.
 	 *
-	 * @returns {sap.ui.core.Message[]} The array of messages of the model
+	 * @returns {sap.ui.core.message.Message[]} The array of messages of the model
 	 *
 	 * @public
 	 */
@@ -211,7 +211,7 @@ sap.ui.define([
 	/**
 	 * Sets an array of control state messages.
 	 *
-	 * @param {sap.ui.core.Message[]} aMessages - The control messages
+	 * @param {sap.ui.core.message.Message[]} aMessages - The control messages
 	 * @return {this} <code>this</code> to allow method chaining
 	 * @protected
 	 */
@@ -223,7 +223,7 @@ sap.ui.define([
 	/**
 	 * Returns the array of this data state's current control messages.
 	 *
-	 * @returns {sap.ui.core.Message[]} The array of control messages
+	 * @returns {sap.ui.core.message.Message[]} The array of control messages
 	 *
 	 * @public
 	 */