@sapui5/sap.rules.ui 1.121.0 → 1.122.0

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

@@ -8,7 +8,7 @@
 // Provides this._validatecontrol sap.rules.ui.
 sap.ui.define([
 	"sap/base/Log",
-    "jquery.sap.global",
+    "sap/ui/thirdparty/jquery",
     "./library",
     "sap/rules/ui/DecisionTableCell",
     "sap/rules/ui/RuleBase",
@@ -33,20 +33,41 @@ sap.ui.define([
     "sap/m/FlexBox",
     "sap/m/MessageStrip",
     "sap/rules/ui/DecisionTableSettingsOld",
+    "sap/rules/ui/DecisionTableSettings",
     "sap/rules/ui/type/DecisionTableCell",
     "sap/rules/ui/ast/constants/Constants",
     "sap/rules/ui/services/AstExpressionLanguage",
     "sap/rules/ui/ast/util/AstUtil",
     "sap/rules/ui/Constants",
     "sap/ui/core/LocaleData",
+    "sap/ui/model/json/JSONModel",
+    "sap/m/MessageToast",
+    "sap/m/Title",
+    "sap/m/library",
+    /*"sap/ui/model/Context",*/
+    "sap/ui/core/library",
+    "sap/ui/table/library",
+    "sap/ui/core/EventBus",
+    "sap/ui/base/Event",
+    "sap/ui/model/Sorter",
+    "sap/base/i18n/Formatting",
+    "sap/ui/core/format/DateFormat",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
+    "sap/ui/model/odata/v2/Context",
+    "sap/ui/table/rowmodes/Fixed",
     "./DecisionTableRenderer"
     
 ], function (Log, jQuery, library, DecisionTableCell, RuleBase, Utils, Table, Column, OverflowToolbar, Popover, Menu, Dialog, MenuButton, Button,
              ToolbarSpacer, Text, Input, ObjectIdentifier, Link, Label, BusyIndicator, DisplayListItem, MenuItem, FlexBox, MessageStrip,
-             DecisionTableSettingsOld, DecisionTableCellFormatter, ConstantUtils, AstExpressionLanguage, AstUtil, Constants, LocaleData, DecisionTableRenderer) {
+             DecisionTableSettingsOld, DecisionTableSettings, DecisionTableCellFormatter, ConstantUtils, AstExpressionLanguage, AstUtil, Constants, LocaleData, JSONModel,
+             MessageToast, Title, mobileLibrary, /*Context,*/ coreLibrary,
+             TableLibrary, EventBus, Event, Sorter,
+             Formatting, DateFormat, coreLib, Element, Context, RowmodesFixed, DecisionTableRenderer) {
 
     "use strict";
 
+    var ButtonType = mobileLibrary.ButtonType;
     /**
      * Constructor for a new DecisionTable Control.
      *
@@ -58,7 +79,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.121.0
+     * @version 1.122.0
      *
      * @constructor
      * @private
@@ -89,11 +110,11 @@ sap.ui.define([
 				},
                 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]
                 },
                 lineActionBuffer: {
                     type: "any",
@@ -104,7 +125,7 @@ sap.ui.define([
                 },
                 decisionTableFormat: {
                     type: "sap.rules.ui.DecisionTableFormat",
-                    defaultValue: sap.rules.ui.DecisionTableFormat.CellFormat
+                    defaultValue: library.DecisionTableFormat.CellFormat
                 },
 				threshold: {
 					type: "int",
@@ -154,7 +175,7 @@ sap.ui.define([
             var oErrorLabel = new MessageStrip({
                 showCloseButton: true,
                 showIcon: true,
-                type: sap.ui.core.MessageType.Error,
+                type: coreLibrary.MessageType.Error,
                 visible: false
             }).addStyleClass("sapUiTinyMargin");
             this.setAggregation("_errorsText", oErrorLabel, true);
@@ -204,7 +225,7 @@ sap.ui.define([
 
         _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 = [];
@@ -232,9 +253,8 @@ sap.ui.define([
 
         _addTable: function () {
 			var oTable = new Table({
-				visibleRowCount: this.VISIBLEROWCOUNT,
 				threshold: this.THRESHOLD,
-				visibleRowCountMode: sap.ui.table.VisibleRowCountMode.Fixed,
+				rowMode:new RowmodesFixed({ rowCount:this.VISIBLEROWCOUNT, rowContentHeight:50 }),
 				selectionMode: {
 					parts: [{
 						path: "dtModel>/editable"
@@ -247,6 +267,13 @@ sap.ui.define([
 				enableColumnReordering: false,
 				busy: "{dtModel>/busyTableState}"
 			});
+			oTable.attachRowsUpdated(function() {
+                for (const oRow of oTable.getRows()) {
+                    for (const oCell of oRow.getCells()) {
+                        this._updateTableCell(oCell, oRow.getBindingContext())
+                    }
+                }
+            })
 			oTable._updateTableCell = this._updateTableCell;
 			oTable.setBusyIndicatorDelay(0);
 			this.setAggregation("_table", oTable, true);
@@ -260,7 +287,7 @@ sap.ui.define([
                 design: "Transparent",
                 enabled: "{dtModel>/editable}"
             });
-            var oTitle = new sap.m.Title({
+            var oTitle = new Title({
                 text: this.oBundle.getText("decisionTable"),
 		tooltip:this.oBundle.getText("decisionTable")
             });
@@ -282,7 +309,7 @@ sap.ui.define([
                 text: this.oBundle.getText("deleteRow"),
                 press: [this._deleteRowWorkaround, this],
                 visible: "{dtModel>/editable}",
-                type: sap.m.ButtonType.Transparent,
+                type: ButtonType.Transparent,
                 enabled: {
                     parts: [{
                         path: "dtModel>/newTable"
@@ -296,7 +323,7 @@ sap.ui.define([
             var oCopyLink = new Button({
                 text: this.oBundle.getText("copyRow"),
                 press: [this._copyRow, this],
-                type: sap.m.ButtonType.Transparent,
+                type: ButtonType.Transparent,
                 visible: {
                     parts: [{
                         path: "dtModel>/editable"
@@ -317,7 +344,7 @@ sap.ui.define([
 
             var oCutLink = new Button({
                 text: this.oBundle.getText("cutRow"),
-                type: sap.m.ButtonType.Transparent,
+                type: ButtonType.Transparent,
                 press: [this._cutRow, this],
                 visible: {
                     parts: [{
@@ -339,7 +366,7 @@ sap.ui.define([
 
             var oPasteLink = new MenuButton({
                 text: this.oBundle.getText("pasteRow"),
-                type: sap.m.ButtonType.Transparent,
+                type: ButtonType.Transparent,
                 visible: {
                     parts: [{
                         path: "dtModel>/editable"
@@ -447,7 +474,7 @@ sap.ui.define([
 		_onColumnResize: function () {
         	this.columnResized = true;
         	var obj = { "colResize" : true };
-			var oEventBus = sap.ui.getCore().getEventBus();
+			var oEventBus = EventBus.getInstance();
 			oEventBus.publish("sap.ui.rules","_onColumnResized", obj);
         },
 
@@ -458,7 +485,7 @@ sap.ui.define([
             if(this.getAstExpressionLanguage()){
             	expandPath = "Cells/DecisionTableRowCellASTs";
             }
-            var oSorter = new sap.ui.model.Sorter("Sequence");
+            var oSorter = new Sorter("Sequence");
 
             oTable.bindRows({
                 path: bindingPath,
@@ -543,7 +570,7 @@ sap.ui.define([
             }.bind(this);
 
             var submitError = function (e) {
-                sap.m.MessageToast.show(e);
+                MessageToast.show(e);
             }.bind(this);
 
             var callFunctionSuccess = function (response) {
@@ -600,7 +627,7 @@ sap.ui.define([
 	    
         //Closes cell popover
 	_closePopover: function () {
-		var pop = sap.ui.getCore().byId("popover");
+		var pop = Element.getElementById("popover");
 		if (pop) {
 			pop.close();
 		}
@@ -653,8 +680,8 @@ sap.ui.define([
             });
 
             relativePath = this._getBindModelName();
-            this.firstResultColumnBound = oContext.getProperty(relativePath + "Type") === sap.rules.ui.DecisionTableColumn.Result;
-            if (columnType === sap.rules.ui.DecisionTableColumn.Result) {
+            this.firstResultColumnBound = oContext.getProperty(relativePath + "Type") === library.DecisionTableColumn.Result;
+            if (columnType === library.DecisionTableColumn.Result) {
       
                 if (this.getAstExpressionLanguage()) {
                 	column.bindProperty("visible", {
@@ -717,7 +744,7 @@ sap.ui.define([
 
         _convertAndValidate: function () {
             var ruleData = this._getRuleData();
-            var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+            var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
             if (oExpressionLanguage) {
                 var validateResults = {};
                 if (oExpressionLanguage && ruleData) {
@@ -792,10 +819,10 @@ sap.ui.define([
             }).addStyleClass("sapRULDecisionTableColumnHeaderLabel");
 
             //Condition header text
-            if (columnType === sap.rules.ui.DecisionTableColumn.Condition) {
+            if (columnType === library.DecisionTableColumn.Condition) {
                 sPath = oContext.getModel().createKey("/DecisionTableColumnConditions", oHeaderKey);
                 sDTColPath = oContext.getModel().createKey("/DecisionTableColumns", oHeaderKey);
-                oAstContext = new sap.ui.model.Context(oContext.getModel(), sPath);
+                oAstContext = new Context(oContext.getModel(), sPath);
                 if (this.getAstExpressionLanguage()) {
                     displayExpression = oDtControl._getExpressionFromAstNodes(oAstContext);
                 }
@@ -846,7 +873,7 @@ sap.ui.define([
                 });
 
                 //Result header text
-            } else if (columnType === sap.rules.ui.DecisionTableColumn.Result) {
+            } else if (columnType === library.DecisionTableColumn.Result) {
                 var sResultPath = oContext.getModel().createKey("/DecisionTableColumnResults", oHeaderKey);
                 headerPath = relativePath + sResultPath;
                 oText.bindText({
@@ -889,7 +916,7 @@ sap.ui.define([
                     formatter: function (sType, iSequence) {
                         if (iSequence === 1) {
                             return oBundle.getText("conditionIfColumn");
-                        } else if (sType === sap.rules.ui.DecisionTableColumn.Result) {
+                        } else if (sType === library.DecisionTableColumn.Result) {
                             return oBundle.getText("resultThenColumn");
                         } else {
                             return "";
@@ -913,7 +940,7 @@ sap.ui.define([
         _createNewDecisionTableSettings: function () {
             var oModel = this._getModel();
             var oContext = this.getBindingContext();
-            var oDecisionTableSettings = new sap.rules.ui.DecisionTableSettings({
+            var oDecisionTableSettings = new DecisionTableSettings({
                 hitPolicies: "{dtModel>/hitPolicies}",
                 newDecisionTable: this._internalModel.getProperty("/newTable"),
                 cellFormat: "{dtModel>/cellFormat}",
@@ -929,7 +956,7 @@ sap.ui.define([
             var settingModelDataStr = JSON.stringify(this._settingsModel.getData());
             var settingModelData = JSON.parse(settingModelDataStr);
 
-            var settingModel = new sap.ui.model.json.JSONModel(settingModelData);
+            var settingModel = new JSONModel(settingModelData);
 
             oDecisionTableSettings.setModel(settingModel);
 
@@ -979,7 +1006,7 @@ sap.ui.define([
             });
             this._markSelection(true);
             oTable.setSelectedIndex(-1);
-            sap.m.MessageToast.show(this.oBundle.getText(operation + "RowSuccess"));
+            MessageToast.show(this.oBundle.getText(operation + "RowSuccess"));
         },
 
         _cutRow: function () {
@@ -1030,7 +1057,7 @@ sap.ui.define([
         },
 
         _decideSelectionMode: function (editable) {
-            return editable ? sap.ui.table.SelectionMode.MultiToggle : sap.ui.table.SelectionMode.None;
+            return editable ? TableLibrary.SelectionMode.MultiToggle : TableLibrary.SelectionMode.None;
         },
 
         _decideSettingsEnablement: function (enableSettings, editable) {
@@ -1062,7 +1089,7 @@ sap.ui.define([
                 rowPath: null,
                 operation: null
             });
-            sap.m.MessageToast.show(this.oBundle.getText("deleteRowSuccess"));
+            MessageToast.show(this.oBundle.getText("deleteRowSuccess"));
         },
 
         _deleteRowWorkaround: function () {
@@ -1086,7 +1113,7 @@ sap.ui.define([
 
         _displayHeaderErrorMessages: function (headerErrorsArray, columnErrorsMap) {
             var oText = this.getAggregation("_errorsText");
-            this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+            this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
             var errorHeaderMessage = this._concatinateHeaderErrors(headerErrorsArray);
             oText.setText(this.oBundle.getText("errorInTableHeader") + errorHeaderMessage); // + "\n" + errorColumnsHeaderMessage);
             oText.setVisible(true);
@@ -1223,7 +1250,7 @@ sap.ui.define([
 
         _getExpressionFromAstNodes: function (oContext) {
             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 = "";
@@ -1324,7 +1351,7 @@ sap.ui.define([
         _getOutputColumnDescription: function (oName, oLabel) {
 			var expLanguage;
 			if (this.getExpressionLanguage()) {
-				expLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+				expLanguage = Element.getElementById(this.getExpressionLanguage());
 				if (expLanguage && expLanguage._isDataExist()) {
 					var ResultID = this.getBindingContext().getProperty("ResultDataObjectId");
 					var desc = expLanguage.getResultColumnDescription(oName, ResultID, oLabel);
@@ -1480,9 +1507,9 @@ sap.ui.define([
                 this.iNumOfCondition = 0;
                 this.iNumOfResults = 0;
                 for (i = 0; i < aColumns.length; i++) {
-                    if (aColumns[i].Type === sap.rules.ui.DecisionTableColumn.Condition) {
+                    if (aColumns[i].Type === library.DecisionTableColumn.Condition) {
                         this.iNumOfCondition++;
-                    } else if (aColumns[i].Type === sap.rules.ui.DecisionTableColumn.Result) {
+                    } else if (aColumns[i].Type === library.DecisionTableColumn.Result) {
                         this.iNumOfResults++;
                     }
                 }
@@ -1501,9 +1528,9 @@ sap.ui.define([
             var vocaDataReceived = false;
             var oEL;
             if (this.getAstExpressionLanguage()) {
-                oEL = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                oEL = Element.getElementById(this.getAstExpressionLanguage());
             } else {
-                oEL = sap.ui.getCore().byId(this.getExpressionLanguage());
+                oEL = Element.getElementById(this.getExpressionLanguage());
             }
             if (oEL && oEL._isDataExist()) {
                 vocaDataReceived = true;
@@ -1522,9 +1549,9 @@ sap.ui.define([
         },
 
         _initDisplayModel: function () {
-            this._displayModel = new sap.ui.model.json.JSONModel();
+            this._displayModel = new JSONModel();
             this.setModel(this._displayModel, "displayModel");
-            this._settingsModel = new sap.ui.model.json.JSONModel();
+            this._settingsModel = new JSONModel();
             this.setModel(this._settingsModel, "settingModel");
         },
 
@@ -1546,7 +1573,7 @@ sap.ui.define([
             data.selectedRow = null;
             data.conditionCellAstValues = [];
             data.ruleBindingPath = "";
-            this._internalModel = new sap.ui.model.json.JSONModel(data);
+            this._internalModel = new JSONModel(data);
             this.setModel(this._internalModel, "dtModel");
         },
 
@@ -1562,7 +1589,7 @@ sap.ui.define([
             if (rowPath) {
                 var firstVisibleRow = oTable.getFirstVisibleRow();
                 var rowIndex = oModel.getProperty(rowPath).Sequence - 1;
-                if ((rowIndex - firstVisibleRow > -1) && (rowIndex - firstVisibleRow < oTable.getVisibleRowCount())) {
+                if ((rowIndex - firstVisibleRow > -1) && (rowIndex - firstVisibleRow < oTable.getRowMode().getRowCount())) {
                     var oRow = oTable.getRows()[rowIndex - firstVisibleRow];
                     var oCells = oRow.getCells();
                     if (oCells) {
@@ -1598,7 +1625,7 @@ sap.ui.define([
                 var dialogState = oDialog.getState();
                 oDialog.destroy();
                 //User press on "Apply" (and not on "Cancel")
-                if (dialogState === sap.ui.core.ValueState.Success) {
+                if (dialogState === coreLibrary.ValueState.Success) {
                     this._initDisplayModel();
                     this._refreshBinding();
                 }
@@ -1621,7 +1648,7 @@ sap.ui.define([
                     columnErrorsMap = this._buildMessagesStructure(validateResults, columnErrorsMap, headerErrorsArray);
                     for (var cell in columnErrorsMap) {
                         if (columnErrorsMap.hasOwnProperty(cell) && (typeof columnErrorsMap[cell] === "string") && columnErrorsMap[cell] !== "null") {
-                            cellValueStateMap[cell] = sap.ui.core.ValueState.Error;
+                            cellValueStateMap[cell] = coreLibrary.ValueState.Error;
                         }
                     }
                     this._displayErrorMessages(headerErrorsArray, columnErrorsMap);
@@ -1671,10 +1698,10 @@ sap.ui.define([
             }
             oTable.setSelectedIndex(-1);
             if (operation === "insertBefore" || operation === "insertAfter") {
-                sap.m.MessageToast.show(this.oBundle.getText("addRowSuccess"));
+                MessageToast.show(this.oBundle.getText("addRowSuccess"));
             } 
             if (operation === "paste") {
-                sap.m.MessageToast.show(this.oBundle.getText("pasteSuccess"));
+                MessageToast.show(this.oBundle.getText("pasteSuccess"));
             }
         },
 
@@ -1692,7 +1719,7 @@ sap.ui.define([
             if (rowBinding) {
                 rowBinding.refresh();
             }
-            var oEventBus = sap.ui.getCore().getEventBus();
+            var oEventBus = EventBus.getInstance();
             oEventBus.publish("sap.ui.rules", "refreshDTRuleModel");
         },
 
@@ -1734,10 +1761,10 @@ sap.ui.define([
             if (bNewRule) {
                 var oEL;
                 if (this.getAstExpressionLanguage()) {
-                    oEL = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+                    oEL = Element.getElementById(this.getAstExpressionLanguage());
                     sVersion = "2.0.0"; 					
                 } else {
-                    oEL = sap.ui.getCore().byId(this.getExpressionLanguage());
+                    oEL = Element.getElementById(this.getExpressionLanguage());
                     sVersion = oEL.getExpressionLanguageVersion();
                 }
                 oModel.setProperty("ExpressionLanguageVersion", sVersion, oContext, true);
@@ -1758,14 +1785,14 @@ sap.ui.define([
                 iVisibleRowCount = Math.min(oRowBinding.getLength(), this.VISIBLEROWCOUNT);
             }
 
-            var currVisibleRowCount = oTable.getVisibleRowCount();
+            var currVisibleRowCount = oTable.getRowMode().getRowCount();
             if (currVisibleRowCount !== iVisibleRowCount) {
-                oTable.setVisibleRowCount(iVisibleRowCount);
+                oTable.getRowMode().setRowCount(iVisibleRowCount);
             }
             if ((this.dataBucket && this.dataBucket.rows && this.dataBucket.rows.results.length === 0) || !this.getEditable()) {
-                oTable.setSelectionMode(sap.ui.table.SelectionMode.None);
+                oTable.setSelectionMode(TableLibrary.SelectionMode.None);
             } else {
-                oTable.setSelectionMode(sap.ui.table.SelectionMode.MultiToggle);
+                oTable.setSelectionMode(TableLibrary.SelectionMode.MultiToggle);
             }
         },
 
@@ -1792,7 +1819,7 @@ sap.ui.define([
             this._internalModel.setProperty("/busyTableState", tableIsBusy);
         },
 
-        _updateTableCell: function (oCell, oRowContext, dtDomElement, rowIndex) {
+        _updateTableCell: function (oCell, oRowContext) {
             //jQuery(oCell.getDomRef()).parent().parent().parent().removeClass("sapRULDecisionTableSCellMarked");
             oCell.removeStyleClass("sapRULDecisionTableSCellMarked");
             var path = "null";
@@ -1804,7 +1831,7 @@ sap.ui.define([
                 var rowId = oRowContext.getProperty("Id");
                 var ruleId = oRowContext.getProperty("RuleId");
                 var version = oRowContext.getProperty("Version");
-		var oModel = oRowContext.getModel();
+		        var oModel = oRowContext.getModel();
 
                 var headerPath = '';
                 var rulePath = '';
@@ -1816,7 +1843,7 @@ sap.ui.define([
                     Version: version
                 };
                 var cellBindingPath = oModel.createKey("/DecisionTableRowCells", oCellProperties);
-                var oCellContext = new sap.ui.model.Context(oModel, cellBindingPath);
+                var oCellContext = new Context(oModel, cellBindingPath);
 
                 //Condition path from model
                 var oProperties = {
@@ -1859,7 +1886,7 @@ sap.ui.define([
                     headerPath = "/" + oModel.createKey("DecisionTableColumnResults", cellKeyProperties);
                     rulePath = "/" + oModel.createKey("Rules", ruleKeyProperties);
                     oCell.setTypePath(headerPath + '/BusinessDataType');
-                    if (sap.ui.getCore().byId(oParent.getAstExpressionLanguage())) {
+                    if (Element.getElementById(oParent.getAstExpressionLanguage())) {
                         var sResultDataObjectId = oParent.getModel("settingModel").getData().ResultDataObjectId;
                         var sAttributeId = oModel.getProperty(headerPath + '/DataObjectAttributeId');
                         oCell.setAttributeInfoPath("/" + sResultDataObjectId + "/" + that.getParent()._formatAttributeId(sAttributeId));
@@ -1907,7 +1934,7 @@ sap.ui.define([
             this._initDisplayModel();
             this._initDataBucket();
             this.bindProperty("busy", "dtModel>/busyState");
-            this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+            this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
             this._addToolBar();
             this._addTable();
             this._addErrorLabel();
@@ -1967,7 +1994,7 @@ sap.ui.define([
             if (!bindingContextPath || !oModel) {
                 return;
             }
-            var oContext = new sap.ui.model.Context(oModel, bindingContextPath);
+            var oContext = new Context(oModel, bindingContextPath);
             this._internalModel.setProperty("/ruleBindingPath", bindingContextPath);
             this.setBindingContext(oContext);
             this._bindRule();
@@ -1978,7 +2005,7 @@ sap.ui.define([
         /** Control's properties getters/setters */
         setAstExpressionLanguage: function (value) {
             this.setAssociation("astExpressionLanguage", value, true);
-            var astExpressionLanguage = (value instanceof Object) ? value : sap.ui.getCore().byId(value);
+            var astExpressionLanguage = (value instanceof Object) ? value : Element.getElementById(value);
             if (!astExpressionLanguage) {
                 return this;
             }
@@ -1993,7 +2020,7 @@ sap.ui.define([
             }
 
             if (astExpressionLanguage._isDataExist()) {
-                var oEvent = new sap.ui.base.Event("", "", {
+                var oEvent = new Event("", "", {
                     data: true
                 });
                 this._handleVocabularyDataChanged(oEvent);
@@ -2068,7 +2095,7 @@ sap.ui.define([
         setExpressionLanguage: function (value) {
             this.setAssociation("expressionLanguage", value, true);
             this._decisionTableCellFormatter.setExpressionLanguage(this.getExpressionLanguage());
-            var expressionLanguage = (value instanceof Object) ? value : sap.ui.getCore().byId(value);
+            var expressionLanguage = (value instanceof Object) ? value : Element.getElementById(value);
             if (!expressionLanguage) {
                 return this;
             }
@@ -2083,7 +2110,7 @@ sap.ui.define([
             }
 
             if (expressionLanguage._isDataExist()) {
-                var oEvent = new sap.ui.base.Event("", "", {
+                var oEvent = new Event("", "", {
                     data: true
                 });
                 this._handleVocabularyDataChanged(oEvent);
@@ -2113,13 +2140,13 @@ sap.ui.define([
      * @private
      *  @param {map} mParameters? -
      */
-    sap.rules.ui.DecisionTable.prototype._saveWorkAround = function (mParameters, toastMessage) {
+    oDecisionTable.prototype._saveWorkAround = function (mParameters, toastMessage) {
         var oModel = this._getModel();
         oModel.submitChanges(mParameters);
-        sap.m.MessageToast.show(toastMessage);
+        MessageToast.show(toastMessage);
     };
     
-    sap.rules.ui.DecisionTable.prototype.includes = function (parent, str) {
+    oDecisionTable.prototype.includes = function (parent, str) {
 			var returnValue = false;
 	
 			if (parent.indexOf(str) !== -1) {
@@ -2129,33 +2156,33 @@ sap.ui.define([
 			return returnValue;
 	};
 	
-	sap.rules.ui.DecisionTable.prototype._getLocaleData = function () {
-            var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+	oDecisionTable.prototype._getLocaleData = function () {
+            var oLocale = Formatting.getLanguageTag();
             return LocaleData.getInstance(oLocale);
     };
 
-    sap.rules.ui.DecisionTable.prototype._getDateFormatter = function () {
+    oDecisionTable.prototype._getDateFormatter = function () {
             var oLocaleData = this._getLocaleData();
             var datePattern = oLocaleData.getDatePattern('medium');
-            var dateFormatter = sap.ui.core.format.DateFormat.getDateInstance({
+            var dateFormatter = DateFormat.getDateInstance({
                 pattern: datePattern
             });
             return dateFormatter;
     };
 
-    sap.rules.ui.DecisionTable.prototype._getDateTimeFormatter = function () {
+    oDecisionTable.prototype._getDateTimeFormatter = function () {
             var oLocaleData = this._getLocaleData();
             var datePattern = oLocaleData.getDatePattern('medium');
             var timePattern = oLocaleData.getTimePattern('medium');
-            var dateTimeFormatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+            var dateTimeFormatter = DateFormat.getDateTimeInstance({
                 pattern: datePattern + " " + timePattern
             });
             return dateTimeFormatter;
     };
 
-    sap.rules.ui.DecisionTable.prototype.VISIBLEROWCOUNT = 30;
+    oDecisionTable.prototype.VISIBLEROWCOUNT = 30;
 
-	sap.rules.ui.DecisionTable.prototype.THRESHOLD = 30;
+	oDecisionTable.prototype.THRESHOLD = 30;
 
     return oDecisionTable;