@sapui5/sap.rules.ui 1.120.1 → 1.122.0

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFixedValuePanel.js

@@ -4,10 +4,10 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/m/List",
 	"sap/ui/model/json/JSONModel",
-	"sap/m/ListMode",
+	"sap/m/library",
 	"sap/ui/core/CustomData",
 	"sap/ui/model/Sorter",
-	"sap/rules/ui/parser/infrastructure/util/utilsBase",
+	"sap/rules/ui/ast/util/utilsBase",
 	"sap/ui/core/LocaleData",
 	"sap/rules/ui/Constants",
 	"sap/m/DatePicker",
@@ -15,11 +15,33 @@ sap.ui.define([
 	"sap/m/TimePicker",
 	"sap/m/Dialog",
 	"sap/m/Button",
+	"sap/base/i18n/Formatting",
+    "sap/ui/core/format/DateFormat",
+    "sap/ui/core/InvisibleText",
+    "sap/m/Input",
+    "sap/m/Panel",
+    "sap/m/ToolbarSpacer",
+    "sap/ui/comp/smartfilterbar/SmartFilterBar",
+    "sap/ui/comp/valuehelpdialog/ValueHelpDialog",
+    "sap/ui/core/library",
+    "sap/ui/model/odata/v2/ODataModel",
+    "sap/ui/comp/smartfilterbar/ControlConfiguration",
+    "sap/ui/table/Column",
+    "sap/ui/model/Filter",
+    "sap/ui/model/FilterOperator",
+    "sap/m/Label",
+    "sap/m/Text",
+    "sap/m/Link",
+    "sap/ui/core/Lib",
+    "sap/ui/core/BusyIndicator",
+    "sap/ui/core/Element",
 	"./AutoSuggestionFixedValuePanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils,
-	LocaleData, Constants, DatePicker , DateTimePicker , TimePicker, Dialog, Button, AutoSuggestionFixedValuePanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils,
+	LocaleData, Constants, DatePicker , DateTimePicker , TimePicker, Dialog, Button, Formatting, DateFormat, InvisibleText, Input, Panel, ToolbarSpacer, SmartFilterBar,
+	ValueHelpDialog, coreLibrary, ODataModel, ControlConfiguration, TableColumn, Filter, FilterOperator, Label, Text, Link, coreLib, BusyIndicator, Element, AutoSuggestionFixedValuePanelRenderer) {
 	"use strict";
 
+	var ListMode = mobileLibrary.ListMode;
 	var autoSuggestionFixedValuePanel = Control.extend("sap.rules.ui.ast.autoCompleteContent.AutoSuggestionFixedValuePanel", {
 		metadata: {
 			library: "sap.rules.ui",
@@ -56,22 +78,22 @@ sap.ui.define([
 		},
 
 		init: function () {
-			this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+			this.infraUtils = new infraUtils.utilsBaseLib();
 			this.needCreateLayout = true;
 			this.businessDataType = "S";
 			this._propertyValue = "Value";
 			this._propertyDescription = "Description";
-			this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+			this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 			this.vocabularyInfo = this.getVocabularyInfo();
 			this.autoSuggestionData = this.getData();
 			
 			// Date instance which is used to convert the selected date from calendar control to short format
-			var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+			var oLocale = Formatting.getLanguageTag();
 			var oLocaleData = LocaleData.getInstance(oLocale);
 
-			this.oFormatDate = sap.ui.core.format.DateFormat.getInstance({
+			this.oFormatDate = DateFormat.getInstance({
 					pattern: oLocaleData.getDatePattern('short'),
-					calendarType: sap.ui.core.CalendarType.Gregorian
+					calendarType: coreLibrary.CalendarType.Gregorian
 				},
 				oLocale
 			);
@@ -110,13 +132,13 @@ sap.ui.define([
 				hasValueSource = false;
 			}
 			//The invisible text is introduced to identify the input field by screen reader.
-			this._invisibleTextLabel = new sap.ui.core.InvisibleText({
+			this._invisibleTextLabel = new InvisibleText({
 				text:this.oBundle.getText("fixedValuePanelTitle")
 			})
-			this._invisibleTextDescription = new sap.ui.core.InvisibleText({
+			this._invisibleTextDescription = new InvisibleText({
 				text:this.oBundle.getText("fixedValueInvisibleText")
 			});
-			this.fixedValueTextArea = new sap.m.Input({
+			this.fixedValueTextArea = new Input({
 				showValueHelp: hasValueSource,
 				showSuggestion: true,
 				autocomplete: false,
@@ -137,7 +159,7 @@ sap.ui.define([
 				width: "auto"
 			});
 
-			var fixedValuePanel = new sap.m.Panel({
+			var fixedValuePanel = new Panel({
 				headerText: this.oBundle.getText("fixedValuePanelTitle"),
 				expandable: true,
 				expanded: false,
@@ -145,8 +167,8 @@ sap.ui.define([
 				width: "auto"
 			})
 			
-			this.toolBarSpacerAfterInput =	new sap.m.ToolbarSpacer({width: "1em"});
-			this.toolBarSpacerAfterDateLink =	new sap.m.ToolbarSpacer({width: "1em"});
+			this.toolBarSpacerAfterInput =	new ToolbarSpacer({width: "1em"});
+			this.toolBarSpacerAfterDateLink =	new ToolbarSpacer({width: "1em"});
 			this.dateContent = this._createDateLink();
 			this.timeContent = this._createTimeStampLink();
 			fixedValuePanel.addContent(this.toolBarSpacerAfterInput);
@@ -158,7 +180,7 @@ sap.ui.define([
 		},
 
 		_setModal: function (value) {
-			var pop = sap.ui.getCore().byId("popover");
+			var pop = Element.getElementById("popover");
 			if (pop) {
 				pop.setModal(value);
 			}
@@ -213,8 +235,8 @@ sap.ui.define([
 			if(!expressionData.oData[attributePath]){
 				valueHelpInfo.dataObjectId = this._getStructureObjectForTableType(valueHelpInfo.attributeId, valueHelpInfo);
 			}
-			sap.ui.core.BusyIndicator.show(0);
-			this.oValueHelpDialog = new sap.ui.comp.valuehelpdialog.ValueHelpDialog({
+			BusyIndicator.show(0);
+			this.oValueHelpDialog = new ValueHelpDialog({
 				supportMultiselect: false,
 				supportRanges: false,
 				horizontalScrolling: false,
@@ -236,7 +258,7 @@ sap.ui.define([
 					that.oValueHelpDialog.close();
 					that._setModal(false);
 					that.oValueHelpDialog.destroy();
-					sap.ui.core.BusyIndicator.hide();
+					BusyIndicator.hide();
 					that._reference(oEvt);
 				}.bind(this),
 				cancel: function () {
@@ -244,12 +266,12 @@ sap.ui.define([
 					that._setModal(false);
 					that.oValueHelpDialog.close();
 					that.oValueHelpDialog.destroy();
-					sap.ui.core.BusyIndicator.hide();
+					BusyIndicator.hide();
 				},
 				afterClose: function () {
 					that._dialogOpenedCallbackReference(false);
 					that.oFilterBar.destroy();
-					sap.ui.core.BusyIndicator.hide();
+					BusyIndicator.hide();
 				}
 			});
 		},
@@ -334,12 +356,12 @@ sap.ui.define([
                 date = formatterParsing.parse(sValue);
             }
             if (this._dateBusinessDataType === "D") {
-                formatter = sap.ui.core.format.DateFormat.getDateInstance({
+                formatter = DateFormat.getDateInstance({
                     pattern: "yyyy-MM-dd"
                 });
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {
-                formatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+                formatter = DateFormat.getDateTimeInstance({
                     pattern: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
                     UTC:true
                 });
@@ -356,7 +378,7 @@ sap.ui.define([
 		 */
 		_createSmartFilterBar: function (basePath, valueHelpInfo) {
 			var that = this;
-			this.oFilterBar = new sap.ui.comp.smartfilterbar.SmartFilterBar({
+			this.oFilterBar = new SmartFilterBar({
 				entitySet: valueHelpInfo.entitySet,
 				enableBasicSearch: true,
 				advancedMode: true,
@@ -370,7 +392,7 @@ sap.ui.define([
 				},
 				controlConfiguration: [that._createControlConfiguration()]
 			});
-			var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
+			var oModel = new ODataModel(basePath);
 			this.oFilterBar.setModel(oModel);
 		},
 
@@ -378,7 +400,7 @@ sap.ui.define([
 		 * Creating the Control Configuration for the smartFilter of the valueHelp Dialog.
 		 */
 		_createControlConfiguration: function () {
-			var aControlConfiguration = [new sap.ui.comp.smartfilterbar.ControlConfiguration({
+			var aControlConfiguration = [new ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "Value",
 					label: this.oBundle.getText("value"),
@@ -386,7 +408,7 @@ sap.ui.define([
 					width: "100px",
 					index: 1
 
-				}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+				}), new ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "Description",
 					label: this.oBundle.getText("description"),
@@ -394,7 +416,7 @@ sap.ui.define([
 					width: "100px",
 					index: 2
 
-				}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+				}), new ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "VocabularyId",
 					label: "VocabularyId",
@@ -402,7 +424,7 @@ sap.ui.define([
 					visible: false,
 					index: 3
 
-				}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+				}), new ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "DataObjectId",
 					label: "DataObjectId",
@@ -411,7 +433,7 @@ sap.ui.define([
 					groupId: "abc",
 					index: 4
 
-				}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+				}), new ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "AttributeId",
 					label: "AttributeId",
@@ -420,7 +442,7 @@ sap.ui.define([
 					index: 5
 
 				}),
-				new sap.ui.comp.smartfilterbar.ControlConfiguration({
+				new ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "Version",
 					label: "Version",
@@ -468,7 +490,7 @@ sap.ui.define([
 				this._addValueHelpColumn(mEntities.valueHelp.properties[i], oTable, sColumnName);
 			}
 
-			var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
+			var oModel = new ODataModel(basePath);
 			oTable.setModel(oModel);
 			oTable.bindRows(mEntities.valueHelp.collection, null, aFilterParams);
 			oTable.getBinding("rows").attachDataReceived(this._handleRowsDataReceived, this);
@@ -488,13 +510,13 @@ sap.ui.define([
 
 		// Utility function to create columns for the table.
 		_addValueHelpColumn: function (oColumName, oTable, sColumnName) {
-			var oColumn = new sap.ui.table.Column().setLabel(new sap.m.Label({
+			var oColumn = new TableColumn().setLabel(new Label({
 				text: sColumnName
 			}));
 			if (oColumName === this._propertyValue) {
 				oColumn.setSortProperty(sColumnName);
 			}
-			oTable.addColumn(oColumn.setTemplate(new sap.m.Text().bindProperty("text", oColumName)));
+			oTable.addColumn(oColumn.setTemplate(new Text().bindProperty("text", oColumName)));
 		},
 
 		/*
@@ -513,9 +535,9 @@ sap.ui.define([
 		_fetchFilterParams: function (valueHelpInfo) {
 			var that = this;
 			var aSearchParams = [];
-			var aFilterParams = [new sap.ui.model.Filter("AttributeId", sap.ui.model.FilterOperator.EQ, valueHelpInfo.attributeId),
-				new sap.ui.model.Filter("DataObjectId", sap.ui.model.FilterOperator.EQ, valueHelpInfo.dataObjectId),
-				new sap.ui.model.Filter("VocabularyId", sap.ui.model.FilterOperator.EQ, valueHelpInfo.vocabularyId)
+			var aFilterParams = [new Filter("AttributeId",FilterOperator.EQ, valueHelpInfo.attributeId),
+				new Filter("DataObjectId", FilterOperator.EQ, valueHelpInfo.dataObjectId),
+				new Filter("VocabularyId", FilterOperator.EQ, valueHelpInfo.vocabularyId)
 			];
 
 			var aFilters = this.oFilterBar.getFilters();
@@ -525,8 +547,8 @@ sap.ui.define([
 				searchParam = this.oFilterBar.getParameters().custom.search;
 				aSearchParams = this._getSearchFilters(searchParam);
 				aFilters = that._formatFilterParams(aFilters, valueHelpInfo.sourceType);
-				aFilterParams.push(new sap.ui.model.Filter({
-					filters: [new sap.ui.model.Filter(aFilters), new sap.ui.model.Filter(aSearchParams)],
+				aFilterParams.push(new Filter({
+					filters: [new Filter(aFilters), new Filter(aSearchParams)],
 					and: true
 				}));
 			} else if (!jQuery.isEmptyObject(searchParam)) {
@@ -640,9 +662,9 @@ sap.ui.define([
 		_manageParam: function (sPath, operator, value1, value2) {
 			var filterParam = [];
 			if (value1 && value2) {
-				filterParam = new sap.ui.model.Filter({
-					filters: [new sap.ui.model.Filter(sPath, sap.ui.model.FilterOperator.GT, value1),
-						new sap.ui.model.Filter(sPath, sap.ui.model.FilterOperator.LT, value2)
+				filterParam = new Filter({
+					filters: [new Filter(sPath, FilterOperator.GT, value1),
+						new Filter(sPath, FilterOperator.LT, value2)
 					],
 					and: true
 				});
@@ -652,9 +674,9 @@ sap.ui.define([
 
 		// Utility function to form the search filter params.
 		_getSearchFilters: function (searchParam) {
-			return new sap.ui.model.Filter({
-				filters: [new sap.ui.model.Filter(this._propertyValue, sap.ui.model.FilterOperator.EQ, searchParam),
-					new sap.ui.model.Filter(this._propertyDescription, sap.ui.model.FilterOperator.EQ, searchParam)
+			return new Filter({
+				filters: [new Filter(this._propertyValue, FilterOperator.EQ, searchParam),
+					new Filter(this._propertyDescription, FilterOperator.EQ, searchParam)
 				],
 				and: false
 			});
@@ -728,7 +750,7 @@ sap.ui.define([
 		/* ------------------------------- Date and Time related functions -------------------------- */
 		_createDateLink : function(){
 			var that = this;
-			this.dateContent = new sap.m.Link({
+			this.dateContent = new Link({
 				wrapping: true,
 				text: this.oBundle.getText("select_date"),
 				press: function (oEvent) {
@@ -741,7 +763,7 @@ sap.ui.define([
 		
 		_createTimeStampLink : function() {
 			var that = this;
-			this.timeContent = new sap.m.Link({
+			this.timeContent = new Link({
 				wrapping: true,
 				text: this.oBundle.getText("select_date_time"),
 				press: function (oEvent) {
@@ -755,7 +777,7 @@ sap.ui.define([
 		//creates calender control
 		_createDateTimeDialog: function () {
 			var that = this;
-			var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+			var oLocale = Formatting.getLanguageTag();
 			var oLocaleData = LocaleData.getInstance(oLocale);
 			var dateFormatted = oLocaleData.getDatePattern('medium');
 			var timeFormat = oLocaleData.getTimePattern('medium');
@@ -833,12 +855,12 @@ sap.ui.define([
                 date = formatterParsing.parse(sValue);
             }
             if (this._dateBusinessDataType === "D") {
-                formatter = sap.ui.core.format.DateFormat.getDateInstance({
+                formatter = DateFormat.getDateInstance({
                     pattern: "yyyy-MM-dd"
                 });
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {
-                formatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+                formatter = DateFormat.getDateTimeInstance({
                     pattern: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
                     UTC:true
                 });
@@ -852,16 +874,16 @@ sap.ui.define([
 		
 		_getDateTimeFormatterForParsing: function () {
             var formatter;
-            var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+            var oLocale = Formatting.getLanguageTag();
             var oLocaleData = LocaleData.getInstance(oLocale);
             var datePattern = oLocaleData.getDatePattern('medium');
             var timePattern = oLocaleData.getTimePattern('medium');
             if (this.dateContext === "D") {
-                formatter = sap.ui.core.format.DateFormat.getDateInstance({
+                formatter = DateFormat.getDateInstance({
                     pattern: datePattern
                 });
             } else if (this.dateContext === "U") {
-                formatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+                formatter = DateFormat.getDateTimeInstance({
                     pattern: datePattern + " " + timePattern
                 });
             }

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFunctionalOperatorPanel.js

@@ -4,14 +4,18 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/DisplayListItem",
+    "sap/m/Panel",
+    "sap/ui/core/Lib",
     "./AutoSuggestionFunctionalOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionFunctionalOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionFunctionalOperatorPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionFunctionalOperatorPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionFunctionalOperatorPanel", {
             metadata: {
@@ -40,8 +44,8 @@ sap.ui.define([
             },
 
             init: function () {
-				this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-                this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+				this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
+                this.infraUtils = new infraUtils.utilsBaseLib();
                 this.needCreateLayout = true;
                 this.AttributeSegmentSelected = true;
                 this.dataObjectName = "";
@@ -63,11 +67,11 @@ sap.ui.define([
                 var that = this;
                 var vocabularyData = this.getData();
                 // create a Model with this data
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
                 model.setData(vocabularyData);
 
                 // create a list 
-                this.functionalOperatorslist = new sap.m.List({
+                this.functionalOperatorslist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -78,10 +82,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.functionalOperatorslist.bindItems({
                     path: "/functional",
-                    sorter: new sap.ui.model.Sorter("name"),
+                    sorter: new Sorter("name"),
                     rememberSelections: false,
                     mode: ListMode.SingleSelectMaster,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -96,7 +100,7 @@ sap.ui.define([
                 var that = this;
 
                 // add list to the panel
-                var functionalOperatorslistPanel = new sap.m.Panel({
+                var functionalOperatorslistPanel = new Panel({
                     headerText: this.oBundle.getText("functionalOperatorsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionLogicalOperatorPanel.js

@@ -4,14 +4,18 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/DisplayListItem",
+    "sap/m/Panel",
+    "sap/ui/core/Lib",
     "./AutoSuggestionLogicalOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionLogicalOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionLogicalOperatorPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionLogicalOperatorPanel = Control.extend("sap.rules.ui.ast.autoCompleteContent.AutoSuggestionLogicalOperatorPanel", {
         metadata: {
             library: "sap.rules.ui",
@@ -39,8 +43,8 @@ sap.ui.define([
         },
 
         init: function () {
-			this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-            this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+			this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
+            this.infraUtils = new infraUtils.utilsBaseLib();
             this.needCreateLayout = true;
             this.AttributeSegmentSelected = true;
             this.dataObjectName = "";
@@ -62,11 +66,11 @@ sap.ui.define([
             var that = this;
             var vocabularyData = this.getData();
             // create a Model with this data
-            var model = new sap.ui.model.json.JSONModel();
+            var model = new JSONModel();
             model.setData(vocabularyData);
 
             // create a list 
-            this.logicalOperatorslist = new sap.m.List({
+            this.logicalOperatorslist = new List({
                 growing: true,
                 growingScrollToLoad: true,
                 enableBusyIndicator: true,
@@ -77,10 +81,10 @@ sap.ui.define([
             // bind the List items to the data collection
             this.logicalOperatorslist.bindItems({
                 path: "/logical",
-                sorter: new sap.ui.model.Sorter("name"),
+                sorter: new Sorter("name"),
                 rememberSelections: false,
                 mode: ListMode.SingleSelectMaster,
-                template: new sap.m.DisplayListItem({
+                template: new DisplayListItem({
                     label: "{name}",
                     value: "{label}",
                     type: "Active",
@@ -95,7 +99,7 @@ sap.ui.define([
             var that = this;
 
             // add list to the panel
-            var logicalOperatorsListPanel = new sap.m.Panel({
+            var logicalOperatorsListPanel = new Panel({
                 headerText: this.oBundle.getText("logicalOperatorsPanelTitle"),
                 expandable: true,
                 expanded: this.getExpand(),

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionLoopFunctionPanel.js

@@ -4,20 +4,25 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
     "sap/ui/core/LocaleData",
     "sap/rules/ui/Constants",
     "sap/rules/ui/services/AstExpressionLanguage",
     "sap/rules/ui/ast/util/LoopFunctionDialog",
+    "sap/m/Panel",
+    "sap/m/Link",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
     "./AutoSuggestionLoopFunctionPanelRenderer"
 
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils,
-    LocaleData, Constants, AstExpressionLanguage, LoopFunctionDialog, AutoSuggestionLoopFunctionPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils,
+    LocaleData, Constants, AstExpressionLanguage, LoopFunctionDialog, Panel, Link, coreLib, Element, AutoSuggestionLoopFunctionPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionLoopFunctionPanel = Control.extend("sap.rules.ui.ast.autoCompleteContent.AutoSuggestionLoopFunctionPanel", {
         metadata: {
             library: "sap.rules.ui",
@@ -54,9 +59,9 @@ sap.ui.define([
         },
 
         init: function () {
-			this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+			this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
             this.loopFunctionDialog = LoopFunctionDialog.getInstance();
-            this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+            this.infraUtils = new infraUtils.utilsBaseLib();
             this._oAstExpressionLanguage = new AstExpressionLanguage();
             this.needCreateLayout = true;
 
@@ -72,18 +77,18 @@ sap.ui.define([
         },
 
         onAfterRendering: function () {
-            this._oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            this._oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
         },
         initializeVariables: function () {
 
         },
         _createLayout: function () {
             var that = this;
-            var ForEachFunctionsPanel = new sap.m.Panel({
+            var ForEachFunctionsPanel = new Panel({
                 expandable: false,
                 expanded: true,
 				width: "auto",
-                content: [new sap.m.Link({
+                content: [new Link({
                     wrapping: true,
                     text: this.oBundle.getText("loopFunctionPanelTitle"),
                     press: function (oEvent) {

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionMathematicalOperatorPanel.js

@@ -4,14 +4,18 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/DisplayListItem",
+    "sap/m/Panel",
+    "sap/ui/core/Lib",
     "./AutoSuggestionMathematicalOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionMathematicalOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionMathematicalOperatorPanelRenderer) {
     "use strict";
 
+	var ListMode = mobileLibrary.ListMode;
     var autoSuggestionMathematicalOperatorPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionMathematicalOperatorPanel", {
             metadata: {
@@ -40,8 +44,8 @@ sap.ui.define([
             },
 
             init: function () {
-				this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-                this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+				this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
+                this.infraUtils = new infraUtils.utilsBaseLib();
                 this.needCreateLayout = true;
                 this.AttributeSegmentSelected = true;
                 this.dataObjectName = "";
@@ -63,11 +67,11 @@ sap.ui.define([
                 var that = this;
                 var vocabularyData = this.getData();
                 // create a Model with this data
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
                 model.setData(vocabularyData);
 
                 // create a list 
-                this.mathematicalOperatorslist = new sap.m.List({
+                this.mathematicalOperatorslist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -76,10 +80,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.mathematicalOperatorslist.bindItems({
                     path: "/arithmetic",
-                    sorter: new sap.ui.model.Sorter("name"),
+                    sorter: new Sorter("name"),
                     rememberSelections: false,
                     mode: ListMode.SingleSelectMaster,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -94,7 +98,7 @@ sap.ui.define([
                 var that = this;
 
                 // add list to the panel
-                var mathematicalOperatorsListPanel = new sap.m.Panel({
+                var mathematicalOperatorsListPanel = new Panel({
                     headerText: this.oBundle.getText("mathOperatorsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),