@openui5/sap.ui.core 1.120.6 → 1.121.0

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -408,6 +408,8 @@ sap.ui.define([
 		 *   The group ID
 		 * @param {boolean} [bApplicationGroup]
 		 *   Whether only an application group ID is considered valid
+		 * @param {boolean} [bAllowSingle]
+		 *   Whether "$single" is allowed as a group ID
 		 * @param {string} [sErrorMessage]
 		 *   The error message to be used if group ID is not valid; the group ID will be appended
 		 * @throws {Error}
@@ -415,10 +417,11 @@ sap.ui.define([
 		 *
 		 * @public
 		 */
-		checkGroupId : function (sGroupId, bApplicationGroup, sErrorMessage) {
+		checkGroupId : function (sGroupId, bApplicationGroup, bAllowSingle, sErrorMessage) {
 			if (!bApplicationGroup && sGroupId === undefined
 					|| typeof sGroupId === "string"
-						&& (bApplicationGroup ? rApplicationGroupID : rGroupID).test(sGroupId)) {
+						&& (bApplicationGroup ? rApplicationGroupID : rGroupID).test(sGroupId)
+					|| bAllowSingle && sGroupId === "$single") {
 				return;
 			}
 			throw new Error((sErrorMessage || "Invalid group ID: ") + sGroupId);
@@ -812,12 +815,13 @@ sap.ui.define([
 
 				if (!isRelevant(oClone.error, sTopLevelContentID)) {
 					oClone.error.$ignoreTopLevel = true;
-				} else {
-					oClone.strictHandlingFailed = oError.strictHandlingFailed;
+				}
+				if (oError.strictHandlingFailed) {
+					oClone.strictHandlingFailed = true;
 				}
 				if (oClone.error.details) {
-					oClone.error.details = oClone.error.details.filter(function (oDetail, i) {
-						return isRelevant(oDetail, aDetailContentIDs[i]);
+					oClone.error.details = oClone.error.details.filter(function (oDetail, j) {
+						return isRelevant(oDetail, aDetailContentIDs[j]);
 					});
 				}
 
@@ -1784,7 +1788,7 @@ sap.ui.define([
 			if (vOld && typeof vOld === "object") {
 				Object.keys(vOld).forEach(function (sProperty) {
 					// not covered in the new value
-					if (!vNew.hasOwnProperty(sProperty)) {
+					if (!Object.hasOwn(vNew, sProperty)) {
 						_Helper.informAll(mChangeListeners, _Helper.buildPath(sPath, sProperty),
 							vOld[sProperty], undefined, bAllowUndefined);
 					}
@@ -1808,15 +1812,19 @@ sap.ui.define([
 		 *   The source object to inherit from
 		 * @param {object} oTarget
 		 *   The target object to inherit into
+		 * @param {boolean} [bTolerateNull]
+		 *   Whether a <code>null</code> value in the target is tolerated and treated as a missing
+		 *   object, which is then created along the way
 		 * @throws {Error}
-		 *   If a property along the way exists, but has an <code>undefined</code> or
-		 *   <code>null</code> value
+		 *   If a property along the way exists, but has an <code>undefined</code> value or an
+		 *   untolerated <code>null</code> value
 		 *
 		 * @public
 		 */
-		inheritPathValue : function (aSegments, oSource, oTarget) {
+		inheritPathValue : function (aSegments, oSource, oTarget, bTolerateNull) {
 			aSegments.forEach(function (sSegment, i) {
-				var bMissing = !(sSegment in oTarget); // Note: TypeError if !oTarget
+				var bMissing = !(sSegment in oTarget) // Note: TypeError if !oTarget
+					|| bTolerateNull && oTarget[sSegment] === null;
 
 				if (i + 1 < aSegments.length) { // intermediate step
 					if (bMissing) {

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -1479,7 +1479,7 @@ sap.ui.define([
 					Promise.resolve(fnOptimisticBatchEnabler(sKey)).then(async (bEnabled) => {
 						if (!bEnabled) {
 							await CacheManager.del(sCachePrefix + sKey);
-							Log.info("optimistic batch: disabled, response deleted", sKey,
+							Log.info("optimistic batch: disabled, batch payload deleted", sKey,
 								sClassName);
 						}
 					}).catch(that.oModelInterface.getReporter());
@@ -1488,9 +1488,8 @@ sap.ui.define([
 				Log.info("optimistic batch: success, response consumed", sKey, sClassName);
 				return oOptimisticBatch.result;
 			}
-			CacheManager.del(sCachePrefix + sKey).then(() => {
-				Log.warning("optimistic batch: mismatch, response skipped", sKey, sClassName);
-			}, this.oModelInterface.getReporter());
+			Log.warning("optimistic batch: mismatch, response skipped", sKey, sClassName);
+			CacheManager.del(sCachePrefix + sKey).catch(this.oModelInterface.getReporter());
 		}
 
 		if (fnOptimisticBatchEnabler) { // 1st app start, or optimistic batch payload did not match
@@ -1748,7 +1747,8 @@ sap.ui.define([
 	 *   A resource path relative to the service URL for which this requestor has been created
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} [oGroupLock]
 	 *   A lock for the group to associate the request with; if no lock is given or its group ID has
-	 *   {@link sap.ui.model.odata.v4.SubmitMode.Direct}, the request is sent immediately; for all
+	 *   {@link sap.ui.model.odata.v4.SubmitMode.Direct}, the request is sent immediately; for group
+	 *   ID "$single" the request is added to the queue but also sent immediately; for all
 	 *   other group ID values, the request is added to the given group and you can use
 	 *   {@link #submitBatch} to send all requests in that group. This group lock will be unlocked
 	 *   immediately, even if the request itself is queued. The request is rejected if the lock is
@@ -1794,9 +1794,11 @@ sap.ui.define([
 	 *   A promise on the outcome of the HTTP request; it will be rejected with an error having the
 	 *   property <code>canceled = true</code> instead of sending a request if
 	 *   <code>oGroupLock</code> is already canceled.
-	 * @throws {Error}
-	 *   If group ID is '$cached'. The error has a property <code>$cached = true</code>
-	 *
+	 * @throws {Error} If
+	 *   <ul>
+	 *     <li>group ID is '$cached'. The error has a property <code>$cached = true</code>
+	 *     <li>group ID is '$single' and there is already an existing batch queue for this group
+	 *   </ul>
 	 * @public
 	 */
 	_Requestor.prototype.request = function (sMethod, sResourcePath, oGroupLock, mHeaders, oPayload,
@@ -1832,6 +1834,9 @@ sap.ui.define([
 		sResourcePath = this.convertResourcePath(sResourcePath);
 		sOriginalResourcePath = sOriginalResourcePath || sResourcePath;
 		if (this.getGroupSubmitMode(sGroupId) !== "Direct") {
+			if (sGroupId === "$single" && this.mBatchQueue[sGroupId]) {
+				throw new Error("Cannot add new request to already existing $single queue");
+			}
 			oPromise = new Promise(function (fnResolve, fnReject) {
 				var aRequests = that.getOrCreateBatchQueue(sGroupId);
 
@@ -1867,8 +1872,12 @@ sap.ui.define([
 
 					aRequests[iChangeSetNo].push(oRequest);
 				}
+				if (sGroupId === "$single") {
+					that.submitBatch("$single");
+				}
 			});
 			oRequest.$promise = oPromise;
+
 			return oPromise;
 		}
 
@@ -2280,9 +2289,9 @@ sap.ui.define([
 	 * @param {function} oModelInterface.reportTransitionMessages
 	 *   A function to report OData transition messages
 	 * @param {function(sap.ui.core.message.Message[],sap.ui.core.message.Message[]):void} oModelInterface.updateMessages
-	 *   A function to report messages to {@link sap.ui.core.Messaging}, expecting two arrays of
-	 *   {sap.ui.core.message.Message} as parameters. The first array should be the old messages and
-	 *   the second array the new messages.
+	 *   A function to report messages to {@link module:sap/ui/core/Messaging}, expecting two arrays
+	 *   of {@link sap.ui.core.message.Message} as parameters. The first array should be the old
+	 *   messages and the second array the new messages.
 	 * @param {object} [mHeaders={}]
 	 *   Map of default headers; may be overridden with request-specific headers; certain
 	 *   OData V4 headers are predefined, but may be overridden by the default or

package/src/sap/ui/model/odata/v4/lib/_TreeState.js

@@ -0,0 +1,122 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+//Provides class sap.ui.model.odata.v4.lib._TreeState
+sap.ui.define([
+	"./_Helper"
+], function (_Helper) {
+	"use strict";
+
+	//*********************************************************************************************
+	// _TreeState
+	//*********************************************************************************************
+	/**
+	 * A class holding the tree state for recursive hierarchies. It keeps track which nodes have
+	 * been manually expanded resp. collapsed and is able to build the "ExpandLevels" parameter for
+	 * the "TopLevels" request (see {@link #getExpandLevels}).
+	 *
+	 * @alias sap.ui.model.odata.v4.lib._TreeState
+	 * @private
+	 */
+	class _TreeState {
+		// maps node id to number of levels to expand
+		oExpandLevels = new Map();
+
+		/**
+		 * Constructor for a new _TreeState.
+		 * The tree state is only kept if a <code>sNodeProperty</code> is given.
+		 *
+		 * @param {string} [sNodeProperty] - The path to the node id property
+		 *
+		 * @public
+		 */
+		constructor(sNodeProperty) {
+			this.sNodeProperty = sNodeProperty;
+		}
+
+		/**
+		 * Collapse a node.
+		 *
+		 * @param {object} oNode - The node
+		 *
+		 * @public
+		 */
+		collapse(oNode) {
+			if (!this.sNodeProperty) {
+				return;
+			}
+
+			const sId = _Helper.drillDown(oNode, this.sNodeProperty);
+			const oExpandLevel = this.oExpandLevels.get(sId);
+			if (oExpandLevel && oExpandLevel.Levels) {
+				this.oExpandLevels.delete(sId);
+			} else {
+				this.oExpandLevels.set(sId, {NodeID : sId, Levels : 0});
+			}
+		}
+
+		/**
+		 * Delete a node.
+		 *
+		 * @param {object} oNode - The node
+		 *
+		 * @public
+		 */
+		delete(oNode) {
+			if (!this.sNodeProperty) {
+				return;
+			}
+
+			const sId = _Helper.drillDown(oNode, this.sNodeProperty);
+			this.oExpandLevels.delete(sId);
+		}
+
+		/**
+		 * Expand a node.
+		 *
+		 * @param {object} oNode - The node
+		 *
+		 * @public
+		 */
+		expand(oNode) {
+			if (!this.sNodeProperty) {
+				return;
+			}
+
+			const sId = _Helper.drillDown(oNode, this.sNodeProperty);
+			const oExpandLevel = this.oExpandLevels.get(sId);
+			if (oExpandLevel && !oExpandLevel.Levels) {
+				this.oExpandLevels.delete(sId);
+			} else {
+				this.oExpandLevels.set(sId, {NodeID : sId, Levels : 1});
+			}
+		}
+
+		/**
+		 * Returns the ExpandLevels parameter to the TopLevels function describing the tree state in
+		 * $apply.
+		 *
+		 * @returns {string|undefined} The ExpandLevels or undefined if no tree state is kept
+		 *
+		 * @public
+		 */
+		getExpandLevels() {
+			const aExpandLevels = [...this.oExpandLevels.values()];
+			return aExpandLevels.length ? JSON.stringify(aExpandLevels) : undefined;
+		}
+
+		/**
+		 * Resets the tree state.
+		 *
+		 * @public
+		 */
+		reset() {
+			this.oExpandLevels.clear();
+		}
+	}
+
+	return _TreeState;
+});

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -5,8 +5,8 @@
  */
 /*eslint-disable max-len */
 // Provides the base implementation for all model implementations
-sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/ui/model/ParseException'],
-	function(SimpleType, FormatException, ParseException) {
+sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/ui/model/ParseException'],
+	function(Library, SimpleType, FormatException, ParseException) {
 	"use strict";
 
 
@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -66,7 +66,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 				if (oValue.toLowerCase() == "false" || oValue == "" || oValue == " ") {
 					return false;
 				}
-				oBundle = sap.ui.getCore().getLibraryResourceBundle();
+				oBundle = Library.getResourceBundleFor("sap.ui.core");
 				throw new ParseException(oBundle.getText("Boolean.Invalid"));
 			default:
 				throw new ParseException("Don't know how to parse Boolean from " + sInternalType);

package/src/sap/ui/model/type/Currency.js

@@ -9,13 +9,13 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/each",
 	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Lib",
 	"sap/ui/core/format/NumberFormat",
 	"sap/ui/model/CompositeType",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/ValidateException"
-], function(Log, each, isEmptyObject, NumberFormat, CompositeType, FormatException, ParseException,
-		ValidateException) {
+], function(Log, each, isEmptyObject, Library, NumberFormat, CompositeType, FormatException, ParseException, ValidateException) {
 	"use strict";
 
 	/**
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -156,7 +156,7 @@ sap.ui.define([
 
 	Currency.prototype.validateValue = function(vValue) {
 		if (this.oConstraints) {
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 				aViolatedConstraints = [],
 				aMessages = [],
 				aValues = vValue,
@@ -234,7 +234,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Currency.prototype.getParseException = function () {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+		var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 			sText;
 
 		if (!this.bShowNumber) {

package/src/sap/ui/model/type/Date.js

@@ -8,14 +8,14 @@
 sap.ui.define([
 	"sap/base/util/each",
 	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Lib",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/SimpleType",
 	"sap/ui/model/ValidateException"
-], function(each, isEmptyObject, UI5Date, DateFormat, FormatException, ParseException, SimpleType,
-		ValidateException) {
+], function(each, isEmptyObject, Library, UI5Date, DateFormat, FormatException, ParseException, SimpleType, ValidateException) {
 	"use strict";
 
 	/**
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.
@@ -83,7 +83,7 @@ sap.ui.define([
 				}
 				oResult = this.oOutputFormat.parse(oValue);
 				if (!oResult) {
-					oBundle = sap.ui.getCore().getLibraryResourceBundle();
+					oBundle = Library.getResourceBundleFor("sap.ui.core");
 					throw new ParseException(oBundle.getText(this.sName + ".Invalid"));
 				}
 				if (this.oInputFormat) {
@@ -101,7 +101,7 @@ sap.ui.define([
 
 	Date1.prototype.validateValue = function(oValue) {
 		if (this.oConstraints) {
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 				aViolatedConstraints = [],
 				aMessages = [],
 				oInputFormat = this.oInputFormat,

package/src/sap/ui/model/type/DateInterval.js

@@ -5,14 +5,15 @@
  */
 sap.ui.define([
 	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Lib",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/CompositeType",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/ValidateException"
-], function (isEmptyObject, UI5Date, DateFormat, CompositeType, FormatException, ParseException,
-		ValidateException) {
+], function(isEmptyObject, Library, UI5Date, DateFormat, CompositeType, FormatException, ParseException,
+	ValidateException) {
 	"use strict";
 
 	/**
@@ -24,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]
@@ -185,7 +186,7 @@ sap.ui.define([
 
 				if (!aDates[0] || (!aDates[1] && !this.oFormatOptions.singleIntervalValue)) {
 					// at least one single date should be returned
-					oBundle = sap.ui.getCore().getLibraryResourceBundle();
+					oBundle = Library.getResourceBundleFor("sap.ui.core");
 					throw new ParseException(oBundle.getText(this.sName + ".Invalid"));
 				}
 
@@ -225,7 +226,7 @@ sap.ui.define([
 	 */
 	DateInterval.prototype.validateValue = function (aValues) {
 		var bCheckSecondValue, oCompareValue,
-			oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			oBundle = Library.getResourceBundleFor("sap.ui.core"),
 			aViolatedConstraints = [],
 			aMessages = [],
 			that = this;

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -7,12 +7,13 @@
 // Provides class sap.ui.model.type.FileSize
 sap.ui.define([
 	"sap/base/util/each",
+	"sap/ui/core/Lib",
 	"sap/ui/core/format/FileSizeFormat",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/SimpleType",
 	"sap/ui/model/ValidateException"
-], function(each, FileSizeFormat, FormatException, ParseException, SimpleType, ValidateException) {
+], function(each, Library, FileSizeFormat, FormatException, ParseException, SimpleType, ValidateException) {
 	"use strict";
 
 	/**
@@ -24,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -96,7 +97,7 @@ sap.ui.define([
 			case "string":
 				vResult = this.oOutputFormat.parse(vValue);
 				if (isNaN(vResult)) {
-					oBundle = sap.ui.getCore().getLibraryResourceBundle();
+					oBundle = Library.getResourceBundleFor("sap.ui.core");
 					throw new ParseException(oBundle.getText("FileSize.Invalid"));
 				}
 				break;
@@ -117,7 +118,7 @@ sap.ui.define([
 
 	FileSize.prototype.validateValue = function(vValue) {
 		if (this.oConstraints) {
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 				aViolatedConstraints = [],
 				aMessages = [],
 				oInputFormat = this.oInputFormat;

package/src/sap/ui/model/type/Float.js

@@ -8,13 +8,13 @@
 sap.ui.define([
 	"sap/base/util/each",
 	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Lib",
 	"sap/ui/core/format/NumberFormat",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/SimpleType",
 	"sap/ui/model/ValidateException"
-], function(each, isEmptyObject, NumberFormat, FormatException, ParseException, SimpleType,
-		ValidateException) {
+], function(each, isEmptyObject, Library, NumberFormat, FormatException, ParseException, SimpleType, ValidateException) {
 	"use strict";
 
 	/**
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -80,7 +80,7 @@ sap.ui.define([
 			case "string":
 				fResult = this.oOutputFormat.parse(vValue);
 				if (isNaN(fResult)) {
-					oBundle = sap.ui.getCore().getLibraryResourceBundle();
+					oBundle = Library.getResourceBundleFor("sap.ui.core");
 					throw new ParseException(oBundle.getText("Float.Invalid"));
 				}
 				break;
@@ -99,7 +99,7 @@ sap.ui.define([
 
 	Float.prototype.validateValue = function(vValue) {
 		if (this.oConstraints) {
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 				aViolatedConstraints = [],
 				aMessages = [],
 				fValue = vValue,

package/src/sap/ui/model/type/Integer.js

@@ -8,13 +8,13 @@
 sap.ui.define([
 	"sap/base/util/each",
 	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Lib",
 	"sap/ui/core/format/NumberFormat",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/SimpleType",
 	"sap/ui/model/ValidateException"
-], function(each, isEmptyObject, NumberFormat, FormatException, ParseException, SimpleType,
-		ValidateException) {
+], function(each, isEmptyObject, Library, NumberFormat, FormatException, ParseException, SimpleType, ValidateException) {
 	"use strict";
 
 	/**
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -76,14 +76,14 @@ sap.ui.define([
 			case "string":
 				iResult = this.oOutputFormat.parse(String(vValue));
 				if (isNaN(iResult)) {
-					oBundle = sap.ui.getCore().getLibraryResourceBundle();
+					oBundle = Library.getResourceBundleFor("sap.ui.core");
 					throw new ParseException(oBundle.getText("EnterInt"));
 				}
 				break;
 			case "float":
 				iResult = Math.floor(vValue);
 				if (iResult != vValue) {
-					oBundle = sap.ui.getCore().getLibraryResourceBundle();
+					oBundle = Library.getResourceBundleFor("sap.ui.core");
 					throw new ParseException(oBundle.getText("EnterInt"));
 				}
 				break;
@@ -101,7 +101,7 @@ sap.ui.define([
 
 	Integer.prototype.validateValue = function(vValue) {
 		if (this.oConstraints) {
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 				aViolatedConstraints = [],
 				aMessages = [],
 				iValue = vValue,

package/src/sap/ui/model/type/String.js

@@ -8,11 +8,12 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/each",
+	"sap/ui/core/Lib",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/SimpleType",
 	"sap/ui/model/ValidateException"
-], function(Log, each, FormatException, ParseException, SimpleType, ValidateException) {
+], function(Log, each, Library, FormatException, ParseException, SimpleType, ValidateException) {
 	"use strict";
 
 	/**
@@ -24,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]
@@ -157,7 +158,7 @@ sap.ui.define([
 	 */
 	StringType.prototype.validateValue = function (sValue) {
 		if (this.oConstraints) {
-			var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+			var oBundle = Library.getResourceBundleFor("sap.ui.core"),
 				aViolatedConstraints = [],
 				aMessages = [];
 

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.