@sapui5/sap.rules.ui 1.121.0 → 1.123.0

package/src/sap/rules/ui/DecisionTableSettings.js

@@ -8,7 +8,6 @@
 
 // Provides control sap.rules.ui.
 sap.ui.define([
-        "jquery.sap.global",
         "sap/rules/ui/library",
         "sap/ui/core/Control",
         "sap/ui/layout/form/SimpleForm",
@@ -28,10 +27,40 @@ sap.ui.define([
         "sap/rules/ui/AstExpressionBasic",
         "sap/rules/ui/services/AstExpressionLanguage",
         "sap/rules/ui/ast/util/AstUtil",
+        "sap/ui/core/library",
+        "sap/ui/model/odata/v2/ODataModel",
+        "sap/ui/model/Context",
+        "sap/m/library",
+        /*"sap/ui/layout/form/GridContainerData",*/
+        "sap/m/Column",
+        "sap/ui/layout/ResponsiveFlowLayoutData",
+        "sap/ui/core/IconPool",
+        "sap/m/MessageStrip",
+        "sap/ui/layout/HorizontalLayout",
+        "sap/ui/core/Item",
+        "sap/ui/model/Filter",
+        "sap/ui/model/FilterOperator",
+        "sap/m/SelectDialog",
+        "sap/m/StandardListItem",
+        "sap/ui/model/BindingMode",
+        "sap/ui/model/json/JSONModel",
+        "sap/m/Dialog",
+        "sap/m/ColumnListItem",
+        "sap/ui/core/EventBus",
+        "sap/ui/core/ListItem",
+        "sap/ui/core/Lib",
+        "sap/ui/core/BusyIndicator",
+        "sap/ui/core/Element",
+		"sap/m/MessageToast",
         "./DecisionTableSettingsRenderer"
     ],
-    function (jQuery, library, Control, SimpleForm, Label, Switch, Select, MessageBox, Table, Text, CheckBox, Input, Button,
-        ExpressionAdvanced, VerticalLayout, ExpressionType, Constants, AstExpressionBasic, AstExpressionLanguage, AstUtil, DecisionTableSettingsRenderer) {
+    function (library, Control, SimpleForm, Label, Switch, Select, MessageBox, Table, Text, CheckBox, Input, Button,
+        ExpressionAdvanced, VerticalLayout, ExpressionType, Constants,
+        AstExpressionBasic, AstExpressionLanguage, AstUtil, coreLibrary, ODataModel,
+        Context, mobileLibrary, /*GridContainerData,*/ Column,
+        ResponsiveFlowLayoutData, IconPool, MessageStrip, HorizontalLayout, Item, Filter, FilterOperator, SelectDialog,
+        StandardListItem, BindingMode, JSONModel, Dialog,
+        ColumnListItem, EventBus, ListItem, coreLib, BusyIndicator, Element, MessageToast, DecisionTableSettingsRenderer) {
         "use strict";
 
         /**
@@ -44,7 +73,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.121.0
+         * @version 1.123.0
          *
          * @constructor
          * @private
@@ -55,13 +84,16 @@ sap.ui.define([
             metadata: {
                 library: "sap.rules.ui",
                 properties: {
+                    /**
+                        * @deprecated Since 1.52.8, use the attribute RuleFormat instead.
+                    */
                     cellFormat: {
                         type: "sap.rules.ui.DecisionTableCellFormat",
-                        defaultValue: sap.rules.ui.DecisionTableCellFormat.Both
+                        defaultValue: library.DecisionTableCellFormat.Both
                     },
                     hitPolicies: {
                         type: "sap.rules.ui.RuleHitPolicy[]",
-                        defaultValue: [sap.rules.ui.RuleHitPolicy.FirstMatch, sap.rules.ui.RuleHitPolicy.AllMatch]
+                        defaultValue: [library.RuleHitPolicy.FirstMatch, library.RuleHitPolicy.AllMatch]
                     },
                     modelName: {
                         type: "string",
@@ -73,7 +105,7 @@ sap.ui.define([
                     },
                     decisionTableFormat: {
                         type: "sap.rules.ui.DecisionTableFormat",
-                        defaultValue: sap.rules.ui.DecisionTableFormat.CellFormat
+                        defaultValue: library.DecisionTableFormat.RuleFormat
                     },
                     enableSettingResult: {
 						type: "boolean",
@@ -105,7 +137,7 @@ sap.ui.define([
             renderer: DecisionTableSettingsRenderer
         });
 
-        sap.rules.ui.DecisionTableSettings.prototype._addColumnToJsonModel = function (sequence) {
+        oDecisionTableSettings.prototype._addColumnToJsonModel = function (sequence) {
             var displayModel = this.getModel();
             var modelData = displayModel.getData();
             var aColumns = displayModel.oData.DecisionTable.DecisionTableColumns.results;
@@ -123,7 +155,7 @@ sap.ui.define([
                 Id: this.mNextColumnId,
                 RuleId: modelData.Id,
                 Sequence: sequence + 1,
-                Type: sap.rules.ui.DecisionTableColumn.Condition,
+                Type: library.DecisionTableColumn.Condition,
                 Version: modelData.Version,
                 Status: "C"
             };
@@ -143,9 +175,9 @@ sap.ui.define([
             this._setDisplayModelData(modelData);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._addNodeObject = function (astNode) {
+        oDecisionTableSettings.prototype._addNodeObject = function (astNode) {
             var oNodeArray = [];
-            var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             var oAstUtil = oAstExpressionLanguage._astBunldeInstance.ASTUtil;
 
             var updatedAstNode = [];
@@ -172,17 +204,17 @@ sap.ui.define([
         };
 
 
-        sap.rules.ui.DecisionTableSettings.prototype._bindPredefinedTable = function (sPath, sKey) {
+        oDecisionTableSettings.prototype._bindPredefinedTable = function (sPath, sKey) {
             var that = this;
             this.oPredefinedTable.destroyItems();
             var oModel = this.getModel("oDataModel");
             var oExpressionLanguage;
             if (this.getExpressionLanguage()) {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
             } else {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             }
-            var vocabularyModel = new sap.ui.model.odata.v2.ODataModel(oExpressionLanguage.getModel().sServiceUrl);
+            var vocabularyModel = new ODataModel(oExpressionLanguage.getModel().sServiceUrl);
             var bAddAttributeToPredefTable = true;
             var sBindingPath;
             var oHeaderKey;
@@ -200,7 +232,7 @@ sap.ui.define([
                                 Version: oAttributes[i].Version
                             };
                             sBindingPath = oModel.createKey(sKey, oHeaderKey);
-                            oContext = new sap.ui.model.Context(oModel, sBindingPath);
+                            oContext = new Context(oModel, sBindingPath);
                         } else if (sKey === "/ExpandedAttributes") {
                             oHeaderKey = {
                                 DataObjectId: oAttributes[i].DataObjectId,
@@ -210,7 +242,7 @@ sap.ui.define([
                                 AttributeId: oAttributes[i].AttributeId
                             };
                             sBindingPath = vocabularyModel.createKey(sKey, oHeaderKey);
-                            oContext = new sap.ui.model.Context(vocabularyModel, sBindingPath);
+                            oContext = new Context(vocabularyModel, sBindingPath);
                             oContext.DataObjectAttributeinfo = oAttributes[i];
                         }
                         if (that.getExpressionLanguage()) {
@@ -289,7 +321,7 @@ sap.ui.define([
                             MessageBox.error(
                                 oError.responseText, {
                                 title: that.oBundle.getText("ERROR_DIALOG"),
-                                actions: [sap.m.MessageBox.Action.OK]
+                                actions: [MessageBox.Action.OK]
     
                             });
                         }
@@ -299,7 +331,7 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getAttributeSequenceArray = function () {
+        oDecisionTableSettings.prototype._getAttributeSequenceArray = function () {
             var attributeSequenceArray = this.getModel("settingsModel").attributeSequenceArray;
             if (!this.getModel("settingsModel").attributeSequenceArray) {
                 var settingsModel = this.getModel("settingsModel");
@@ -316,7 +348,7 @@ sap.ui.define([
             return this.getModel("settingsModel").attributeSequenceArray;
         };
     
-        sap.rules.ui.DecisionTableSettings.prototype._getOrderedAttributesArray = function (dataAttrList) {
+        oDecisionTableSettings.prototype._getOrderedAttributesArray = function (dataAttrList) {
             var attributeSequenceArray = this.getModel("settingsModel").attributeSequenceArray;
             if (!attributeSequenceArray) {
                 attributeSequenceArray = this._getAttributeSequenceArray();
@@ -334,7 +366,7 @@ sap.ui.define([
             return orderedAttributesArray;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._calcNextColumnId = function () {
+        oDecisionTableSettings.prototype._calcNextColumnId = function () {
             var displayModel = this.getModel();
             var modelData = displayModel.getData();
             var aColumns = modelData.DecisionTable ? modelData.DecisionTable.DecisionTableColumns.results : [];
@@ -351,7 +383,7 @@ sap.ui.define([
             return nextId;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._callRefreshResultsFunctionImport = function () {
+        oDecisionTableSettings.prototype._callRefreshResultsFunctionImport = function () {
             var that = this;
             var odataModel = this.getModel("oDataModel");
             var modelData = this.getModel().getData();
@@ -369,7 +401,7 @@ sap.ui.define([
             };
 
             var submitError = function (e) {
-                sap.m.MessageToast.show(e);
+                MessageToast.show(e);
             };
 
             var callRefreshFunctionImport = function (response) {
@@ -393,12 +425,12 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._changeColumnInputMode = function (oContext, oEvent) {
+        oDecisionTableSettings.prototype._changeColumnInputMode = function (oContext, oEvent) {
             var oSelect = oEvent.getSource();
             this._openWarningDialog(oSelect, oContext);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._changeColumnStatusToUpdate = function (oContext) {
+        oDecisionTableSettings.prototype._changeColumnStatusToUpdate = function (oContext) {
             var model = oContext.getModel();
             //Update column status to "update". But only in case it's not a new column
             var status = oContext.getProperty("Status");
@@ -407,7 +439,7 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._changeInputMode = function (bShouldChangeMode, oSelect, oContext) {
+        oDecisionTableSettings.prototype._changeInputMode = function (bShouldChangeMode, oSelect, oContext) {
             if (!bShouldChangeMode) {
                 oSelect.setSelectedKey(this.oBundle.getText("valueOnly"));
                 return;
@@ -417,7 +449,7 @@ sap.ui.define([
             this._changeColumnStatusToUpdate(oContext);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._createDefaultColumn = function () {
+        oDecisionTableSettings.prototype._createDefaultColumn = function () {
             var _displayModel = this.getModel();
             var modelData = _displayModel.getData();
 	    
@@ -440,42 +472,42 @@ sap.ui.define([
                 },
                 Id: 1,
                 Sequence: 1,
-                Type: sap.rules.ui.DecisionTableColumn.Condition,
+                Type: library.DecisionTableColumn.Condition,
                 Status: "C"
             });
 		}
         };
 
         //Condition table
-        sap.rules.ui.DecisionTableSettings.prototype._createTable = function () {
+        oDecisionTableSettings.prototype._createTable = function () {
             this.conditionsTable = new Table({
-                backgroundDesign: sap.m.BackgroundDesign.Solid,
-                showSeparators: sap.m.ListSeparators.None,
-                layoutData: new sap.ui.layout.form.GridContainerData({
+                backgroundDesign: mobileLibrary.BackgroundDesign.Solid,
+                showSeparators: mobileLibrary.ListSeparators.None,
+                /*layoutData: new GridContainerData({
                     halfGrid: false
-                }),
+                }),TODO:Change by Harsh*/
                 columns: [
-					new sap.m.Column({
+					new Column({
 						width: "50%",
-						header: new sap.m.Label({
+						header: new Label({
 							text: this.oBundle.getText("colOfDecisionTable"),
-							design: sap.m.LabelDesign.Bold
+							design: mobileLibrary.LabelDesign.Bold
 						}).setTooltip(this.oBundle.getText("colOfDecisionTable"))
 					}),
 
-					new sap.m.Column({
+					new Column({
 						width: "25%",
-						header: new sap.m.Label({
+						header: new Label({
 							text: this.oBundle.getText("label"),
-							design: sap.m.LabelDesign.Bold
+							design: mobileLibrary.LabelDesign.Bold
 						}).setTooltip(this.oBundle.getText("label"))
 					}),
 
-					new sap.m.Column({
+					new Column({
 						width: "25%",
-						header: new sap.m.Label({
+						header: new Label({
 							text: this.oBundle.getText("fixedOperator"),
-							design: sap.m.LabelDesign.Bold
+							design: mobileLibrary.LabelDesign.Bold
 						}).setTooltip(this.oBundle.getText("fixedOperator"))
 					}),
 
@@ -488,7 +520,7 @@ sap.ui.define([
                         }).setTooltip(this.oBundle.getText("inputMode"))
                     }),*/ // input mode choice will be removed from decision table settings
 
-                    new sap.m.Column({
+                    new Column({
                         width: "20%"
                     })
                 ]
@@ -505,7 +537,7 @@ sap.ui.define([
             return this.conditionsTable;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._createRefreshButton = function () {
+        oDecisionTableSettings.prototype._createRefreshButton = function () {
             var _calcStatisticsMessage = function () { //returns null if no changes => we'll disable refresh button
                 var results = this.getModel("settingsModel").oData.results.resultsEnumration;
                 var currentResultID = this.getModel().oData.ResultDataObjectId;
@@ -552,9 +584,9 @@ sap.ui.define([
                 MessageBox.warning(
                     dialogStatisticsMessage, {
                         title: this.oBundle.getText("refeshResultWarningTitle"),
-                        actions: [sap.m.MessageBox.Action.OK, sap.m.MessageBox.Action.CANCEL],
+                        actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
                         onClose: function (oAction) {
-                            if (oAction === sap.m.MessageBox.Action.OK) {
+                            if (oAction === MessageBox.Action.OK) {
                                 _handleRefreshConfirmed();
                             }
                         }
@@ -562,12 +594,12 @@ sap.ui.define([
             }.bind(this);
 
             var oRefreshButton = new Button({
-                layoutData: new sap.ui.layout.ResponsiveFlowLayoutData({
+                layoutData: new ResponsiveFlowLayoutData({
                     weight: 1
                 }),
-                icon: sap.ui.core.IconPool.getIconURI("synchronize"),
+                icon: IconPool.getIconURI("synchronize"),
                 width: "3rem",
-                type: sap.m.ButtonType.Transparent,
+                type: mobileLibrary.ButtonType.Transparent,
                 text: "",
                 press: _handleRefreshPress,
                 visible: true,
@@ -579,14 +611,14 @@ sap.ui.define([
         };
 
         //creates a message strip
-        sap.rules.ui.DecisionTableSettings.prototype._createInfoMessageStrip = function (textstr, elementID) {
-            var omsgStrip = sap.ui.getCore().byId(elementID);
+        oDecisionTableSettings.prototype._createInfoMessageStrip = function (textstr, elementID) {
+            var omsgStrip = Element.getElementById(elementID);
             if (!omsgStrip) {
-                omsgStrip = new sap.m.MessageStrip({
+                omsgStrip = new MessageStrip({
                     visible: true, // boolean
                     id: elementID,
                     text: textstr, // string
-                    type: sap.ui.core.MessageType.Information, // sap.ui.core.MessageType
+                    type: coreLibrary.MessageType.Information, // sap.ui.core.MessageType
                     showIcon: true, // boolean
                     showCloseButton: true
                 }).addStyleClass("sapRULTDecisionTableSettingsMessageStrip");
@@ -594,7 +626,7 @@ sap.ui.define([
             return omsgStrip;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._createLayout = function () {
+        oDecisionTableSettings.prototype._createLayout = function () {
             var oForm = new SimpleForm({
                 editable: true,
                 layout: "ResponsiveGridLayout",
@@ -612,7 +644,7 @@ sap.ui.define([
                         enabled: "{settingsModel>/hitPolicy/enabled}",
                         items: {
                             path: "settingsModel>/hitPolicy/hitPolicyEnumration",
-                            template: new sap.ui.core.Item({
+                            template: new Item({
                                 key: "{settingsModel>key}",
                                 text: "{settingsModel>text}"
                             })
@@ -631,7 +663,7 @@ sap.ui.define([
                     }),
 
                     new Label(),
-                    new sap.ui.layout.HorizontalLayout({}),
+                    new HorizontalLayout({}),
 
                     new Label({
                         text: this.oBundle.getText("conditionsTableLabelText")
@@ -639,12 +671,12 @@ sap.ui.define([
                     this._createTable(),
 
                     new Label(),
-                    new sap.ui.layout.HorizontalLayout({}),
+                    new HorizontalLayout({}),
 
                     new Label({
                         text: this.oBundle.getText("output")
                     }).setTooltip(this.oBundle.getText("output")),
-                    new sap.ui.layout.HorizontalLayout({
+                    new HorizontalLayout({
                         content: [
                             this._createResultInput(),
                             this._createRefreshButton()
@@ -660,10 +692,10 @@ sap.ui.define([
         };
 
         //creates layout for predefined values
-        sap.rules.ui.DecisionTableSettings.prototype._createPredefinedResultsLayout = function () {
+        oDecisionTableSettings.prototype._createPredefinedResultsLayout = function () {
             //if ABAP backend is used, we do not show the predefined results table
             if (this.needToRenderPredefinedResultsTable) {
-                var verticalLayout = new sap.ui.layout.VerticalLayout({
+                var verticalLayout = new VerticalLayout({
                     content: [
                         this._createInfoMessageStrip(this.oBundle.getText("PredefinedMessageStripHiddenAccessInfoText"), "id_HiddenAccessMessageStrip"),
                         this._createInfoMessageStrip(this.oBundle.getText("PredefinedMessageStripEditableAccessInfoText"),
@@ -678,39 +710,39 @@ sap.ui.define([
         };
 
         //creates table for predefined values with access options
-        sap.rules.ui.DecisionTableSettings.prototype._createPredefinedResultsTable = function () {
+        oDecisionTableSettings.prototype._createPredefinedResultsTable = function () {
             //if the table does not exist, create the table
             if (!this.oPredefinedTable) {
-                this.oPredefinedTable = new sap.m.Table("idPredefinedTable", {
-                    backgroundDesign: sap.m.BackgroundDesign.Solid,
-                    showSeparators: sap.m.ListSeparators.All,
-                    swipeDirection: sap.m.SwipeDirection.Both,
-                    layoutData: new sap.ui.layout.form.GridContainerData({
+                this.oPredefinedTable = new Table("idPredefinedTable", {
+                    backgroundDesign: mobileLibrary.BackgroundDesign.Solid,
+                    showSeparators: mobileLibrary.ListSeparators.All,
+                    swipeDirection: mobileLibrary.SwipeDirection.Both,
+                    /*layoutData: new GridContainerData({
                         halfGrid: false
-                    }),
-                    columns: [new sap.m.Column({
+                    }),TODO:Change by Harsh*/
+                    columns: [new Column({
                         width: "45%",
-                        header: new sap.m.Label({
+                        header: new Label({
                             text: this.oBundle.getText("PredefinedResultColumnHeaderText"),
-                            design: sap.m.LabelDesign.Bold
+                            design: mobileLibrary.LabelDesign.Bold
                         })
-                    }), new sap.m.Column({
+                    }), new Column({
                         width: "30%",
-                        header: new sap.m.Label({
+                        header: new Label({
                             text: this.oBundle.getText("PredefinedAccessColumnHeaderText"),
-                            design: sap.m.LabelDesign.Bold
+                            design: mobileLibrary.LabelDesign.Bold
                         })
-                    }), new sap.m.Column({
+                    }), new Column({
                         width: "45%",
-                        header: new sap.m.Label({
+                        header: new Label({
                             text: this.oBundle.getText("PredefinedValuesColumnHeaderText"),
-                            design: sap.m.LabelDesign.Bold
+                            design: mobileLibrary.LabelDesign.Bold
                         })
-                    }), new sap.m.Column({
+                    }), new Column({
                         width: "20%",
-                        header: new sap.m.Label({
+                        header: new Label({
                             text: this.oBundle.getText("ReorderResultDOAttributes"),
-                            design: sap.m.LabelDesign.Bold
+                            design: mobileLibrary.LabelDesign.Bold
                         })
                     })]
                 });
@@ -734,7 +766,7 @@ sap.ui.define([
             return null;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._createResultInput = function () {
+        oDecisionTableSettings.prototype._createResultInput = function () {
             var model = this.getModel();
             var resultDataObjectId = model.oData.ResultDataObjectId;
             var settingsModel = this.getModel("settingsModel");
@@ -749,7 +781,7 @@ sap.ui.define([
             this.oResultInput = new Input({
                 width: "220px",
                 //enabled: "{settingsModel>/results/enabled}",
-                valueHelpOnly: true,
+                //valueHelpOnly: true,
                 showValueHelp: true,
                 value: resultText,
 				tooltip: this.oBundle.getText("chooseResultTooltip"),
@@ -763,21 +795,21 @@ sap.ui.define([
 
                         var _handleSearch = function _handleSearch(evt) {
                             var sValue = evt.getParameter("value");
-                            var oFilter = new sap.ui.model.Filter(
+                            var oFilter = new Filter(
                                 "name",
-                                sap.ui.model.FilterOperator.Contains, sValue
+                                FilterOperator.Contains, sValue
                             );
                             evt.getSource().getBinding("items").filter([oFilter]);
                         };
 
-                        this.oSelectDialog = new sap.m.SelectDialog({
+                        this.oSelectDialog = new SelectDialog({
                             title: this.oBundle.getText("chooseResultDialogTitle"),
                             styleClass: "sapUiPopupWithPadding",
                             rememberSelections: true,
                             items: {
                                 path: "settingsModel>/results/resultsEnumration",
                                 //sorter: { path: 'name' },
-                                template: new sap.m.StandardListItem({
+                                template: new StandardListItem({
                                     title: "{settingsModel>label}",
                                     description: "{settingsModel>description}"
                                 })
@@ -841,9 +873,9 @@ sap.ui.define([
                         MessageBox.warning(
                             this.oBundle.getText("changeResultWarningMsg"), {
                                 title: this.oBundle.getText("changeResultWarningTitle"),
-                                actions: [sap.m.MessageBox.Action.OK, sap.m.MessageBox.Action.CANCEL],
+                                actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
                                 onClose: function (oAction) {
-                                    if (oAction === sap.m.MessageBox.Action.OK) {
+                                    if (oAction === MessageBox.Action.OK) {
                                         _handleValueHelpOpen();
                                     }
                                 }
@@ -867,7 +899,7 @@ sap.ui.define([
             if(enableSettingResult) {
             	this.oResultInput.bindAggregation("suggestionItems",{
             		path: "settingsModel>/results/resultsEnumration",
-            		template: new sap.ui.core.Item({
+            		template: new Item({
                         key: "{settingsModel>id}",
                         text: "{settingsModel>label}"
                     	})
@@ -881,8 +913,8 @@ sap.ui.define([
             return this.oResultInput;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._destroyElement = function (element) {
-            var elementToDestroy = sap.ui.getCore().byId(element);
+        oDecisionTableSettings.prototype._destroyElement = function (element) {
+            var elementToDestroy = Element.getElementById(element);
             if (elementToDestroy) {
                 if (element === "idPredefinedTable") {
                     elementToDestroy.destroyColumns();
@@ -893,7 +925,7 @@ sap.ui.define([
 
         /*function to find if an attribute is deleted and then remove the attribute from JSON and OdatModel
         we will also have to ensure that the sequence is maintained after deletion*/
-        sap.rules.ui.DecisionTableSettings.prototype._findAndRemoveDeletedAttributeFromOModel = function () {
+        oDecisionTableSettings.prototype._findAndRemoveDeletedAttributeFromOModel = function () {
             var _oSettingsModel = this.getModel("settingsModel");
             var jsonArrayWithExistingValues = _oSettingsModel.oData.predefinedResults;
 
@@ -928,7 +960,7 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._findPropertyAccessMode = function () {
+        oDecisionTableSettings.prototype._findPropertyAccessMode = function () {
             var dtPropertyList = this.oModels.oDataModel.oServiceData.oMetadata.mEntityTypes["/DecisionTableColumnResults"].property;
             if (dtPropertyList) {
                 for (var nPropertyPos = 0; nPropertyPos < dtPropertyList.length; nPropertyPos++) {
@@ -941,9 +973,9 @@ sap.ui.define([
         };
 
         //AST expression basic control for condition table
-        sap.rules.ui.DecisionTableSettings.prototype._getASTExpressionBasicForCondition = function (oContext) {
+        oDecisionTableSettings.prototype._getASTExpressionBasicForCondition = function (oContext) {
             var that = this;
-            var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             var sExpression = oContext.getProperty("Condition/Expression");
             var displayExpression = this._getExpressionFromAstNodes(oContext);
 
@@ -1006,7 +1038,7 @@ sap.ui.define([
         };
 
         //AST expression basic control for predefined table
-        sap.rules.ui.DecisionTableSettings.prototype._getASTExpressionBasicForPredefined = function (oContext, expressionID, expression,
+        oDecisionTableSettings.prototype._getASTExpressionBasicForPredefined = function (oContext, expressionID, expression,
             businessDataType, astNodes) {
             var that = this;
             var sAttributeId = "";
@@ -1026,8 +1058,8 @@ sap.ui.define([
             if(expression && expression.relString) {
                 expression.relString = expression.relString.replace(/\\/g,"\\\\").replace(/{/g, "\\{").replace(/}/g, "\\}");
             }
-            var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
-            var sbusinessDataType = businessDataType ? businessDataType : sap.rules.ui.ExpressionType.NonComparison;
+            var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
+            var sbusinessDataType = businessDataType ? businessDataType : library.ExpressionType.NonComparison;
             var astExpressionBasic = new AstExpressionBasic({
                 id: expressionID,
                 astExpressionLanguage: oAstExpressionLanguage,
@@ -1058,7 +1090,7 @@ sap.ui.define([
         };
         
         //Parses the nodes generated from astEL to form understandable by backend
-        sap.rules.ui.DecisionTableSettings.prototype._getASTNodes = function (astNodes, oContext) {
+        oDecisionTableSettings.prototype._getASTNodes = function (astNodes, oContext) {
             var modifiedNodes = []
             for (var node in astNodes) {
                 var updatedAstNode = {};
@@ -1094,7 +1126,7 @@ sap.ui.define([
             return modifiedNodes;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getBindModelName = function () {
+        oDecisionTableSettings.prototype._getBindModelName = function () {
             var path = "";
             var modelName = this.getModelName();
             if (modelName) {
@@ -1103,21 +1135,21 @@ sap.ui.define([
             return path;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getCellFormat = function () {
+        oDecisionTableSettings.prototype._getCellFormat = function () {
             //Handling the valueOnly when the DecisionTableFormat is set to RuleFormat
-            var sCellFormat = this.getProperty("cellFormat");
+            //var sCellFormat = this.getProperty("cellFormat");
             var sdecisionTableFormat = this.getProperty("decisionTableFormat");
-            if (sdecisionTableFormat === sap.rules.ui.DecisionTableFormat.RuleFormat) {
-                return (this.getModel().getData().RuleFormat === sap.rules.ui.RuleFormat.Basic) ? true : false;
+            if (sdecisionTableFormat === library.DecisionTableFormat.RuleFormat) {
+                return (this.getModel().getData().RuleFormat === library.RuleFormat.Basic) ? true : false;
             }
-            return (sCellFormat !== sap.rules.ui.DecisionTableCellFormat.Text) ? true : false;
+            //return (sCellFormat !== library.DecisionTableCellFormat.Text) ? true : false;
         };
 
         //structure definition for the visibility of columns. This will be a part of the settings model
-        sap.rules.ui.DecisionTableSettings.prototype._getCellFormatAcccessOptions = function () {
-            var sCellFormat = this.getProperty("cellFormat");
+        oDecisionTableSettings.prototype._getCellFormatAcccessOptions = function () {
+            //var sCellFormat = this.getProperty("cellFormat");
             var oCellFormatData = {
-                CellFormat: sCellFormat,
+                //CellFormat: sCellFormat,
                 cellFormatEnumration: [{
                     key: Constants.KEY_EDITABLE,
                     value: this.editableModeText
@@ -1129,7 +1161,7 @@ sap.ui.define([
             return oCellFormatData;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getCellFormatData = function () {
+        /*oDecisionTableSettings.prototype._getCellFormatData = function () {
             var sCellFormat = this.getProperty("cellFormat");
             var oCellFormatData = {
                 CellFormat: sCellFormat,
@@ -1142,9 +1174,9 @@ sap.ui.define([
                 }]
             };
             return oCellFormatData;
-        };
+        };*/
 
-        sap.rules.ui.DecisionTableSettings.prototype._getColumnInputMode = function (bValueOnly) {
+        oDecisionTableSettings.prototype._getColumnInputMode = function (bValueOnly) {
             if (!bValueOnly) {
                 return this.oBundle.getText("advancedMode");
             }
@@ -1152,14 +1184,14 @@ sap.ui.define([
         };
 
         //REL control for condition table
-        sap.rules.ui.DecisionTableSettings.prototype._getExpressionAdvanceColumn = function (oBindingContext) {
-            var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+        oDecisionTableSettings.prototype._getExpressionAdvanceColumn = function (oBindingContext) {
+            var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
 
             return new ExpressionAdvanced({
                 expressionLanguage: oExpressionLanguage,
                 placeholder: this.oBundle.getText("expressionPlaceHolder"),
                 validateOnLoad: true,
-                type: sap.rules.ui.ExpressionType.NonComparison,
+                type: library.ExpressionType.NonComparison,
                 value: {
                     path: "Condition/Expression",
                     events: {
@@ -1198,7 +1230,7 @@ sap.ui.define([
             });
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getExpressionFieldForCondition = function (oContext) {
+        oDecisionTableSettings.prototype._getExpressionFieldForCondition = function (oContext) {
             var oControl;
             //Check expressionlanguage type
             if (this.getExpressionLanguage()) {
@@ -1209,7 +1241,7 @@ sap.ui.define([
             return oControl;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getExpressionFieldForPredefined = function (oContext, expressionID, expression,
+        oDecisionTableSettings.prototype._getExpressionFieldForPredefined = function (oContext, expressionID, expression,
             businessDataType, astNodes) {
             var oControl;
             //Check expressionlanguage type
@@ -1221,9 +1253,9 @@ sap.ui.define([
             return oControl;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getExpressionFromAstNodes = function (oContext, astNodes) {
+        oDecisionTableSettings.prototype._getExpressionFromAstNodes = function (oContext, astNodes) {
             var that = this;
-            var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             var termsProvider = oAstExpressionLanguage._astBunldeInstance.TermsProvider.TermsProvider;
             var displayExpression = "";
             var displayTermExpression = "";
@@ -1256,7 +1288,7 @@ sap.ui.define([
             return displayExpression;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getFixedOperatorDataForExpression = function (sExpression, bValueOnly, astControl) {
+        oDecisionTableSettings.prototype._getFixedOperatorDataForExpression = function (sExpression, bValueOnly, astControl) {
             var fixOperatorEnabled = sExpression ? true : false;
             var fixedOperatorData = {
                 fixOperatorEnumration: [{
@@ -1267,26 +1299,26 @@ sap.ui.define([
             };
             var oSuggestions = [];
             if (this.getExpressionLanguage() && fixOperatorEnabled) {
-                var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+                var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
                 var oFilter;
                 if (!bValueOnly) {
                     oFilter = [{
-                        tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-                        tokenCategory: sap.rules.ui.ExpressionCategory.comparisonOp
+                        tokenType: library.ExpressionTokenType.reservedWord,
+                        tokenCategory: library.ExpressionCategory.comparisonOp
                     }, {
-                        tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-                        tokenCategory: sap.rules.ui.ExpressionCategory.comparisonBetweenOp
+                        tokenType: library.ExpressionTokenType.reservedWord,
+                        tokenCategory: library.ExpressionCategory.comparisonBetweenOp
                     }, {
-                        tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-                        tokenCategory: sap.rules.ui.ExpressionCategory.comparisonExistOp
+                        tokenType: library.ExpressionTokenType.reservedWord,
+                        tokenCategory: library.ExpressionCategory.comparisonExistOp
                     }];
                 } else {
                     oFilter = [{
-                        tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-                        tokenCategory: sap.rules.ui.ExpressionCategory.comparisonOp
+                        tokenType: library.ExpressionTokenType.reservedWord,
+                        tokenCategory: library.ExpressionCategory.comparisonOp
                     }, {
-                        tokenType: sap.rules.ui.ExpressionTokenType.reservedWord,
-                        tokenCategory: sap.rules.ui.ExpressionCategory.comparisonBetweenOp
+                        tokenType: library.ExpressionTokenType.reservedWord,
+                        tokenCategory: library.ExpressionCategory.comparisonBetweenOp
                     }];
                 }
 
@@ -1359,7 +1391,7 @@ sap.ui.define([
             return fixedOperatorData;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getHitPoliciesData = function () {
+        oDecisionTableSettings.prototype._getHitPoliciesData = function () {
             var hitPolicy = this.getProperty("hitPolicies");
             var length = hitPolicy.length;
             var oHitPolicyData = {
@@ -1375,26 +1407,26 @@ sap.ui.define([
             return oHitPolicyData;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getInputModeEnabled = function (sCellFormat, bValueOnly) {
-            if (sCellFormat !== sap.rules.ui.DecisionTableCellFormat.Both || bValueOnly === false) {
+        /*oDecisionTableSettings.prototype._getInputModeEnabled = function (sCellFormat, bValueOnly) {
+            if (sCellFormat !== library.DecisionTableCellFormat.Both || bValueOnly === false) {
                 return false;
             }
             return true;
-        };
+        };*/
 
         //Rebinding predefined table when result is change or refresh event
-        sap.rules.ui.DecisionTableSettings.prototype._getLatestResultDataObjects = function (newResultDataObjectId) {
+        oDecisionTableSettings.prototype._getLatestResultDataObjects = function (newResultDataObjectId) {
             var that = this;
             var oModel = that.getModel().getData();
             var sProjectId = oModel.ProjectId;
             var settingsModel = that.getModel("settingsModel");
             var oExpressionLanguage;
             if (this.getExpressionLanguage()) {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
             } else {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             }
-            var vocabularyModel = new sap.ui.model.odata.v2.ODataModel(oExpressionLanguage.getModel().sServiceUrl);
+            var vocabularyModel = new ODataModel(oExpressionLanguage.getModel().sServiceUrl);
             var sPath = "/DataObjects(VocabularyId='" + sProjectId + "',Id='" + newResultDataObjectId + "')";
             //Resetting the path before reusing the factory function to load predefined results table
             // Error mentioned in the CSN : 1880262342
@@ -1405,7 +1437,7 @@ sap.ui.define([
             return that.oPredefinedTable;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getMessageByResultUpdates = function (resultUpdates) {
+        oDecisionTableSettings.prototype._getMessageByResultUpdates = function (resultUpdates) {
             var messageRefreshWillDelete = this.oBundle.getText("refreshingWillDeleteMsg");
             var messageAreyouSure = this.oBundle.getText("refreshAreyouSureMsg");
             var countChanges = resultUpdates.addedColumns.length + resultUpdates.changedColumns.length + resultUpdates.removedColumns.length;
@@ -1430,7 +1462,7 @@ sap.ui.define([
         };
 
         //REL control for predefined
-        sap.rules.ui.DecisionTableSettings.prototype._getPredefinedExpressionAdvanced = function (oContext, expressionID, expression,
+        oDecisionTableSettings.prototype._getPredefinedExpressionAdvanced = function (oContext, expressionID, expression,
             businessDataType) {
             var that = this;
             var sAttributeId = "";
@@ -1438,8 +1470,8 @@ sap.ui.define([
             if (oResultData && !sAttributeId) {
                 sAttributeId = oResultData.DataObjectAttributeId ? oResultData.DataObjectAttributeId : oResultData.Id;
             }
-            var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
-            var sbusinessDataType = businessDataType ? businessDataType : sap.rules.ui.ExpressionType.NonComparison;
+            var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
+            var sbusinessDataType = businessDataType ? businessDataType : library.ExpressionType.NonComparison;
 
             return new ExpressionAdvanced({
                 expressionLanguage: oExpressionLanguage,
@@ -1458,12 +1490,12 @@ sap.ui.define([
             });
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getResultsData = function () {
+        oDecisionTableSettings.prototype._getResultsData = function () {
             var oExpressionLanguage;
             if (this.getAstExpressionLanguage()) {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             } else {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
             }
             var oResultsEnumration = [{
                 id: Constants.NO_RESULT,
@@ -1477,7 +1509,7 @@ sap.ui.define([
             return oResultsData;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._getResultsUpdates = function (resultColumnsOld, resultColumnsNew) {
+        oDecisionTableSettings.prototype._getResultsUpdates = function (resultColumnsOld, resultColumnsNew) {
             var addedColumns = [],
                 removedColumns = [],
                 changedColumns = [];
@@ -1524,7 +1556,7 @@ sap.ui.define([
         };
 
         //Read the existing visibility status from Odata
-        sap.rules.ui.DecisionTableSettings.prototype._getSelectedVisibilityStatus = function (sAccess) {
+        oDecisionTableSettings.prototype._getSelectedVisibilityStatus = function (sAccess) {
             if (sAccess === this.hiddenModeText) {
                 return Constants.KEY_HIDDEN;
             } else {
@@ -1532,12 +1564,12 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._initServiceModel = function () {
+        oDecisionTableSettings.prototype._initServiceModel = function () {
             var odataModel = this.getModel("oDataModel");
             var sServiceURL = odataModel.sServiceUrl;
-            var oModel = new sap.ui.model.odata.v2.ODataModel({
+            var oModel = new ODataModel({
                 serviceUrl: sServiceURL,
-                defaultBindingMode: sap.ui.model.BindingMode.TwoWay
+                defaultBindingMode: BindingMode.TwoWay
             });
             var model = oModel.getMetaModel();
             if (model && model.oMetadata && model.oMetadata.bLoaded) {
@@ -1549,12 +1581,12 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._initSettingsModel = function () {
+        oDecisionTableSettings.prototype._initSettingsModel = function () {
             var initialData = {};
             initialData.hitPolicy = this._getHitPoliciesData();
             initialData.tableData = {};
             initialData.removeRowEnabled = false;
-            initialData.cellFormat = this._getCellFormatData();
+            //initialData.cellFormat = this._getCellFormatData();
             initialData.accessOptions = this._getCellFormatAcccessOptions();
             initialData.updateAllRows = false;
             initialData.predefinedResults = [];
@@ -1562,13 +1594,13 @@ sap.ui.define([
             initialData.resultAttributeChanged = false;
             initialData.refreshButtonClicked = false;
             initialData.results = this._getResultsData();
-            this._internalModel = new sap.ui.model.json.JSONModel(initialData);
+            this._internalModel = new JSONModel(initialData);
             this.setModel(this._internalModel, "settingsModel");
             this._initServiceModel();
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._openWarningDialog = function (oSelect, oContext) {
-            var dialog = new sap.m.Dialog({
+        oDecisionTableSettings.prototype._openWarningDialog = function (oSelect, oContext) {
+            var dialog = new Dialog({
                 title: this.oBundle.getText("changeInputModeDialogTitle"),
                 width: "70%",
                 type: 'Message',
@@ -1602,7 +1634,7 @@ sap.ui.define([
         };
 
         // Factory function to display and control access options column
-        sap.rules.ui.DecisionTableSettings.prototype._predefinedFactory = function (sId, oContext) {
+        oDecisionTableSettings.prototype._predefinedFactory = function (sId, oContext) {
             //basic display of predefinedResults reads from oContext
             //colid is used only element. On refresh we wont get the Sequence, hence we use the name here
             var expressionID = "exp" + sId;
@@ -1641,25 +1673,25 @@ sap.ui.define([
 
             var sAccessKey = this._getSelectedVisibilityStatus(sSelectedKey);
 
-            return new sap.m.ColumnListItem({
+            return new ColumnListItem({
                 visible: true,
-                vAlign: sap.ui.core.VerticalAlign.Middle,
+                vAlign: coreLibrary.VerticalAlign.Middle,
                 cells: [
-                    new sap.m.Label({
+                    new Label({
                         visible: true,
-                        design: sap.m.LabelDesign.Standard,
+                        design: mobileLibrary.LabelDesign.Standard,
                         text: displayText,
                         labelFor: expressionID,
-                        textAlign: sap.ui.core.TextAlign.Begin,
-                        textDirection: sap.ui.core.TextDirection.Inherit
+                        textAlign: coreLibrary.TextAlign.Begin,
+                        textDirection: coreLibrary.TextDirection.Inherit
                     }),
 
-                    new sap.m.Select({
+                    new Select({
                         width: "65%",
                         id: "select" + sId,
                         items: {
                             path: "settingsModel>/accessOptions/cellFormatEnumration",
-                            template: new sap.ui.core.Item({
+                            template: new Item({
                                 key: "{settingsModel>key}",
                                 text: "{settingsModel>value}"
                             })
@@ -1673,18 +1705,18 @@ sap.ui.define([
 
                     this._getExpressionFieldForPredefined(oContext, expressionID, expression, businessDataType, astNodes),
 
-                    new sap.ui.layout.HorizontalLayout({
+                    new HorizontalLayout({
                         content: [
-                            new sap.m.Button({
-                                type: sap.m.ButtonType.Transparent,
+                            new Button({
+                                type: mobileLibrary.ButtonType.Transparent,
                                 icon: "sap-icon://arrow-top",
                                 visible: true,
                                 press: function (oEvent) {
                                     this._moveAttributePosition(oContext, Constants.UP);
                                 }.bind(this)
                             }).setTooltip(this.oBundle.getText("MoveResultAttributeUP")),
-                            new sap.m.Button({
-                                type: sap.m.ButtonType.Transparent,
+                            new Button({
+                                type: mobileLibrary.ButtonType.Transparent,
                                 icon: "sap-icon://arrow-bottom",
                                 press: function (oEvent) {
                                     this._moveAttributePosition(oContext, Constants.DOWN);
@@ -1696,7 +1728,7 @@ sap.ui.define([
             });
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._moveAttributePosition = function (oContext, sDirection) {
+        oDecisionTableSettings.prototype._moveAttributePosition = function (oContext, sDirection) {
             var settingsModel = this.getModel("settingsModel");
             var settingsData = settingsModel.getData();
             var oModel = this.getModel().getData();
@@ -1745,7 +1777,7 @@ sap.ui.define([
             this.oPredefinedTable.setBusyIndicatorDelay(0);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._prepareNewRule = function () {
+        oDecisionTableSettings.prototype._prepareNewRule = function () {
             this._updateDecisionTableHeader();
             this._createDefaultColumn();
 			//Set default result only in case of ABAP
@@ -1754,7 +1786,7 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._removeColumnFromJsonModel = function (sequence, status) {
+        oDecisionTableSettings.prototype._removeColumnFromJsonModel = function (sequence, status) {
             var displayModel = this.getModel();
             var modelData = displayModel.getData();
             var aColumns = modelData.DecisionTable.DecisionTableColumns.results;
@@ -1781,7 +1813,7 @@ sap.ui.define([
             this._setDisplayModelData(modelData);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._ruleResultColumns = function () {
+        oDecisionTableSettings.prototype._ruleResultColumns = function () {
             var currentColumns = this.getModel().oData.DecisionTable.DecisionTableColumns.results;
 
             function isResult(currentColumn) {
@@ -1792,11 +1824,11 @@ sap.ui.define([
 
         // if the user chooses the result col to be hidden, enable expression advanced or read from the existing Odata entry
         // if the user chooses the result col to be editable, diable expression advanced and make it available in decision table
-        sap.rules.ui.DecisionTableSettings.prototype._setColumnAccessMode = function (oContext, oEvent) {
+        oDecisionTableSettings.prototype._setColumnAccessMode = function (oContext, oEvent) {
             this.enableAccessValue = !this.enableAccessValue;
             var cell = oEvent.oSource.sId.split("select")[1];
             var updateCellID = "exp" + cell;
-            this.expressionControl = sap.ui.getCore().byId(updateCellID);
+            this.expressionControl = Element.getElementById(updateCellID);
             //var resultEntryNumber = oContext.getProperty("Sequence");
             //resultEntryNumber = resultEntryNumber - 1;
             this.getModel("settingsModel").setProperty("/resultAttributeChanged", true);
@@ -1822,7 +1854,7 @@ sap.ui.define([
                         "expId": expId
                     };
                     
-                    var oEventBus = sap.ui.getCore().getEventBus();
+                    var oEventBus = EventBus.getInstance();
                     oEventBus.publish("sap.ui.rules", "_onHiddenSelected", obj);
                     this._updateResultAttributeJSON(oContext, Constants.HIDDEN, null, null, null, false, false, false);
                 } else {
@@ -1834,7 +1866,7 @@ sap.ui.define([
         };
         
         // Function to enable /disable Apply based on hidden attributes 
-        sap.rules.ui.DecisionTableSettings.prototype._updateApplyBtnActions = function() {
+        oDecisionTableSettings.prototype._updateApplyBtnActions = function() {
             if (this._internalModel) {
                 var predefinedResults = this._internalModel.oData.predefinedResults;
                 var hiddenAttributeWithNoExpression = false;
@@ -1852,14 +1884,14 @@ sap.ui.define([
                     }
                 }
                 if (hiddenAttributeWithNoExpression) {
-                    sap.ui.getCore().byId("ApplyBtn").setEnabled(false);
+                    Element.getElementById("ApplyBtn").setEnabled(false);
                 } else {
-                    sap.ui.getCore().byId("ApplyBtn").setEnabled(true);
+                    Element.getElementById("ApplyBtn").setEnabled(true);
                 }
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._setDefaultResult = function () {
+        oDecisionTableSettings.prototype._setDefaultResult = function () {
             var _displayModel = this.getModel();
             var modelData = _displayModel.getData();
             var resultsEnumration = this._internalModel.getData().results.resultsEnumration;
@@ -1872,25 +1904,25 @@ sap.ui.define([
             }
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._setDisplayModelData = function (modelData) {
+        oDecisionTableSettings.prototype._setDisplayModelData = function (modelData) {
             this.resultCounter = 0;
             var displayModel = this.getModel();
             displayModel.setData(modelData);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype.setExpressionLanguage = function (oExpressionLanguage) {
+        oDecisionTableSettings.prototype.setExpressionLanguage = function (oExpressionLanguage) {
             this.setAssociation("expressionLanguage", oExpressionLanguage, true);
             this._decisionTableHeaderSettingFormatter.setExpressionLanguage(oExpressionLanguage);
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._setExpressionRelevantOperators = function (displayExpression, colId, bValueOnly,
+        oDecisionTableSettings.prototype._setExpressionRelevantOperators = function (displayExpression, colId, bValueOnly,
             astControl) {
             var oFixedOperatorData = this._getFixedOperatorDataForExpression(displayExpression, bValueOnly, astControl);
             this._internalModel.setProperty("/tableData/" + colId, oFixedOperatorData, false);
             this._updateRemoveRowEnabled();
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._tableColumnsFactory = function (sId, oContext) {
+        oDecisionTableSettings.prototype._tableColumnsFactory = function (sId, oContext) {
             var that = this;
             var colId = oContext.getProperty("Id");
             var sequence = oContext.getProperty("Sequence");
@@ -1900,13 +1932,13 @@ sap.ui.define([
             var fixedOperator = oContext.getProperty("Condition/FixedOperator");
             var sOperator = this.getAstExpressionLanguage() ? this.astUtil._getCapitalOperatorName(fixedOperator) : fixedOperator;
             
-            return new sap.m.ColumnListItem({
-				visible: type === sap.rules.ui.DecisionTableColumn.Condition,
+            return new ColumnListItem({
+				visible: type === library.DecisionTableColumn.Condition,
 				cells: [
 					// gets the expression col
 					this._getExpressionFieldForCondition(oContext),
 
-					new sap.m.Input({
+					new Input({
 						value: label,
 						maxLength: Constants.MAX_LABEL_LENGTH,
 						change: function (oEvent) {
@@ -1919,12 +1951,12 @@ sap.ui.define([
 					}),
 					
                     // gets the vocab col
-                    new sap.m.Select({
+                    new Select({
                         width: "100%",
                         showSecondaryValues: true,
                         items: {
                             path: "settingsModel>/tableData/" + colId + "/fixOperatorEnumration",
-                            template: new sap.ui.core.ListItem({
+                            template: new ListItem({
                                 key: "{settingsModel>key}",
                                 text: "{settingsModel>key}",
                                 additionalText: "{settingsModel>value}"
@@ -1972,11 +2004,11 @@ sap.ui.define([
                         }.bind(this)
 
                     }),*/
-                    new sap.ui.layout.HorizontalLayout({
+                    new HorizontalLayout({
                         content: [
-                            new sap.m.Button({
-                                type: sap.m.ButtonType.Transparent,
-                                icon: sap.ui.core.IconPool.getIconURI("sys-cancel"),
+                            new Button({
+                                type: mobileLibrary.ButtonType.Transparent,
+                                icon: IconPool.getIconURI("sys-cancel"),
                                 visible: "{settingsModel>/removeRowEnabled}",
                                 press: function (oEvent) {
                                     //Clear tableData since the columns will be build again
@@ -1985,9 +2017,9 @@ sap.ui.define([
                                     this._removeColumnFromJsonModel(sequence, status);
                                 }.bind(this)
                             }).setTooltip(this.oBundle.getText("removeColumn")),
-                            new sap.m.Button({
-                                type: sap.m.ButtonType.Transparent,
-                                icon: sap.ui.core.IconPool.getIconURI("add"),
+                            new Button({
+                                type: mobileLibrary.ButtonType.Transparent,
+                                icon: IconPool.getIconURI("add"),
                                 press: function (oEvent) {
                                     //Add coulmn from JSON model
                                     this._addColumnToJsonModel(sequence);
@@ -1999,23 +2031,23 @@ sap.ui.define([
             }).addStyleClass("sapRULDecisionTableSettingsConditionRow");
         };
 		
-        sap.rules.ui.DecisionTableSettings.prototype._updateDecisionTableHeader = function () {
+        oDecisionTableSettings.prototype._updateDecisionTableHeader = function () {
             var _displayModel = this.getModel();
             var oExpressionLanguage;
             if (this.getAstExpressionLanguage()) {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             } else {
-                oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+                oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
             }
             var sExpressionLanguageVersion = oExpressionLanguage.getExpressionLanguageVersion();
             var modelData = _displayModel.getData();
             //Fullfill decisiontable header data
-            modelData.Type = sap.rules.ui.RuleType.DecisionTable;
+            modelData.Type = library.RuleType.DecisionTable;
             //modelData.RuleFormat = sap.rules.ui.RuleFormat.Advanced;
             modelData.ExpressionLanguageVersion = sExpressionLanguageVersion;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._updateRefreshFlags = function (needRefresh, isEnabled, bRefreshed) {
+        oDecisionTableSettings.prototype._updateRefreshFlags = function (needRefresh, isEnabled, bRefreshed) {
             this.getModel().getData().needToRefresh = needRefresh;
             this.getModel("settingsModel").setProperty("/refreshButtonEnabled", isEnabled, null, true);
             /////////////////// Non ABAP Requires Predefined results table. Hence, calling function import before Apply/////////
@@ -2023,7 +2055,7 @@ sap.ui.define([
             this._callRefreshResultsFunctionImport();
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype._updateRemoveRowEnabled = function () {
+        oDecisionTableSettings.prototype._updateRemoveRowEnabled = function () {
             //var columns = this.conditionsTable.getAggregation("items");
 	    var columns = this.getModel().getProperty("/DecisionTable/DecisionTableColumns/results");
             var visibleCounter = 0;
@@ -2038,7 +2070,7 @@ sap.ui.define([
         };
 
         //Updates the array of DataObjectAttributes with properties when result/AccessMode/Expression is changed
-        sap.rules.ui.DecisionTableSettings.prototype._updateResultAttributeJSON = function (
+        oDecisionTableSettings.prototype._updateResultAttributeJSON = function (
             oContext, sAccessMode, sExpression, astNodes, bResultChanged, isRefreshed, isSequenceChanged) {
             var sAttributeId = oContext.getProperty("DataObjectAttributeId") || oContext.getProperty("Id") || (oContext.DataObjectAttributeinfo ? oContext.DataObjectAttributeinfo.Id : undefined);
             var sDataPath = "/predefinedResults/" + sAttributeId;
@@ -2145,7 +2177,7 @@ sap.ui.define([
 
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype.getButtons = function (oDialog) {
+        oDecisionTableSettings.prototype.getButtons = function (oDialog) {
             var aButtons = [];
             //Create cancel button
             var oCancelButton = new Button({
@@ -2156,7 +2188,7 @@ sap.ui.define([
             }, this);
 
             //Create apply button
-            var oApplyBtn = sap.ui.getCore().byId("ApplyBtn");
+            var oApplyBtn = Element.getElementById("ApplyBtn");
             if (!oApplyBtn) { 
 	            	oApplyBtn = new Button({
 	                text: this.oBundle.getText("applyChangesBtn"),
@@ -2166,7 +2198,7 @@ sap.ui.define([
 
             oApplyBtn.attachPress(function () {
                 if (!this._applyButtonPressed) {
-					sap.ui.core.BusyIndicator.show();
+					BusyIndicator.show();
 					this.multiHeaderFlag = false; //flag for calculate only once header span for multi header in columnFactory function
 					//In case of successfull apply, the oDialog is closed from the success callback
 					this._applySettingsModelChangesToOData(oDialog);
@@ -2179,8 +2211,8 @@ sap.ui.define([
             return aButtons;
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype.init = function () {
-            this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+        oDecisionTableSettings.prototype.init = function () {
+            this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
             this.editableModeText = Constants.EDITABLE;
             this.hiddenModeText = Constants.HIDDEN;
             this.needCreateLayout = true;
@@ -2208,7 +2240,7 @@ sap.ui.define([
 
         };
 
-        sap.rules.ui.DecisionTableSettings.prototype.onBeforeRendering = function () {
+        oDecisionTableSettings.prototype.onBeforeRendering = function () {
             this.mNextColumnId = this._calcNextColumnId();
             if (this.firstLoad) {
                 this._initSettingsModel();
@@ -2238,7 +2270,7 @@ sap.ui.define([
         };
 
         //In case of reference object we will have attribues with ":" which should be replace by /
-        sap.rules.ui.DecisionTableSettings.prototype._formatAttributeId = function (attributeId) {
+        oDecisionTableSettings.prototype._formatAttributeId = function (attributeId) {
 			var formattedAttributeId = attributeId;
 			if(formattedAttributeId && formattedAttributeId.indexOf(":") > -1) {
 				formattedAttributeId = formattedAttributeId.replace(/:/g, "/");
@@ -2249,13 +2281,13 @@ sap.ui.define([
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         //////////////           Closure - this code is relevant only when pressing "apply"             ////////////////////
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        sap.rules.ui.DecisionTableSettings.prototype._applySettingsModelChangesToOData = function (oDialog) {
+        oDecisionTableSettings.prototype._applySettingsModelChangesToOData = function (oDialog) {
             var that = this;
             var _oExpressionLanguage;
             if (this.getExpressionLanguage()) {
-                _oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+                _oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
             } else {
-                _oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                _oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             }
             var nextColumnId = this.mNextColumnId;
             var oModel = this.getModel();
@@ -2418,7 +2450,7 @@ sap.ui.define([
                     RuleId: mConditionColumnData.RuleId,
                     Version: mConditionColumnData.Version,
                     Id: mConditionColumnData.Id,
-                    Type: sap.rules.ui.DecisionTableColumn.Condition,
+                    Type: library.DecisionTableColumn.Condition,
                     Sequence: mSequence,	
                     Label: mLabel
                 };
@@ -2439,7 +2471,7 @@ sap.ui.define([
             /////////////////////////////////////////////_validateConditionColumns ////////////////////////////////////////////
             var _validateConditionColumns = function (aSettingsModelColumns) {
                 var settingsModelColumn;
-                var messageBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+                var messageBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 
                 for (var i = 0; i < aSettingsModelColumns.length; i++) {
                     settingsModelColumn = aSettingsModelColumns[i];
@@ -2599,15 +2631,15 @@ sap.ui.define([
                             oDataModel.submitChanges({
                                 groupId: changesGroupID.groupId,
                                 success: function () {
-                                    sap.ui.core.BusyIndicator.hide();
-                                    oDialog.setState(sap.ui.core.ValueState.Success);
+                                    BusyIndicator.hide();
+                                    oDialog.setState(coreLibrary.ValueState.Success);
                                     oDialog.close();
                                     return;
                                 }
                             });
                         } else {
-                            sap.ui.core.BusyIndicator.hide();
-                            oDialog.setState(sap.ui.core.ValueState.Success);
+                            BusyIndicator.hide();
+                            oDialog.setState(coreLibrary.ValueState.Success);
                             oDialog.close();
                         }
                     }
@@ -2616,9 +2648,9 @@ sap.ui.define([
             };
 
             var submitSuccess = function (batchRequestResponse) {
-                var messageBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+                var messageBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
                 var foundErrorInBatch = false;
-                sap.ui.core.BusyIndicator.hide();
+                BusyIndicator.hide();
                 var batchResponseArray = batchRequestResponse.__batchResponses["0"].__changeResponses;
                 for (var responseEntry in batchResponseArray) {
                     if (batchResponseArray[responseEntry].message) {
@@ -2626,11 +2658,11 @@ sap.ui.define([
                         MessageBox.error(
                             errorMessage, {
                                 title: messageBundle.getText("RequestFailedText"),
-                                actions: [sap.m.MessageBox.Action.OK]
+                                actions: [MessageBox.Action.OK]
 
                             }
                         );
-                        oDialog.setState(sap.ui.core.ValueState.Error);
+                        oDialog.setState(coreLibrary.ValueState.Error);
                         foundErrorInBatch = true;
 
                     }
@@ -2640,13 +2672,13 @@ sap.ui.define([
                     if (bResultChanged) {
                         getDTColResults();
                     } else {
-                        sap.ui.core.BusyIndicator.hide();
-                        oDialog.setState(sap.ui.core.ValueState.Success);
+                        BusyIndicator.hide();
+                        oDialog.setState(coreLibrary.ValueState.Success);
                         oDialog.close();
                     }
                 }
                 if (!foundErrorInBatch) {
-                    sap.m.MessageToast.show(that.oBundle.getText("settingsApplySuccess"));
+                   MessageToast.show(that.oBundle.getText("settingsApplySuccess"));
                 }
 
             };
@@ -2666,7 +2698,7 @@ sap.ui.define([
                         RuleId: sRuleId,
                         Version: sVersion,
                         Id: nextColumnId,
-                        Type: sap.rules.ui.DecisionTableColumn.Result,
+                        Type: library.DecisionTableColumn.Result,
                         Sequence: nextSequence
                     };
 
@@ -2764,18 +2796,18 @@ sap.ui.define([
             /*work around for CSN : 1880262342 - After Refresh of table type DO -sumbitChanges call is never made if there are no attributes
              and no other changes are made in DT Settings*/
             if (bRefreshed && this.attributeListEmpty) {
-                oDialog.setState(sap.ui.core.ValueState.Success);
-                sap.ui.core.BusyIndicator.hide();
+                oDialog.setState(coreLibrary.ValueState.Success);
+                BusyIndicator.hide();
                 oDialog.close();
-                sap.m.MessageToast.show(this.oBundle.getText("settingsApplySuccess"));
+                MessageToast.show(this.oBundle.getText("settingsApplySuccess"));
                 return;
             }
 
             if (!isNeedToSubmitChanges && !bResultChanged && !bRefreshed && !bAttributeChanged) {
-                oDialog.setState(sap.ui.core.ValueState.Success);
-                sap.ui.core.BusyIndicator.hide();
+                oDialog.setState(coreLibrary.ValueState.Success);
+                BusyIndicator.hide();
                 oDialog.close();
-                sap.m.MessageToast.show(this.oBundle.getText("settingsApplySuccess"));
+                MessageToast.show(this.oBundle.getText("settingsApplySuccess"));
             }  
         
         };