@openui5/sap.m 1.98.0 → 1.101.0

package/src/sap/m/semantic/NegativeAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/OpenInAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/PositiveAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/PrintAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SaveAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/Segment.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/Log"], function(BaseObject, Log)
 	 * Constructor for an sap.m.semantic.Segment.
 	 *
 	 * @class Abstraction for a segment in a SegmentedContainer
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.Segment

package/src/sap/m/semantic/SegmentedContainer.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/m/semantic/Segment', 'sap/ui/base/Object', "sap/base/Log"],
 	 * Constructor for an sap.m.semantic.SegmentedContainer.
 	 *
 	 * @class text
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.SegmentedContainer

package/src/sap/m/semantic/SemanticButton.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticConfiguration.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.semantic.SemanticConfiguration.
 	 *
 	 * @class Defines the visual properties and positioning for each supported semantic type
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.SemanticConfiguration
@@ -252,8 +252,7 @@ sap.ui.define([
 			getSettings: function() {
 				return {
 					icon: IconPool.getIconURI("add"),
-					text: oBundle.getText("SEMANTIC_CONTROL_ADD"),
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_ADD")
+					text: oBundle.getText("SEMANTIC_CONTROL_ADD")
 				};
 			},
 			order: 0,
@@ -265,8 +264,7 @@ sap.ui.define([
 			getSettings: function() {
 				return {
 					icon: IconPool.getIconURI("favorite"),
-					text: oBundle.getText("SEMANTIC_CONTROL_FAVORITE"),
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_FAVORITE")
+					text: oBundle.getText("SEMANTIC_CONTROL_FAVORITE")
 				};
 			},
 			order: 1,
@@ -278,8 +276,7 @@ sap.ui.define([
 			getSettings: function() {
 				return {
 					icon: IconPool.getIconURI("flag"),
-					text: oBundle.getText("SEMANTIC_CONTROL_FLAG"),
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_FLAG")
+					text: oBundle.getText("SEMANTIC_CONTROL_FLAG")
 				};
 			},
 			order: 2,
@@ -306,8 +303,7 @@ sap.ui.define([
 			getSettings: function() {
 				return {
 					icon: IconPool.getIconURI("sort"),
-					text: oBundle.getText("SEMANTIC_CONTROL_SORT"),
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_SORT")
+					text: oBundle.getText("SEMANTIC_CONTROL_SORT")
 				};
 			},
 			constraints: "IconOnly"
@@ -338,8 +334,7 @@ sap.ui.define([
 			getSettings: function() {
 				return {
 					icon: IconPool.getIconURI("filter"),
-					text: oBundle.getText("SEMANTIC_CONTROL_FILTER"),
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_FILTER")
+					text: oBundle.getText("SEMANTIC_CONTROL_FILTER")
 				};
 			},
 			constraints: "IconOnly"
@@ -370,8 +365,7 @@ sap.ui.define([
 			getSettings: function() {
 				return {
 					icon: IconPool.getIconURI("group-2"),
-					text: oBundle.getText("SEMANTIC_CONTROL_GROUP"),
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_GROUP")
+					text: oBundle.getText("SEMANTIC_CONTROL_GROUP")
 				};
 			},
 			constraints: "IconOnly"
@@ -480,7 +474,6 @@ sap.ui.define([
 							return aMessages.length || 0;
 						}
 					},
-					tooltip: oBundle.getText("SEMANTIC_CONTROL_MESSAGES_INDICATOR"),
 					type: ButtonType.Emphasized,
 					visible: {
 						path: "message>/",

package/src/sap/m/semantic/SemanticControl.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticOverflowToolbarButton.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/m/OverflowToolbarButton', 'sap/m/ButtonRenderer'],
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/semantic/SemanticOverflowToolbarToggleButton.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/m/OverflowToolbarToggleButton", "sap/m/ToggleButtonRenderer"
 		 * @extends sap.m.OverflowToolbarToggleButton
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/semantic/SemanticPage.js

@@ -109,7 +109,7 @@ function(
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticSelect.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticControl', 'sap/m/Select', "sap/base/Log"]
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SemanticToggleButton.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SendEmailAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SendMessageAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/ShareInJamAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/ShareMenu.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * ShareMenu is a special menu that is represented by (1) an actionSheet with the menu items and (2) a button that opens the actionSheet.
 	 * If the menu has only one item, then that item appears in place of the button that opens the actionSheet.
 	 *
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.ShareMenu
@@ -310,8 +310,8 @@ sap.ui.define([
 	 * (1) In actionSheet mode, it opens the menu
 	 * (2) In "button" mode (i.e. when the menu has a single menu-item) it represents the only menu-item
 	 *
-	 * @param {boolean} bSuppressInvalidate - if true, the menu as well as the inserted child are not marked as changed
 	 * @param {sap.m.Button} oButton - the new base button
+	 * @param {boolean} bSuppressInvalidate - if true, the menu as well as the inserted child are not marked as changed
 	 * @return {this} Returns <code>this</code> to allow method chaining
 	 */
 	ShareMenu.prototype._setBaseButton = function (oButton, bSuppressInvalidate) {

package/src/sap/m/semantic/ShareMenuPage.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/m/semantic/SemanticPage", "sap/m/semantic/SemanticConfigurat
 	 * @extends sap.m.semantic.SemanticPage
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SortAction.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @implements sap.m.semantic.ISort
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SortSelect.js

@@ -24,7 +24,7 @@ sap.ui.define(['sap/m/semantic/SemanticSelect'], function(SemanticSelect) {
 	 * @implements sap.m.semantic.ISort
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/table/Util.js

@@ -4,24 +4,25 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/**
- * @class Provides utility functions for tables
- * @alias sap.m.table.Util
- * @author SAP SE
- * @version 1.98.0
- * @since 1.96.0
- * @private
- * @static
- * @experimental Since 1.96.0. This class is experimental and the API might be changed in future.
- */
 sap.ui.define([
 	"sap/m/library",
 	"sap/ui/core/Core",
-	"sap/ui/core/theming/Parameters"
-], function(MLibrary, Core, ThemeParameters) {
+	"sap/ui/core/theming/Parameters",
+	"sap/m/IllustratedMessage"
+], function(MLibrary, Core, ThemeParameters, IllustratedMessage) {
 	"use strict";
 	/*global Intl*/
 
+	/**
+	 * Provides utility functions for tables.
+	 * @namespace
+	 * @alias module:sap/m/table/Util
+	 * @author SAP SE
+	 * @version 1.101.0
+	 * @since 1.96.0
+	 * @private
+	 * @experimental Since 1.96.0. This class is experimental and the API might be changed in future.
+	 */
 	var Util = {};
 
 	// local privates
@@ -57,7 +58,7 @@ sap.ui.define([
 
 
 	/**
-	 * Calculates the width of a give ODataType that is used in tables.
+	 * Calculates the width of a given ODataType that is used in tables.
 	 *
 	 * @param {sap.ui.model.odata.type.ODataType} oType The ODataType instance
 	 * @param {object} [mSettings] The settings object
@@ -68,10 +69,10 @@ sap.ui.define([
 	 */
 	Util.calcTypeWidth = (function() {
 		var fBooleanWidth = 0;
-		var aDateParameter = [2023, 9, 26, 22, 47, 58, 999];
-		var oUTCDate = new Date(Date.UTC.apply(0, aDateParameter));
-		var oLocalDate = new (Function.prototype.bind.apply(Date, [null].concat(aDateParameter)))();
-		var mNumericLimits = { Byte: 3, SByte: 3, Int16: 5, Int32: 9, Int64: 12, Single: 6, Float: 12, Double: 13, Decimal: 15 };
+		var aDateParameters = [2023, 9, 26, 22, 47, 58, 999];
+		var oUTCDate = new Date(Date.UTC.apply(0, aDateParameters));
+		var oLocalDate = new (Function.prototype.bind.apply(Date, [null].concat(aDateParameters)))();
+		var mNumericLimits = { Byte: 3, SByte: 3, Int16: 5, Int32: 9, Int64: 12, Single: 6, Float: 12, Double: 13, Decimal: 15, Integer: 9 };
 		Core.attachThemeChanged(function() { fBooleanWidth = 0; });
 
 		return function(oType, mSettings) {
@@ -90,7 +91,7 @@ sap.ui.define([
 
 			if (sType == "String" || oType.isA("sap.ui.model.odata.type.String")) {
 				var iMaxWidth = mSettings && mSettings.maxWidth || 19;
-				var iMaxLength = oType.getConstraints().maxLength || 0;
+				var iMaxLength = parseInt(oType.getConstraints().maxLength) || 0;
 
 				if (!iMaxLength) {
 					return Math.max(Math.min(10, iMaxWidth), iMaxWidth * 0.75);
@@ -109,23 +110,27 @@ sap.ui.define([
 			}
 
 			if (sType.startsWith("Date") || sType.startsWith("Time")) {
-				var oDate = oType.getFormatOptions().UTC ? oUTCDate : oLocalDate;
+				var mFormatOptions = oType.getFormatOptions();
+				var oDate = mFormatOptions.UTC ? oUTCDate : oLocalDate;
 				var sSample = oDate.toLocaleDateString();
 
 				if (sType == "TimeOfDay") {
-					sSample = new Intl.DateTimeFormat('de', {hour: 'numeric', minute: 'numeric', second: 'numeric'}).format(oDate);
+					sSample = new Intl.DateTimeFormat("de", {hour: "numeric", minute: "numeric", second: "numeric"}).format(oDate);
 					sSample = oType.formatValue(sSample, "string");
 				} else if (oType.isA("sap.ui.model.odata.type.Time")) {
 					sSample = oType.formatValue({ __edmType: "Edm.Time", ms: oUTCDate.valueOf() }, "string");
 				} else {
-					sSample = oType.formatValue(oDate, "string");
+					sSample = oType.formatValue(mFormatOptions.interval ? [oDate, new Date(oDate * 1.009)] : oDate, "string");
+					((oType.oFormat && oType.oFormat.oFormatOptions && oType.oFormat.oFormatOptions.pattern) || "").replace(/[MELVec]{3,4}/, function(sWideFormat) {
+						sSample += (sWideFormat.length == 4 ? "---" : "-");
+					});
 				}
 				return Util.measureText(sSample);
 			}
 
 			if (mNumericLimits[sType]) {
-				var iScale = oType.getConstraints().scale || 0;
-				var iPrecision = oType.getConstraints().precision || 20;
+				var iScale = parseInt(oType.getConstraints().scale) || 0;
+				var iPrecision = parseInt(oType.getConstraints().precision) || 20;
 				iPrecision = Math.min(iPrecision, mNumericLimits[sType]);
 				var sNumber = 2 * Math.pow(10, iPrecision - iScale - 1);
 				sNumber = oType.formatValue(sNumber, "string");
@@ -187,6 +192,82 @@ sap.ui.define([
 		};
 	})();
 
+	/**
+	 * Calculates the width of a table column.
+	 *
+	 * @param {sap.ui.model.odata.type.ODataType[]} vTypes The ODataType instances
+	 * @param {string} [sHeader] The header of the column
+	 * @param {object} [mSettings] The settings object
+	 * @param {int} [mSettings.minWidth=2] The minimum content width of the field in rem
+	 * @param {int} [mSettings.maxWidth=19] The maximum content width of the field in rem
+	 * @param {int} [mSettings.padding=1] The sum of column padding and border in rem
+	 * @param {float} [mSettings.gap=0] The additional content width in rem
+	 * @param {boolean} [mSettings.verticalArrangement=false] Whether the fields are arranged vertically
+	 * @param {int} [mSettings.defaultWidth=8] The default column content width when type check fails
+	 * @returns {string} The calculated width of the column
+	 * @private
+	 * @ui5-restricted sap.fe, sap.ui.mdc, sap.ui.comp
+	 * @since 1.101
+	 */
+	Util.calcColumnWidth = function(vTypes, sHeader, mSettings) {
+		if (!Array.isArray(vTypes)) {
+			vTypes = [vTypes];
+		}
+
+		mSettings = Object.assign({
+			minWidth: 2,
+			maxWidth: 19,
+			defaultWidth: 8,
+			padding: 1,
+			gap: 0,
+			verticalArrangement: false
+		}, mSettings);
+
+		var fHeaderWidth = 0;
+		var iMinWidth = Math.max(1, mSettings.minWidth);
+		var iMaxWidth = Math.max(iMinWidth, mSettings.maxWidth);
+
+		var fContentWidth = mSettings.gap + vTypes.reduce(function(fInnerWidth, vType) {
+			var oType = vType, oTypeSettings = mSettings;
+
+			if (Array.isArray(vType)) {
+				// for internal usage (mdc/Table) every field can provide own width settings
+				// in this case we get [<TypeInstance>, <TypeSettings>][] instead of <TypeInstance>[]
+				oType = vType[0];
+				oTypeSettings = vType[1] || mSettings;
+			}
+
+			var fTypeWidth = Util.calcTypeWidth(oType, oTypeSettings);
+			return mSettings.verticalArrangement ? Math.max(fInnerWidth, fTypeWidth) : fInnerWidth + fTypeWidth + (fInnerWidth && 0.5);
+		}, 0);
+
+		if (sHeader) {
+			fHeaderWidth = Util.calcHeaderWidth(sHeader, fContentWidth, iMaxWidth, iMinWidth);
+		}
+
+		fContentWidth = Math.max(iMinWidth, fContentWidth, fHeaderWidth);
+		fContentWidth = Math.min(fContentWidth, iMaxWidth);
+		fContentWidth = Math.round(fContentWidth * 100) / 100;
+
+		return fContentWidth + mSettings.padding + "rem";
+	};
+
+	/**
+	 * Returns an instance of <code>sap.m.IllustratedMessage</code> in case there are no visible columns in the table.
+	 *
+	 * @returns {sap.m.IllustratedMessage} The message to be displayed when the table has no visible columns
+	 * @private
+	 */
+	Util.getNoColumnsIllustratedMessage = function() {
+		var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+
+		return new IllustratedMessage({
+			illustrationType: MLibrary.IllustratedMessageType.AddColumn,
+			title: oResourceBundle.getText("TABLE_NO_COLUMNS_TITLE"),
+			description: oResourceBundle.getText("TABLE_NO_COLUMNS_DESCRIPTION")
+		});
+	};
+
 	return Util;
 
 });

package/src/sap/m/table/{ActionItem.js → columnmenu/ActionItem.js}

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/m/table/ItemBase"
+	"sap/m/table/columnmenu/ItemBase"
 ], function(
 	ItemBase
 ) {
@@ -13,25 +13,24 @@ sap.ui.define([
 	/**
 	 * Constructor for a new ActionItem.
 	 *
-	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @param {object} [mSettings] Initial settings for the new control
+	 * @param {string} [sId] ID for the new ActionItem, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new ActionItem
 	 *
 	 * @class
-	 * This control serves as a menu action item for the sap.m.table.ColumnMenu.
-	 * It can be used to specify control- and application-specific items,
-	 * which should solely serve as actions.
+	 * The ActionItem serves as a menu action item for the sap.m.table.columnmenu.Menu.
+	 * It can be used to specify control- and application-specific items which should solely serve as actions.
 	 *
-	 * @extends sap.m.table.ItemBase
+	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental
 	 *
-	 * @alias sap.m.table.ActionItem
+	 * @alias sap.m.table.columnmenu.ActionItem
 	 */
-	var ActionItem = ItemBase.extend("sap.m.table.ActionItem", {
+	var ActionItem = ItemBase.extend("sap.m.table.columnmenu.ActionItem", {
 		metadata: {
 			library: "sap.m",
 			properties: {

package/src/sap/m/table/{ColumnMenuEntry.js → columnmenu/Entry.js}

@@ -11,26 +11,26 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * Constructor for a new ColumnMenuEntry.
+	 * Constructor for a new Entry.
 	 *
-	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @param {object} [mSettings] Initial settings for the new control
+	 * @param {string} [sId] ID for the new Entry, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new Entry
 	 *
 	 * @class
-	 * This control serves as a base class for elements residing inside the sap.m.table.ColumnMenu.
-	 * This base class is faceless and should be inherited to implement ColumnMenu items and quick actions.
+	 * The Entry serves as a base class for elements residing inside the sap.m.table.columnmenu.Menu.
+	 * This base class is faceless and should be inherited to implement Menu items and quick actions.
 	 *
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental
 	 *
-	 * @alias sap.m.table.ColumnMenuEntry
+	 * @alias sap.m.table.columnmenu.Entry
 	 */
-	var ColumnMenuEntry = Element.extend("sap.m.table.ColumnMenuEntry", {
+	var Entry = Element.extend("sap.m.table.columnmenu.Entry", {
 		metadata: {
 			"abstract": true,
 			library: "sap.m",
@@ -41,19 +41,19 @@ sap.ui.define([
 	});
 
 	/**
-	 * This method can be used to retrieve the ColumnMenu, in which the entry resides in.
+	 * This method can be used to retrieve the Menu, in which the entry resides in.
 	 *
 	 * If an entry is internally creating entries that use #getMenu or #getParent,
 	 * and returns them in #getEffectiveItems or #getEffectiveQuickActions, they
 	 * must be its children in the control tree.
 	 *
-	 * @returns {sap.m.ColumnMenu} The menu of the entry
+	 * @returns {sap.m.table.columnmenu.Menu} The menu of the entry
 	 * @public
 	 */
-	ColumnMenuEntry.prototype.getMenu = function () {
+	Entry.prototype.getMenu = function () {
 		var oElement = this.getParent();
 		while (oElement) {
-			if (oElement.isA("sap.m.table.ColumnMenu")) {
+			if (oElement.isA("sap.m.table.columnmenu.Menu")) {
 				return oElement;
 			}
 			oElement = oElement.getMenu();
@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @returns {string} The label property specified in the control
 	 * @abstract
 	 */
-	ColumnMenuEntry.prototype.getLabel = function () {
+	Entry.prototype.getLabel = function () {
 		if (this.getMetadata().hasProperty("label")) {
 			return this.getProperty("label");
 		}
@@ -80,14 +80,14 @@ sap.ui.define([
 	 * @returns {sap.ui.core.Control} The control specified in the content aggregation
 	 * @abstract
 	 */
-	ColumnMenuEntry.prototype.getContent = function () {
+	Entry.prototype.getContent = function () {
 		if (this.getMetadata().hasAggregation("content")) {
 			return this.getAggregation("content");
 		}
 		throw new Error(this + " does not implement #getContent");
 	};
 
-	ColumnMenuEntry.prototype.setVisible = function (bVisible) {
+	Entry.prototype.setVisible = function (bVisible) {
 		if (this.getVisible() == bVisible) {
 			return this;
 		}
@@ -97,5 +97,5 @@ sap.ui.define([
 		return this;
 	};
 
-	return ColumnMenuEntry;
+	return Entry;
 });

package/src/sap/m/table/{Item.js → columnmenu/Item.js}

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/m/table/ItemBase"
+	"sap/m/table/columnmenu/ItemBase"
 ], function(
 	ItemBase
 ) {
@@ -13,24 +13,24 @@ sap.ui.define([
 	/**
 	 * Constructor for a new Item.
 	 *
-	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @param {object} [mSettings] Initial settings for the new control
+	 * @param {string} [sId] ID for the new Item, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new Item
 	 *
 	 * @class
-	 * This control serves as a menu item for the sap.m.table.ColumnMenu.
+	 * This Item serves as a menu item for the sap.m.table.columnmenu.Menu.
 	 * It can be used to specify control- and application-specific items.
 	 *
-	 * @extends sap.m.table.ItemBase
+	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental
 	 *
-	 * @alias sap.m.table.Item
+	 * @alias sap.m.table.columnmenu.Item
 	 */
-	var Item = ItemBase.extend("sap.m.table.Item", {
+	var Item = ItemBase.extend("sap.m.table.columnmenu.Item", {
 		metadata: {
 			library: "sap.m",
 			properties: {