@openui5/sap.ui.core 1.117.1 → 1.119.0

package/test/sap/ui/core/demokit/sample/matcher/I18NText/webapp/manifest.json

@@ -18,8 +18,8 @@
 		"dependencies": {
 			"minUI5Version": "1.60.0",
 			"libs": {
-				"sap.ui.core": {},
-				"sap.m": {}
+				"sap.m": {},
+				"sap.ui.core": {}
 			}
 		}
 	}

package/test/sap/ui/core/demokit/sample/matcher/LabelFor/manifest.json

@@ -8,7 +8,8 @@
 	"sap.ui5": {
 		"dependencies": {
 			"libs": {
-				"sap.m": {}
+				"sap.m": {},
+				"sap.ui.core": {}
 			}
 		},
 		"config": {

package/test/sap/ui/core/demokit/sample/matcher/LabelFor/webapp/manifest.json

@@ -18,8 +18,8 @@
 		"dependencies": {
 			"minUI5Version": "1.60.0",
 			"libs": {
-				"sap.ui.core": {},
-				"sap.m": {}
+				"sap.m": {},
+				"sap.ui.core": {}
 			}
 		}
 	}

package/test/sap/ui/core/demokit/sample/odata/types/v2/DateTimeOffset/manifest.json

@@ -34,6 +34,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/sample/odata/types/v4/Date/manifest.json

@@ -34,6 +34,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/sample/odata/types/v4/TimeOfDay/manifest.json

@@ -34,6 +34,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/sample/odata/v2/AutoExpand/AutoExpand.view.xml

@@ -1,6 +1,7 @@
 <mvc:View
 	xmlns:mvc="sap.ui.core.mvc"
-	xmlns="sap.ui.table">
+	xmlns="sap.ui.table"
+	xmlns:rm="sap.ui.table.rowmodes">
 
 	<AnalyticalTable rows="{
 		filters : [{
@@ -16,7 +17,10 @@
 			provideGrandTotals : false,
 			provideTotalResultSize : false,
 			reloadSingleUnitMeasures : false
-		}}" threshold="5" title="Auto-Expanded Analytical Table" visibleRowCount="5" >
+		}}" threshold="5" title="Auto-Expanded Analytical Table" >
+		<rowMode>
+			<rm:Fixed rowCount="5" />
+		</rowMode>
 		<columns>
 			<AnalyticalColumn leadingProperty="CustomerName">
 				<m:Label text="Customer Name"/>

package/test/sap/ui/core/demokit/sample/odata/v4/Ancestry/Main.view.xml

@@ -3,11 +3,12 @@
 	controllerName="sap.ui.core.sample.odata.v4.Ancestry.Main"
 	xmlns="sap.ui.table"
 	xmlns:m="sap.m"
-	xmlns:mvc="sap.ui.core.mvc">
+	xmlns:mvc="sap.ui.core.mvc"
+	xmlns:rm="sap.ui.table.rowmodes">
 
-	<TreeTable id="table" ariaLabelledBy="title" minAutoRowCount="2"
+	<TreeTable id="table" ariaLabelledBy="title"
 		rows="{path : '/SADL_V_RS_Ancestry_4_Hier', parameters : {$count : true}, suspended : true}"
-		selectionMode="None" threshold="0" visibleRowCount="5" visibleRowCountMode="Interactive">
+		selectionMode="None" threshold="0">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="title" level="H1" text="{header>$count} Ancestors"/>
@@ -18,6 +19,9 @@
 					value="{ui>/sFilter}" width="40%"/>
 			</m:Toolbar>
 		</extension>
+		<rowMode>
+			<rm:Interactive rowCount="5" minRowCount="2"/>
+		</rowMode>
 		<Column>
 			<m:Label text="ID"/>
 			<template>

package/test/sap/ui/core/demokit/sample/odata/v4/DataAggregation/DataAggregation.controller.js

@@ -67,9 +67,9 @@ sap.ui.define([
 			};
 			if (sGrandTotalAtBottomOnly) {
 				if (sGrandTotalAtBottomOnly === "true") {
-					oTable.setFixedRowCount(0);
+					oTable.getRowMode().setFixedTopRowCount(0);
 				}
-				oTable.setFixedBottomRowCount(1);
+				oTable.getRowMode().setFixedBottomRowCount(1);
 				this._oAggregation.grandTotalAtBottomOnly = sGrandTotalAtBottomOnly === "true";
 			}
 			if (sLeafCount) {

package/test/sap/ui/core/demokit/sample/odata/v4/DataAggregation/DataAggregation.view.xml

@@ -3,17 +3,17 @@
 	controllerName="sap.ui.core.sample.odata.v4.DataAggregation.DataAggregation"
 	xmlns="sap.ui.table"
 	xmlns:m="sap.m"
-	xmlns:mvc="sap.ui.core.mvc">
+	xmlns:mvc="sap.ui.core.mvc"
+	xmlns:rm="sap.ui.table.rowmodes">
 
 	<!-- TODO: enable sorting in table -->
 	<!-- TODO: enhance auto type detection for @$ui5.node.*? -->
 	<!-- Note: for $$aggregation, see controller's onInit! -->
-	<Table id="table" ariaLabelledBy="title" fixedRowCount="1"
+	<Table id="table" ariaLabelledBy="title"
 		rows="{path : '/BusinessPartners', parameters : {
 				$count : false,
 				$orderby : 'Country desc,Region desc,Segment,AccountResponsible'
-			}, suspended : true}" selectionMode="None" threshold="0"
-		visibleRowCount="{ui>/iVisibleRowCount}">
+			}, suspended : true}" selectionMode="None" threshold="0">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="title" level="H1" text="Sales Amount by Account Responsible"/>
@@ -26,6 +26,9 @@
 					type="{= ${ui>/iMessages} ? 'Emphasized' : 'Default' }"/>
 			</m:Toolbar>
 		</extension>
+		<rowMode>
+			<rm:Fixed rowCount="{ui>/iVisibleRowCount}" fixedTopRowCount="1"/>
+		</rowMode>
 		<Column hAlign="End" width="5em">
 			<m:Label text="Level"/>
 			<template>

package/test/sap/ui/core/demokit/sample/odata/v4/DataAggregation/Opa.qunit.js

@@ -3,16 +3,17 @@
  */
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/core/sample/odata/v4/DataAggregation/tests/expandPageCollapse",
+	"sap/ui/core/sample/odata/v4/DataAggregation/tests/filter",
+	"sap/ui/test/opaQunit",
+	"sap/ui/core/sample/odata/v4/DataAggregation/SandboxModel" // preload only
+], function (Core, Helper, expandPageCollapse, filter, opaTest) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/Helper",
-		"sap/ui/core/sample/odata/v4/DataAggregation/tests/expandPageCollapse",
-		"sap/ui/core/sample/odata/v4/DataAggregation/tests/filter",
-		"sap/ui/test/opaQunit",
-		"sap/ui/core/sample/odata/v4/DataAggregation/SandboxModel" // preload only
-	], function (Helper, expandPageCollapse, filter, opaTest) {
+	Core.ready().then(function () {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.DataAggregation");
 
 		["", "true", "false"].forEach(function (sGrandTotalAtBottomOnly) {

package/test/sap/ui/core/demokit/sample/odata/v4/DataAggregation/tests/expandPageCollapse.js

@@ -111,6 +111,7 @@ sap.ui.define([
 				name : "sap.ui.core.sample.odata.v4.DataAggregation"
 			}
 		});
+		Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 		aInitialTableState = [{
 			level : 0,
@@ -449,6 +450,5 @@ sap.ui.define([
 		checkSubtotalsAtBottom(16, oBwSmall, true);
 
 		Then.onAnyPage.checkLog();
-		Then.iTeardownMyUIComponent();
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/DataAggregation/tests/filter.js

@@ -67,6 +67,7 @@ sap.ui.define([
 				name : "sap.ui.core.sample.odata.v4.DataAggregation"
 			}
 		});
+		Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 		Then.onTheMainPage.checkTable(aInitialTableData);
 
@@ -208,6 +209,5 @@ sap.ui.define([
 
 		Then.onAnyPage.checkLog();
 		Then.onAnyPage.analyzeSupportAssistant();
-		Then.iTeardownMyUIComponent();
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/DeepCreate/ObjectPage.controller.js

@@ -3,10 +3,11 @@
  */
 sap.ui.define([
 	"sap/m/MessageToast",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/sample/common/Controller"
-], function (MessageToast, UIComponent, UI5Date, Controller) {
+], function (MessageToast, Messaging, UIComponent, UI5Date, Controller) {
 	"use strict";
 
 	return Controller.extend("sap.ui.core.sample.odata.v4.DeepCreate.ObjectPage", {
@@ -62,7 +63,7 @@ sap.ui.define([
 			var oRouter = UIComponent.getRouterFor(this);
 
 			this.initMessagePopover("showMessages");
-			this.getView().setModel(sap.ui.getCore().getMessageManager().getMessageModel(),
+			this.getView().setModel(Messaging.getMessageModel(),
 				"messages");
 			oRouter.getRoute("create").attachPatternMatched(this.onPatternMatched, this);
 			oRouter.getRoute("objectPage").attachPatternMatched(this.onPatternMatched, this);

package/test/sap/ui/core/demokit/sample/odata/v4/DeepCreate/Opa.qunit.js

@@ -2,18 +2,20 @@
  * ${copyright}
  */
 QUnit.config.autostart = false;
-sap.ui.getCore().attachInit(function () {
+
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/DeepCreate/pages/Main",
+	"sap/ui/test/Opa",
+	"sap/ui/test/opaQunit",
+	"sap/ui/test/TestUtils",
+	"sap/ui/core/sample/odata/v4/DeepCreate/SandboxModel" // preload only
+], function (Core, Helper, Any, Main, Opa, opaTest, TestUtils) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/Helper",
-		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/core/sample/odata/v4/DeepCreate/pages/Main",
-		"sap/ui/test/Opa",
-		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils",
-		"sap/ui/core/sample/odata/v4/DeepCreate/SandboxModel" // preload only
-	], function (Helper, Any, Main, Opa, opaTest, TestUtils) {
+	Core.ready().then(function () {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.DeepCreate");
 
 		//*****************************************************************************
@@ -27,6 +29,7 @@ sap.ui.getCore().attachInit(function () {
 					name : "sap.ui.core.sample.odata.v4.DeepCreate"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			Opa.getContext().sViewName = "sap.ui.core.sample.odata.v4.DeepCreate.ObjectPage";
 
@@ -62,7 +65,6 @@ sap.ui.getCore().attachInit(function () {
 			When.onAnyPage.cleanUp("SO_2_SOITEM");
 			Then.onAnyPage.checkLog();
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		});
 
 		QUnit.start();

package/test/sap/ui/core/demokit/sample/odata/v4/Draft/ListReport.controller.js

@@ -4,8 +4,9 @@
 sap.ui.define([
 	"sap/m/MessageBox",
 	"sap/ui/core/sample/common/Controller",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/UIComponent"
-], function (MessageBox, Controller, UIComponent) {
+], function (MessageBox, Controller, Messaging, UIComponent) {
 	"use strict";
 
 	return Controller.extend("sap.ui.core.sample.odata.v4.Draft.ListReport", {
@@ -24,7 +25,7 @@ sap.ui.define([
 			var oRouter = UIComponent.getRouterFor(this);
 
 			this.initMessagePopover("showMessages");
-			this.getView().setModel(sap.ui.getCore().getMessageManager().getMessageModel(),
+			this.getView().setModel(Messaging.getMessageModel(),
 				"messages");
 			oRouter.getRoute("objectPage").attachPatternMatched(this.onPatternMatched, this);
 			oRouter.getRoute("objectPageNoList").attachPatternMatched(this.onPatternMatched, this);

package/test/sap/ui/core/demokit/sample/odata/v4/Draft/Opa.qunit.js

@@ -3,17 +3,18 @@
  */
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/Draft/pages/Main",
+	"sap/ui/test/opaQunit",
+	"sap/ui/test/TestUtils",
+	"sap/ui/core/sample/odata/v4/Draft/SandboxModel" // preload only
+], function (Core, Helper, Any, Main, opaTest, TestUtils) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/Helper",
-		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/core/sample/odata/v4/Draft/pages/Main",
-		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils",
-		"sap/ui/core/sample/odata/v4/Draft/SandboxModel" // preload only
-	], function (Helper, Any, Main, opaTest, TestUtils) {
+	Core.ready().then(function () {
 		/*
 		 * The actual test run.
 		 * @param {object} Given - The OPA Given object
@@ -40,6 +41,7 @@ sap.ui.getCore().attachInit(function () {
 				},
 				hash : sHash
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			if (!sHash) {
 				When.onTheListReport.selectProduct(0);
@@ -142,7 +144,6 @@ sap.ui.getCore().attachInit(function () {
 			if (!sHash) {
 				Then.onAnyPage.analyzeSupportAssistant();
 			}
-			Then.iTeardownMyUIComponent();
 		}
 
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.Draft");
@@ -178,13 +179,12 @@ sap.ui.getCore().attachInit(function () {
 						name : "sap.ui.core.sample.odata.v4.Draft"
 					}
 				});
+				Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 				// Select part with read error
 				When.onTheListReport.selectProduct(3);
 				Then.onTheErrorPage.checkError("Entity: /Products(ID=40,IsActiveEntity=true)"
 					+ " Error: Communication error: 500 ");
-
-				Then.iTeardownMyUIComponent();
 			});
 
 			//*****************************************************************************
@@ -196,13 +196,12 @@ sap.ui.getCore().attachInit(function () {
 					},
 					hash : "/Products(ID=40,IsActiveEntity=true)"
 				});
+				Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 				When.onAnyPage.applySupportAssistant();
 				Then.onTheErrorPage.checkError("Entity: /Products(ID=40,IsActiveEntity=true)"
 					+ " Error: Communication error: 500 ");
 				Then.onAnyPage.analyzeSupportAssistant();
-
-				Then.iTeardownMyUIComponent();
 			});
 		}
 

package/test/sap/ui/core/demokit/sample/odata/v4/FieldGroups/Opa.qunit.js

@@ -3,17 +3,18 @@
  */
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/FieldGroups/pages/Main",
+	"sap/ui/test/opaQunit",
+	"sap/ui/test/TestUtils",
+	"sap/ui/core/sample/odata/v4/FieldGroups/SandboxModel" // preload only
+], function (Core, Helper, Any, Main, opaTest, TestUtils) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/Helper",
-		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/core/sample/odata/v4/FieldGroups/pages/Main",
-		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils",
-		"sap/ui/core/sample/odata/v4/FieldGroups/SandboxModel" // preload only
-	], function (Helper, Any, Main, opaTest, TestUtils) {
+	Core.ready().then(function () {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.FieldGroups");
 
 		if (TestUtils.isRealOData()) {
@@ -28,6 +29,8 @@ sap.ui.getCore().attachInit(function () {
 						name : "sap.ui.core.sample.odata.v4.FieldGroups"
 					}
 				});
+				Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
+
 				Then.onTheMainPage.checkField("firstName", "Karl");
 				Then.onTheMainPage.checkField("lastName", "Müller");
 
@@ -41,7 +44,6 @@ sap.ui.getCore().attachInit(function () {
 
 				Then.onAnyPage.checkLog();
 				Then.onAnyPage.analyzeSupportAssistant();
-				Then.iTeardownMyUIComponent();
 			});
 
 			opaTest("Enter a last name, leave field group and request side effects",
@@ -52,6 +54,8 @@ sap.ui.getCore().attachInit(function () {
 						name : "sap.ui.core.sample.odata.v4.FieldGroups"
 					}
 				});
+				Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
+
 				Then.onTheMainPage.checkField("firstName", "Karl");
 				Then.onTheMainPage.checkField("lastName", "Müller");
 
@@ -68,7 +72,6 @@ sap.ui.getCore().attachInit(function () {
 				]);
 
 				Then.onAnyPage.checkLog();
-				Then.iTeardownMyUIComponent();
 			});
 
 			QUnit.start();

package/test/sap/ui/core/demokit/sample/odata/v4/FlatDataAggregation/Component.js

@@ -8,10 +8,11 @@
  */
 sap.ui.define([
 	"sap/m/MessageBox",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/UIComponent",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator"
-], function (MessageBox, UIComponent, Filter, FilterOperator) {
+], function (MessageBox, Messaging, UIComponent, Filter, FilterOperator) {
 	"use strict";
 
 	return UIComponent.extend("sap.ui.core.sample.odata.v4.FlatDataAggregation.Component", {
@@ -20,8 +21,7 @@ sap.ui.define([
 		},
 
 		init : function () {
-			var oMessageManager = sap.ui.getCore().getMessageManager(),
-				oMessageModel = oMessageManager.getMessageModel(),
+			var oMessageModel = Messaging.getMessageModel(),
 				bMessageOpen = false;
 
 			UIComponent.prototype.init.apply(this, arguments);
@@ -42,7 +42,7 @@ sap.ui.define([
 				aContexts.forEach(function (oContext) {
 					aMessages.push(oContext.getObject());
 				});
-				oMessageManager.removeMessages(aMessages);
+				Messaging.removeMessages(aMessages);
 
 				// Due to batching there can be more than one technical message. However the UX
 				// guidelines say "display a single message in a message box" assuming that there

package/test/sap/ui/core/demokit/sample/odata/v4/FlatDataAggregation/FlatDataAggregation.controller.js

@@ -72,6 +72,7 @@ sap.ui.define([
 					= UriParameters.fromQuery(window.location.search)
 						.get("grandTotalAtBottomOnly"),
 				oTTable = this.byId("tTable"),
+				oTTableMode = oTTable.getRowMode(),
 				oRowsBinding = oTTable.getBinding("rows"),
 				that = this;
 
@@ -96,8 +97,9 @@ sap.ui.define([
 						that._oAggregation4Grid.aggregate[sAlias].grandTotal = !sFilter;
 					});
 				oRowsBinding.setAggregation(this._oAggregation4Grid);
-				oTTable.setFixedRowCount(sGrandTotalAtBottomOnly !== "true" && !sFilter ? 1 : 0);
-				oTTable.setFixedBottomRowCount(sGrandTotalAtBottomOnly && !sFilter ? 1 : 0);
+				oTTableMode.setFixedTopRowCount(sGrandTotalAtBottomOnly !== "true"
+												&& !sFilter ? 1 : 0);
+				oTTableMode.setFixedBottomRowCount(sGrandTotalAtBottomOnly && !sFilter ? 1 : 0);
 			}
 			oRowsBinding.resume();
 		},
@@ -162,14 +164,14 @@ sap.ui.define([
 			});
 			if (sGrandTotalAtBottomOnly) {
 				this._oAggregation4Grid.grandTotalAtBottomOnly = bGrandTotalAtBottomOnly;
-				oTTable.setFixedBottomRowCount(1);
+				oTTable.getRowMode().setFixedBottomRowCount(1);
 			}
 			// Note: this triggers a "refresh" event with reason "filter" which resets
 			// firstVisibleRow to 0
 			oRowsBinding.setAggregation(this._oAggregation4Grid);
 			oTTable.setFirstVisibleRow(1); //TODO does not help?
 			if (sGrandTotalAtBottomOnly !== "true") {
-				oTTable.setFixedRowCount(1);
+				oTTable.getRowMode().setFixedTopRowCount(1);
 			}
 			oRowsBinding.resume();
 			oTTable.setBindingContext(oRowsBinding.getHeaderContext(), "headerContext");

package/test/sap/ui/core/demokit/sample/odata/v4/FlatDataAggregation/FlatDataAggregation.view.xml

@@ -3,7 +3,8 @@
 	controllerName="sap.ui.core.sample.odata.v4.FlatDataAggregation.FlatDataAggregation"
 	xmlns="sap.m"
 	xmlns:mvc="sap.ui.core.mvc"
-	xmlns:table="sap.ui.table">
+	xmlns:table="sap.ui.table"
+	xmlns:tablerm="sap.ui.table.rowmodes">
 
 	<Title text="Responsive Table" titleStyle="H1"/>
 
@@ -52,7 +53,7 @@
 
 	<!-- Note: for $$aggregation, see controller's onInit! -->
 	<table:Table id="tTable" rows="{path : '/BusinessPartners', suspended : true}"
-			selectionMode="None" threshold="0" visibleRowCount="5">
+			selectionMode="None" threshold="0">
 		<table:extension>
 			<Toolbar class="sapMTBHeader-CTX">
 				<Title text="Sales Number by Region ({headerContext>$count})" titleStyle="H2"/>
@@ -65,6 +66,9 @@
 					visible="{ui>/bRealOData}" width="50%" search="onFilterGrid"/>
 			</Toolbar>
 		</table:extension>
+		<table:rowMode>
+			<tablerm:Fixed rowCount="5"/>
+		</table:rowMode>
 		<table:Column>
 			<Label text="Region"/>
 			<table:template>

package/test/sap/ui/core/demokit/sample/odata/v4/FlexibleColumnLayout/Main.controller.js

@@ -6,6 +6,7 @@ sap.ui.define([
 	"sap/f/library",
 	"sap/m/MessageBox",
 	"sap/m/MessageToast",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/sample/common/Controller",
 	"sap/ui/model/Filter",
@@ -13,7 +14,7 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/test/TestUtils"
-], function (_Formatter, library, MessageBox, MessageToast, UI5Date, Controller, Filter,
+], function (_Formatter, library, MessageBox, MessageToast, Messaging, UI5Date, Controller, Filter,
 		FilterOperator, Sorter, JSONModel, TestUtils) {
 	"use strict";
 
@@ -192,8 +193,7 @@ sap.ui.define([
 			this.getView().setModel(this.oUIModel, "ui");
 			this.getView().setModel(this.getView().getModel(), "headerContext");
 			// TODO initMessagePopover should expose its "messages" model to the complete view
-			this.getView().setModel(sap.ui.getCore().getMessageManager().getMessageModel(),
-				"messages");
+			this.getView().setModel(Messaging.getMessageModel(), "messages");
 			this.byId("salesOrderListTitle").setBindingContext(
 				this.byId("SalesOrderList").getBinding("items").getHeaderContext(),
 				"headerContext");