@openui5/sap.ui.core 1.117.1 → 1.119.0

package/test/sap/ui/core/EventBroadcaster.html

@@ -96,71 +96,71 @@
 	</script>
 
 	<script>
-		sap.ui.getCore().attachInit(function () {
-			sap.ui.require(['sap/ui/core/mvc/XMLView', 'sap/ui/core/support/usage/EventBroadcaster',
-						'sap/ui/core/mvc/Controller', 'sap/m/ColumnListItem', 'sap/m/Text', 'sap/m/MessageToast'],
-					function (XMLView, EventBroadcaster, Controller, ColumnListItem, Text, MessageToast) {
-						"use strict";
-						var oTable;
+		sap.ui.require(['sap/ui/core/Core', 'sap/ui/core/mvc/XMLView', 'sap/ui/core/support/usage/EventBroadcaster',
+							'sap/ui/core/mvc/Controller', 'sap/m/ColumnListItem', 'sap/m/Text', 'sap/m/MessageToast'],
+			function (Core, XMLView, EventBroadcaster, Controller, ColumnListItem, Text, MessageToast) {
+				"use strict";
 
-						var BroadcasterController = Controller.extend("eventBroadcasterTestController", {
-							onInit: function () {
-								oTable = this.getView().byId("log");
-							},
-							enableDisableCustomEvents: function (oEvent) {
-								if (oEvent.getParameter("state")) {
-									EventBroadcaster.enable();
-								} else {
-									EventBroadcaster.disable();
-								}
-							},
-							attachDetachListener: function (oEvent) {
-								if (oEvent.getParameter("state")) {
-									window.addEventListener("UI5Event", this._fnListener)
-								} else {
-									window.removeEventListener("UI5Event", this._fnListener)
-								}
-							},
-							clearRows: function () {
-								oTable.destroyItems();
-							},
-							_fnListener: function (oEvent) {
-								var oEvtDetail = oEvent.detail;
-								oTable.insertItem(new ColumnListItem({
-									cells: [
-										new Text({text: new Date(oEvtDetail.timestamp) + "(" + oEvtDetail.timestamp + ")"}),
-										new Text({text: oEvtDetail.eventName}),
-										new Text({text: oEvtDetail.targetId}),
-										new Text({text: oEvtDetail.targetType}),
-										new Text({text: oEvtDetail.componentId}),
-										new Text({text: oEvtDetail.componentVersion})
-									]
-								}, 0));
-							},
-							setExcludeListConfig: function () {
-								var oConfig;
-								try {
-									oConfig = JSON.parse(this.getView().byId("txtConfig").getValue());
-									EventBroadcaster.setEventsExcludeList(oConfig);
-								} catch (e) {
-									MessageToast.show("Please enter valid JSON." + e.message);
-								}
-							},
-							getExcludeListConfig: function () {
-								this.getView().byId("txtConfig").setValue(JSON.stringify(EventBroadcaster.getEventsExcludeList()));
-							}
-						});
+				Core.ready().then(function () {
+				var oTable;
 
-						XMLView.create({
-							id: "eventBroadcasterTestView",
-							definition: jQuery('#myXml').html(),
-							controller: new BroadcasterController()
-						}).then(function (oView) {
-							oView.placeAt("content");
-						});
-					});
-		});
+				var BroadcasterController = Controller.extend("eventBroadcasterTestController", {
+					onInit: function () {
+						oTable = this.getView().byId("log");
+					},
+					enableDisableCustomEvents: function (oEvent) {
+						if (oEvent.getParameter("state")) {
+							EventBroadcaster.enable();
+						} else {
+							EventBroadcaster.disable();
+						}
+					},
+					attachDetachListener: function (oEvent) {
+						if (oEvent.getParameter("state")) {
+							window.addEventListener("UI5Event", this._fnListener)
+						} else {
+							window.removeEventListener("UI5Event", this._fnListener)
+						}
+					},
+					clearRows: function () {
+						oTable.destroyItems();
+					},
+					_fnListener: function (oEvent) {
+						var oEvtDetail = oEvent.detail;
+						oTable.insertItem(new ColumnListItem({
+							cells: [
+								new Text({text: new Date(oEvtDetail.timestamp) + "(" + oEvtDetail.timestamp + ")"}),
+								new Text({text: oEvtDetail.eventName}),
+								new Text({text: oEvtDetail.targetId}),
+								new Text({text: oEvtDetail.targetType}),
+								new Text({text: oEvtDetail.componentId}),
+								new Text({text: oEvtDetail.componentVersion})
+							]
+						}, 0));
+					},
+					setExcludeListConfig: function () {
+						var oConfig;
+						try {
+							oConfig = JSON.parse(this.getView().byId("txtConfig").getValue());
+							EventBroadcaster.setEventsExcludeList(oConfig);
+						} catch (e) {
+							MessageToast.show("Please enter valid JSON." + e.message);
+						}
+					},
+					getExcludeListConfig: function () {
+						this.getView().byId("txtConfig").setValue(JSON.stringify(EventBroadcaster.getEventsExcludeList()));
+					}
+				});
 
+				XMLView.create({
+					id: "eventBroadcasterTestView",
+					definition: jQuery('#myXml').html(),
+					controller: new BroadcasterController()
+				}).then(function (oView) {
+					oView.placeAt("content");
+				});
+			});
+		});
 	</script>
 
 </head>

package/test/sap/ui/core/Formats.html

@@ -212,8 +212,10 @@
 
 		oLabel.placeAt("settings");
 		oSelect.placeAt("settings");
-		sap.ui.getCore().attachInit(function() {
-			oSelect.setSelectedKey(sInitialValue);
+		sap.ui.require(["sap/ui/core/Core"], function(Core) {
+			Core.ready().then(function() {
+				oSelect.setSelectedKey(sInitialValue);
+			});
 		});
 		return oSelect;
 	}

package/test/sap/ui/core/GenericEventBinding.html

@@ -7,63 +7,64 @@
 		<script src="shared-config.js"></script>
 		<script id="sap-ui-bootstrap"
 				src="../../../../resources/sap-ui-core.js"
+				data-sap-ui-libs="sap.ui.commons"
 				data-sap-ui-theme="sap_bluecrystal">
 		</script>
 
 		<script>
-			try{
-				sap.ui.getCore().loadLibrary("sap.ui.commons");
-			}catch(e){
-				alert("This test page requires the library 'sap.ui.commons' which is not available.");
-				throw(e);
-			}
-
-			function scream() {
-				alert("Help! I'm blurred!");
-			}
-			function scream2() {
-				alert("HEEEEEEELP! I'M BLURRED!");
-			}
-
-			var oTf1 = new sap.ui.commons.TextField("tf1").attachBrowserEvent("blur", function(){alert("Help! I'm blurred!");});
-			oTf1.placeAt("uiArea1");
-
-			var oLayout = new sap.ui.commons.layout.MatrixLayout().setWidth("auto");
-			var oBtn = new sap.ui.commons.Button("btn1", {text : "Bind blur event to TextField"});
-			oBtn.attachPress(function(){
-				oTf2.attachBrowserEvent("blur", scream);
+			sap.ui.require([
+				"sap/ui/core/Core",
+				"sap/ui/core/Rendering"
+			], function(
+				Core,
+				Rendering
+			) {
+				Core.ready().then(function() {
+					function scream() {
+						alert("Help! I'm blurred!");
+					}
+					function scream2() {
+						alert("HEEEEEEELP! I'M BLURRED!");
+					}
+
+					var oTf1 = new sap.ui.commons.TextField("tf1").attachBrowserEvent("blur", function(){alert("Help! I'm blurred!");});
+					oTf1.placeAt("uiArea1");
+
+					var oLayout = new sap.ui.commons.layout.MatrixLayout().setWidth("auto");
+					var oBtn = new sap.ui.commons.Button("btn1", {text : "Bind blur event to TextField"});
+					oBtn.attachPress(function(){
+						oTf2.attachBrowserEvent("blur", scream);
+					});
+
+					var oBtn2 = new sap.ui.commons.Button("btn2", {text : "Bind another, more INTENSE, blur event to TextField"});
+					oBtn2.attachPress(function(){
+						oTf2.attachBrowserEvent("blur", scream2);
+					});
+
+					var oBtn3 = new sap.ui.commons.Button("btn3", {text : "Unbind blur event from TextField"});
+					oBtn3.attachPress(function(){
+						oTf2.detachBrowserEvent("blur", scream);
+					});
+
+					var oBtn4 = new sap.ui.commons.Button("btn4", {text : "Unbind INTENSE blur event from TextField"});
+					oBtn4.attachPress(function(){
+						oTf2.detachBrowserEvent("blur", scream2);
+					});
+
+					oLayout.createRow(oBtn, oBtn2);
+					oLayout.createRow(oBtn3, oBtn4);
+					oLayout.placeAt("uiArea2");
+
+					var oTf2 = new sap.ui.commons.TextField("tf2");
+					oTf2.placeAt("uiArea3");
+
+					var oBtnR = new sap.ui.commons.Button("btnR", {text : "Re-Render the TextFields", press : function(){
+						oTf1.invalidate();
+						oTf2.invalidate();
+					}});
+					oBtnR.placeAt("uiArea4")
+				});
 			});
-
-			var oBtn2 = new sap.ui.commons.Button("btn2", {text : "Bind another, more INTENSE, blur event to TextField"});
-			oBtn2.attachPress(function(){
-				oTf2.attachBrowserEvent("blur", scream2);
-			});
-
-			var oBtn3 = new sap.ui.commons.Button("btn3", {text : "Unbind blur event from TextField"});
-			oBtn3.attachPress(function(){
-				oTf2.detachBrowserEvent("blur", scream);
-			});
-
-			var oBtn4 = new sap.ui.commons.Button("btn4", {text : "Unbind INTENSE blur event from TextField"});
-			oBtn4.attachPress(function(){
-				oTf2.detachBrowserEvent("blur", scream2);
-			});
-
-			oLayout.createRow(oBtn, oBtn2);
-			oLayout.createRow(oBtn3, oBtn4);
-			oLayout.placeAt("uiArea2");
-
-			var oTf2 = new sap.ui.commons.TextField("tf2");
-			oTf2.placeAt("uiArea3");
-
-			var oBtnR = new sap.ui.commons.Button("btnR", {text : "Re-Render the TextFields", press : function(){
-				oTf1.invalidate();
-				oTf2.invalidate();
-				sap.ui.getCore().applyChanges();
-			}});
-			oBtnR.placeAt("uiArea4")
-
-
 		</script>
 	</head>
 	<body class="sapUiBody">

package/test/sap/ui/core/HTMLControl.html

@@ -9,106 +9,107 @@
 				>
 		</script>
 		<script>
-			try{
-				sap.ui.getCore().loadLibrary("sap.ui.commons");
-			}catch(e){
-				alert("This test page requires the library 'sap.ui.commons' which is not available.");
-				throw(e);
-			}
-
-		    // create the controls in the head
-			var oLayout = new sap.ui.commons.layout.MatrixLayout();
-			oLayout.setLayoutFixed(false);
-			var oButton1 = new sap.ui.commons.Button({
-				text: "Wrap With SAPUI5 Controls",
-				tooltip : "Creates a Control Tree around the existing HTML and places it at the 'target1' div below",
-				press: createOuterControlTree
-			});
-			var oButton2 = new sap.ui.commons.Button({
-				text: "Create Nested Control",
-				tooltip : "Creates a Control and places it within the HTML Container",
-				press: createNestedControlTree
-			});
-			oLayout.createRow(oButton1, oButton2);
-			oLayout.placeAt("controls");
-
-			jQuery(document).ready(
-				function() {
-					jQuery("#embedded span").on("click", (
-							function(event) {
-								var sColor = event.target && jQuery.css(event.target, "background-color").toLowerCase();
-								var bRed = sColor == "#ff0000" || sColor == "rgb(255, 0, 0)";
-								if ( bRed ) {
-									jQuery("<span>red clicked" + new Date() + "</span><br>").appendTo(jQuery("#log"));
-								} else {
-									jQuery("<span>yellow clicked" + new Date() + "</span><br>").appendTo(jQuery("#log"));
-								}
-							}
-					);
-					animate();
+			sap.ui.require(["sap/ui/core/Element"], function(Element) {
+				try{
+					sap.ui.getCore().loadLibrary("sap.ui.commons");
+				}catch(e){
+					alert("This test page requires the library 'sap.ui.commons' which is not available.");
+					throw(e);
 				}
-			);
 
-			function createOuterControlTree() {
+				// create the controls in the head
 				var oLayout = new sap.ui.commons.layout.MatrixLayout();
-				var oButton = new sap.ui.commons.Button({ text: "Some Button", tooltip : "Just a sample for a SAPUI5 Control", press: function() { oTextField.setValue("" + new Date().getTime()); }});
-				var oTextField = new sap.ui.commons.TextField({ value : "Some Initial Value"});
-				oLayout.createRow(oButton, oTextField);
-				var oHTML = new sap.ui.core.HTML({ id : "embedded" });
-				oLayout.createRow(oHTML);
-
-				/*var oPanel = new sap.ui.commons.Panel({
-					title : new sap.ui.core.Title({text:"A SAPUI5 Panel"}),
-					content : [oLayout]
+				oLayout.setLayoutFixed(false);
+				var oButton1 = new sap.ui.commons.Button({
+					text: "Wrap With SAPUI5 Controls",
+					tooltip : "Creates a Control Tree around the existing HTML and places it at the 'target1' div below",
+					press: createOuterControlTree
 				});
-				oPanel.placeAt("target1");*/
-
-				/**/
-				var oDialog = new sap.ui.commons.Dialog({
-					title : "A SAPUI5 Dialog",
-					content: oLayout,
-					buttons : [ new sap.ui.commons.Button({text:"OK"}) ],
-					showCloseButton : true
+				var oButton2 = new sap.ui.commons.Button({
+					text: "Create Nested Control",
+					tooltip : "Creates a Control and places it within the HTML Container",
+					press: createNestedControlTree
 				});
-				// oDialog.placeAt("target1")
-				oDialog.open();
-				/**/
-			};
-
-			var delta = 10;
-
-			function createNestedControlTree() {
-				var oButton = new sap.ui.commons.Button({
-					text: "Inner Button", tooltip : "Just a sample for a SAPUI5 Control",
-					press: function() {
-						delta = delta <= 2 ? 2 : delta-1;
-					}});
-				oButton.placeAt(jQuery(".x").get(0));
-			};
-
-			function animate() {
-				var html5 = jQuery("#embedded");
-				html5.css("-webkit-perspective", 500);
-				d = 0.0;
-				setTimeout(step, 50);
-			}
-
-			function step() {
-				var html5 = jQuery("#embedded > div");
-		        html5.css("-webkit-transform", "rotateY(" + d + "deg)");
-		        d = d + delta;
-		        if ( d >= 360 ) d = 0;
-		        setTimeout(step, 50);
-			}
+				oLayout.createRow(oButton1, oButton2);
+				oLayout.placeAt("controls");
+
+				jQuery(document).ready(
+					function() {
+						jQuery("#embedded span").on("click", {
+								function(event) {
+									var sColor = event.target && jQuery.css(event.target, "background-color").toLowerCase();
+									var bRed = sColor == "#ff0000" || sColor == "rgb(255, 0, 0)";
+									if ( bRed ) {
+										jQuery("<span>red clicked" + new Date() + "</span><br>").appendTo(jQuery("#log"));
+									} else {
+										jQuery("<span>yellow clicked" + new Date() + "</span><br>").appendTo(jQuery("#log"));
+									}
+								}
+						});
+						animate();
+					}
+				);
+
+				function createOuterControlTree() {
+					var oLayout = new sap.ui.commons.layout.MatrixLayout();
+					var oButton = new sap.ui.commons.Button({ text: "Some Button", tooltip : "Just a sample for a SAPUI5 Control", press: function() { oTextField.setValue("" + new Date().getTime()); }});
+					var oTextField = new sap.ui.commons.TextField({ value : "Some Initial Value"});
+					oLayout.createRow(oButton, oTextField);
+					var oHTML = new sap.ui.core.HTML({ id : "embedded" });
+					oLayout.createRow(oHTML);
+
+					/*var oPanel = new sap.ui.commons.Panel({
+						title : new sap.ui.core.Title({text:"A SAPUI5 Panel"}),
+						content : [oLayout]
+					});
+					oPanel.placeAt("target1");*/
+
+					/**/
+					var oDialog = new sap.ui.commons.Dialog({
+						title : "A SAPUI5 Dialog",
+						content: oLayout,
+						buttons : [ new sap.ui.commons.Button({text:"OK"}) ],
+						showCloseButton : true
+					});
+					// oDialog.placeAt("target1")
+					oDialog.open();
+					/**/
+				};
+
+				var delta = 10;
+
+				function createNestedControlTree() {
+					var oButton = new sap.ui.commons.Button({
+						text: "Inner Button", tooltip : "Just a sample for a SAPUI5 Control",
+						press: function() {
+							delta = delta <= 2 ? 2 : delta-1;
+						}});
+					oButton.placeAt(jQuery(".x").get(0));
+				};
+
+				function animate() {
+					var html5 = jQuery("#embedded");
+					html5.css("-webkit-perspective", 500);
+					d = 0.0;
+					setTimeout(step, 50);
+				}
 
-			new sap.ui.core.HTML("myhtml", {content : ""}).placeAt("empty-content");
-			new sap.ui.commons.Button({text:"Set Content As String (red)", press: function() {
-				sap.ui.getCore().byId("myhtml").setContent("<div style='background-color:red;width:16px;height:16px;'></div>");
-			}}).placeAt("empty-content");
-			new sap.ui.commons.Button({text:"Set Content as DOM (green)", press: function() {
-				sap.ui.getCore().byId("myhtml").setDOMContent(jQuery("<div style='background-color:green;width:16px;height:16px;'></div>").get(0));
-			}}).placeAt("empty-content");
+				function step() {
+					var html5 = jQuery("#embedded > div");
+					html5.css("-webkit-transform", "rotateY(" + d + "deg)");
+					d = d + delta;
+					if ( d >= 360 ) d = 0;
+					setTimeout(step, 50);
+				}
 
+				new sap.ui.core.HTML("myhtml", {content : ""}).placeAt("empty-content");
+				new sap.ui.commons.Button({text:"Set Content As String (red)", press: function() {
+					Element.getElementById("myhtml").setContent("<div style='background-color:red;width:16px;height:16px;'></div>");
+				}}).placeAt("empty-content");
+				new sap.ui.commons.Button({text:"Set Content as DOM (green)", press: function() {
+					Element.getElementById("myhtml").setDOMContent(jQuery("<div style='background-color:green;width:16px;height:16px;'></div>").get(0));
+				}}).placeAt("empty-content");
+			});
 		</script>
 	</head>
 	<body class="sapUiBody">

package/test/sap/ui/core/HyphenationPlayground.html

@@ -57,12 +57,13 @@
 
 	<script>
 		sap.ui.require([
+			"sap/ui/core/Element",
 			"sap/ui/core/hyphenation/Hyphenation",
 			"sap/ui/core/hyphenation/HyphenationTestingWords",
 			"sap/m/FlexBox",
 			"sap/base/util/UriParameters",
 		],
-			function (HyphenationDelegate, HyphenationTestingWords, FlexBox, UriParameters) {
+			function (Element, HyphenationDelegate, HyphenationTestingWords, FlexBox, UriParameters) {
 				"use strict";
 
 				// create and add app
@@ -178,25 +179,25 @@
 
 				var fnChangeText = function (evt) {
 					var sLng = evt.getSource().getId().slice(4);
-					var sNewText = sap.ui.getCore().byId("inpChTxt-" + sLng).getValue();
-					sap.ui.getCore().byId("txt-" + sLng).setContent("<div style='font-size: 14px;' lang='" + sLng +
+					var sNewText = Element.getElementById("inpChTxt-" + sLng).getValue();
+					Element.getElementById("txt-" + sLng).setContent("<div style='font-size: 14px;' lang='" + sLng +
 						"' class='sapUiHyphenation'>" + sNewText + "</div>");
 					var sHyphenatedText = hyph.hyphenate(sNewText, sLng);
-					sap.ui.getCore().byId("hyph-" + sLng).setContent("<div style='font-size: 14px;'>" + sHyphenatedText + "</div>");
-					sap.ui.getCore().byId("slider-" + sLng).setValue(100);
+					Element.getElementById("hyph-" + sLng).setContent("<div style='font-size: 14px;'>" + sHyphenatedText + "</div>");
+					Element.getElementById("slider-" + sLng).setValue(100);
 				};
 
 				var fnApplyConfig = function (evt) {
 					var lang = evt.getParameters().id.split("button-")[1];
 					hyph.initialize(lang).then(function () {
-						var sNewText = sap.ui.getCore().byId("inpChTxt-" + lang).getValue();
-						sap.ui.getCore().byId("txt-" + lang).setContent("<div style='font-size: 14px; 'lang='" + lang +
+						var sNewText = Element.getElementById("inpChTxt-" + lang).getValue();
+						Element.getElementById("txt-" + lang).setContent("<div style='font-size: 14px; 'lang='" + lang +
 							"' class='sapUiHyphenation' >" + sNewText + "</div>");
 						var sHyphenatedText = hyph.hyphenate(sNewText, lang);
-						sap.ui.getCore().byId("hyph-" + lang).setContent("<div style='font-size: 14px;'>" + sHyphenatedText +
+						Element.getElementById("hyph-" + lang).setContent("<div style='font-size: 14px;'>" + sHyphenatedText +
 							"</div>");
 					});
-					sap.ui.getCore().byId("slider-" + lang).setValue(100);
+					Element.getElementById("slider-" + lang).setValue(100);
 				};
 				var fnSliderChange = function (oEvent) {
 					var value = oEvent.getParameter("value");

package/test/sap/ui/core/ListFormat.js

@@ -1,9 +1,9 @@
 sap.ui.define([
 	"./ListFormat.controller",
 	"./FormatHelper",
-	"sap/ui/core/Core",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/mvc/XMLView"
-], function(ListFormatController, FormatHelper, oCore, XMLView) {
+], function(ListFormatController, FormatHelper, Messaging, XMLView) {
 	"use strict";
 
 	sap.ui.define("local/LocaleListItem", function() {
@@ -14,7 +14,7 @@ sap.ui.define([
 		viewName: "local.ListFormat",
 		controller: new ListFormatController()
 	}).then(function(oView) {
-		oCore.getMessageManager().registerObject(oView.getContent()[0], true);
+		Messaging.registerObject(oView.getContent()[0], true);
 		oView.placeAt("content");
 	});
 

package/test/sap/ui/core/NumberFormat.js

@@ -1,9 +1,9 @@
 sap.ui.define([
 	"./NumberFormat.controller",
 	"./FormatHelper",
-	"sap/ui/core/Core",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/mvc/XMLView"
-], function(NumberFormatController, FormatHelper, oCore, XMLView) {
+], function(NumberFormatController, FormatHelper, Messaging, XMLView) {
 	"use strict";
 
 	sap.ui.define("local/LocaleListItem", function() {
@@ -14,7 +14,7 @@ sap.ui.define([
 		viewName: "local.NumberFormat",
 		controller: new NumberFormatController()
 	}).then(function(oView) {
-		oCore.getMessageManager().registerObject(oView.getContent()[0], true);
+		Messaging.registerObject(oView.getContent()[0], true);
 		oView.placeAt("content");
 	});
 });

package/test/sap/ui/core/ODataAnnotationsPerformance.html

@@ -185,36 +185,37 @@
 		data-sap-ui-libs="sap.m"></script>
 
 	<script>
+		sap.ui.require(["sap/ui/core/Core"],function(Core) {
+			Core.ready().then(function() {
+
+				var mService = {
+					serviceUrl: "fakeservice://perf/annotations/service/",
+					fakeUrls: [{
+						dataUrl: "testdata/annotations/metadata.xml",
+						match: "fakeservice://perf/annotations/service/$metadata",
+						headers: {
+							"content-type": "application/xml"
+						}
+					},{
+						dataUrl: "testdata/annotations/annotations01.xml",
+						match: /^fakeservice:\/\/perf\/annotations\/annotations.*/,
+						headers: {
+							"content-type": "application/xml"
+						}
+					}]
+				};
 
-		sap.ui.getCore().attachInit(function() {
-
-			var mService = {
-				serviceUrl: "fakeservice://perf/annotations/service/",
-				fakeUrls: [{
-					dataUrl: "testdata/annotations/metadata.xml",
-					match: "fakeservice://perf/annotations/service/$metadata",
-					headers: {
-						"content-type": "application/xml"
-					}
-				},{
-					dataUrl: "testdata/annotations/annotations01.xml",
-					match: /^fakeservice:\/\/perf\/annotations\/annotations.*/,
-					headers: {
-						"content-type": "application/xml"
-					}
-				}]
-			};
-
-			var oService = new FakeService(mService);
-			var oBenchmarkV1 = new AnnotationsBenchmark(1, oService);
-			var oBenchmarkV2 = new AnnotationsBenchmark(2, oService);
+				var oService = new FakeService(mService);
+				var oBenchmarkV1 = new AnnotationsBenchmark(1, oService);
+				var oBenchmarkV2 = new AnnotationsBenchmark(2, oService);
 
-			// Show overview page
-			var oOverviewScreen = new BenchmarkOverview({
-				service: oService,
-				benchmarks: [oBenchmarkV1, oBenchmarkV2]
+				// Show overview page
+				var oOverviewScreen = new BenchmarkOverview({
+					service: oService,
+					benchmarks: [oBenchmarkV1, oBenchmarkV2]
+				});
+				document.querySelector("#content").appendChild(oOverviewScreen);
 			});
-			document.querySelector("#content").appendChild(oOverviewScreen);
 		});
 
 
@@ -232,7 +233,6 @@
 
 
 
-
 		function AnnotationsBenchmark(iVersion, mService) {
 			this.version(iVersion);
 			this.service(mService);

package/test/sap/ui/core/ODataV2CanonicalRequests.html

@@ -14,6 +14,7 @@
 	<script>
 
 		sap.ui.require([
+			'sap/ui/core/Messaging',
 			'sap/ui/core/util/MockServer',
 			'sap/ui/model/odata/v2/ODataModel',
 			'sap/ui/model/Filter',
@@ -32,7 +33,7 @@
 			'sap/m/Label',
 			'sap/m/Table',
 			'sap/ui/model/json/JSONModel'
-		], function (MockServer, ODataModel, Filter, ResponsiveSplitter, SplitPane, PaneContainer, VerticalLayout,
+		], function (Messaging, MockServer, ODataModel, Filter, ResponsiveSplitter, SplitPane, PaneContainer, VerticalLayout,
 			HorizontalLayout, Column, ColumnListItem, Text, SimpleForm, Button, Panel, Input, Label, Table, JSONModel) {
 
 				var sServiceUri = "/SalesOrderSrv/";
@@ -206,7 +207,7 @@
 				});
 				sap.ui.getCore().setModel(oModel);
 
-				sap.ui.getCore().setModel(sap.ui.getCore().getMessageManager().getMessageModel(), "message");
+				sap.ui.getCore().setModel(Messaging.getMessageModel(), "message");
 				var oTableMM = new Table({
 					items: {
 						path: 'message>/',