@sapui5/sap.rules.ui 1.121.0 → 1.123.0

package/src/sap/rules/ui/parser/i18n/op_messages_descriptions_sh.properties

@@ -2,49 +2,49 @@
 
 
 
-1000=Uspe\u0161na validacija
-1001=Neuspe\u0161na validacija
+1000=Uspje\u0161na validacija
+1001=Neuspje\u0161na validacija
 
 
-2000=Uspe\u0161no kreiranje, \u010Ditanje, a\u017Euriranje i brisanje resursa
-2001=Neuspe\u0161no kreiranje, \u010Ditanje, a\u017Euriranje i brisanje resursa
+2000=Uspje\u0161no kreiranje, \u010Ditanje, a\u017Euriranje i brisanje resursa
+2001=Neuspje\u0161no kreiranje, \u010Ditanje, a\u017Euriranje i brisanje resursa
 
 
-3000=Uspe\u0161no pozivanje parametara
-3001=Neuspe\u0161no pozivanje parametara
+3000=Uspje\u0161no pozivanje parametara
+3001=Neuspje\u0161no pozivanje parametara
 
 
-4000=Uspe\u0161no kori\u0161\u0107enje usluge pravila
-4001=Neuspe\u0161no kori\u0161\u0107enje usluge pravila
+4000=Uspje\u0161no kori\u0161\u0107enje usluge pravila
+4001=Neuspje\u0161no kori\u0161\u0107enje usluge pravila
 
 
-5000=Uspe\u0161no potpuno aktiviranje
-5001=Neuspe\u0161no potpuno aktiviranje
+5000=Uspje\u0161no potpuno aktiviranje
+5001=Neuspje\u0161no potpuno aktiviranje
 
 
-6000=Uspe\u0161no aktiviranje
-6001=Neuspe\u0161no aktiviranje
+6000=Uspje\u0161no aktiviranje
+6001=Neuspje\u0161no aktiviranje
 
 
-7000=Uspe\u0161no naknadno aktiviranje
-7001=Neuspe\u0161no naknadno aktiviranje
+7000=Uspje\u0161no naknadno aktiviranje
+7001=Neuspje\u0161no naknadno aktiviranje
 
 
-8000=Uspe\u0161ne usluge vremena izvo\u0111enja
-8001=Neuspe\u0161ne usluge vremena izvo\u0111enja
+8000=Uspje\u0161ne usluge vremena izvo\u0111enja
+8001=Neuspje\u0161ne usluge vremena izvo\u0111enja
 
-9000=Uspe\u0161no kreiranje dispe\u010Dera
-9001=Neuspe\u0161no kreiranje dispe\u010Dera
+9000=Uspje\u0161no kreiranje dispe\u010Dera
+9001=Neuspje\u0161no kreiranje dispe\u010Dera
 
-10000=Uspe\u0161na HRF tehni\u010Dna konfiguracija
-10001=Neuspe\u0161na HRF tehni\u010Dna konfiguracija
+10000=Uspje\u0161na HRF tehni\u010Dna konfiguracija
+10001=Neuspje\u0161na HRF tehni\u010Dna konfiguracija
 
 
-11000=Uspe\u0161na kompilacija
-11001=Neuspe\u0161na kompilacija
+11000=Uspje\u0161na kompilacija
+11001=Neuspje\u0161na kompilacija
 
-12000=Uspe\u0161na validacija pravila
-12001=Neuspe\u0161na validacija pravila
+12000=Uspje\u0161na validacija pravila
+12001=Neuspje\u0161na validacija pravila
 
-13000=Uspe\u0161na validacija usluge pravila
-13001=Neuspe\u0161na validacija usluge pravila
+13000=Uspje\u0161na validacija usluge pravila
+13001=Neuspje\u0161na validacija usluge pravila

package/src/sap/rules/ui/parser/infrastructure/errorHandling/hrfException.js

@@ -1,5 +1,5 @@
-sap.ui.define([
-], function() {
+sap.ui.define(["sap/base/Log"
+], function(Logger) {
     "use strict";
     
     function HrfMessage (code, params) {
@@ -77,7 +77,7 @@ sap.ui.define([
 			}
 			
 			traceMassage += "\n----------------------------\n+++ End of HRF Exception +++\n----------------------------\n";
-			jQuery.sap.log.error (traceMassage);
+			Logger.error (traceMassage);
 		}
 
 		setTraced (exception, true);

package/src/sap/rules/ui/parser/infrastructure/locale/lib/resourceBundleContext.js

@@ -1,6 +1,7 @@
 sap.ui.define([
-   "sap/ui/model/resource/ResourceModel"
-], function (ResourceModel) {
+   "sap/ui/model/resource/ResourceModel",
+   "sap/base/Log"
+], function (ResourceModel, Logger) {
     'use strict';
 
     var resourceBundleContext = {};
@@ -31,7 +32,7 @@ sap.ui.define([
 						}
 					}
                 }
-                jQuery.sap.log.debug("code: " + messageKey + ", params: " + paramsArray + "\nMessage: " + sMsg);
+                Logger.debug("code: " + messageKey + ", params: " + paramsArray + "\nMessage: " + sMsg);
                 return sMsg;
             }
         };

package/src/sap/rules/ui/parser/infrastructure/messageHandling/lib/responseCollector.js

@@ -3,8 +3,9 @@ sap.ui.define([
 	"sap/rules/ui/parser/infrastructure/messageHandling/lib/opMessages",
 	"sap/rules/ui/parser/infrastructure/locale/lib/constants",
 	"sap/rules/ui/parser/infrastructure/errorHandling/hrfException",
-	"sap/rules/ui/parser/infrastructure/locale/lib/resourceBundle"
-], function(messagesListLib, opMessagesLib, localePropertiesEnums, hrfException, resourceBundleLib) {
+	"sap/rules/ui/parser/infrastructure/locale/lib/resourceBundle",
+	"sap/base/Log"
+], function(messagesListLib, opMessagesLib, localePropertiesEnums, hrfException, resourceBundleLib, Logger) {
     "use strict";
     
 	var messagesList = messagesListLib.messages;
@@ -61,7 +62,7 @@ sap.ui.define([
 
 			function initializeSubject() {
 				if (!currentDetail || !currentDetail.subject) {
-					jQuery.sap.log.error("ResponseCollector addMessage: no subject was defined");
+					Logger.error("ResponseCollector addMessage: no subject was defined");
 					addNewSubject("GENERAL", false);
 				}
 
@@ -207,16 +208,16 @@ sap.ui.define([
 
 					switch (severity) {
 						case SEVERITY_LEVEL.error:
-							jQuery.sap.log.error (traceMassage + "\n\nCall stack:\n----------\n" + (new Error()).stack + '\n\n-------------------------------------');
+							Logger.error (traceMassage + "\n\nCall stack:\n----------\n" + (new Error()).stack + '\n\n-------------------------------------');
 							break;
 						case SEVERITY_LEVEL.info:
-							jQuery.sap.log.info(traceMassage);
+							Logger.info(traceMassage);
 							break;
 						case SEVERITY_LEVEL.debug:
-							jQuery.sap.log.debug(traceMassage);
+							Logger.debug(traceMassage);
 							break;
 						case SEVERITY_LEVEL.warn:
-							jQuery.sap.log.error(traceMassage);
+							Logger.error(traceMassage);
 							break;
 					}
 				}

package/src/sap/rules/ui/parser/ruleBody/lib/ruleBody.js

@@ -4,9 +4,10 @@ sap.ui.define([
 	"sap/rules/ui/parser/infrastructure/errorHandling/hrfException",
 	"sap/rules/ui/parser/infrastructure/messageHandling/lib/responseCollector",
 	"sap/rules/ui/parser/infrastructure/util/utilsBase",
-	"sap/rules/ui/parser/ruleBody/lib/decisionTableCell"
+	"sap/rules/ui/parser/ruleBody/lib/decisionTableCell",
+	"sap/base/Log"
 ], function(parsingBackendMediator, ruleBodyConstants, hrfException, ResponseCollector, utilsBaseLib,
-		decisionTableCellLib) {
+		decisionTableCellLib, Logger) {
     "use strict";
     
 	var parser = new parsingBackendMediator.parsingBackendMediatorLib();
@@ -53,7 +54,7 @@ sap.ui.define([
 	 */
 	RuleBody.prototype.traverse = function traverse(ruleBody, vocabulary, vocaRTServ, traversalParts, pathPrefix) {
 		
-		jQuery.sap.log.debug("Traverse rule --> " + JSON.stringify(ruleBody));
+		Logger.debug("Traverse rule --> " + JSON.stringify(ruleBody));
 	
 		//the default is to do traversal on all ruleBody parts
 		this.initTraversalParts(traversalParts);
@@ -463,9 +464,9 @@ sap.ui.define([
 	RuleBody.prototype.getParserAST = function getParserAST(expression, parserMode, variables, contentType, flags) {
 		var parsedBusinessRule = parser.parseInputRT(expression, parserMode, this.vocaRTServ, variables, contentType, this.vocabulary, flags);
 	
-		jQuery.sap.log.debug("****************************************************************************************************");
-		jQuery.sap.log.debug("expresstion to parser: " + expression + " type: " + contentType + " vocabulary: " + this.vocabulary + " " + parserMode);
-		jQuery.sap.log.debug("*****************************************************************************************************");
+		Logger.debug("****************************************************************************************************");
+		Logger.debug("expresstion to parser: " + expression + " type: " + contentType + " vocabulary: " + this.vocabulary + " " + parserMode);
+		Logger.debug("*****************************************************************************************************");
 	
 		if (parsedBusinessRule === undefined ||
 			(parsedBusinessRule === null && expressionEmpty(expression) === false)) {
@@ -479,7 +480,7 @@ sap.ui.define([
 			}
 		}
 	
-		jQuery.sap.log.debug (JSON.stringify(parsedBusinessRule));
+		Logger.debug (JSON.stringify(parsedBusinessRule));
 		return parsedBusinessRule;
 	};
 	

package/src/sap/rules/ui/parser/ruleBody/lib/ruleBodyConvertor.js

@@ -6,9 +6,10 @@ sap.ui.define([
 	"sap/rules/ui/parser/businessLanguage/lib/valueHelpValidator",
 	"sap/rules/ui/parser/ruleBody/lib/decisionTableCell",
 	"sap/rules/ui/parser/businessLanguage/lib/ASTConvertor",
-	"sap/rules/ui/parser/AST/lib/bundleAst"
+	"sap/rules/ui/parser/AST/lib/bundleAst",
+	"sap/base/Log"
 ], function(ruleBodyValidatorLib, constants, parserConstants, utilsBase, valueHelpValidatorLib,
-		decisionTableCellLib, ASTConvertorLib, ) {
+		decisionTableCellLib, ASTConvertorLib, bundleAst, Logger) {
     "use strict";
     
     var bundleApi = RulesAPI_Ast;
@@ -18,7 +19,7 @@ sap.ui.define([
 	
 	function RuleBodyConvertor(oDataRule) {
 	
-		jQuery.sap.log.debug("CTOR - Rule Convertor");
+		Logger.debug("CTOR - Rule Convertor");
 		this.oDataRule = oDataRule;
 		ruleBodyValidatorLib.RuleBodyValidator.call(this); 
 		

package/src/sap/rules/ui/parser/ruleBody/lib/ruleBodyValidator.js

@@ -9,16 +9,17 @@ sap.ui.define([
 	"sap/rules/ui/parser/infrastructure/util/utilsBase",
 	"sap/rules/ui/parser/infrastructure/util/constants",
 	"sap/rules/ui/parser/ruleBody/lib/decisionTableCell",
-	"sap/rules/ui/parser/resources/dependencies/lib/constants"
+	"sap/rules/ui/parser/resources/dependencies/lib/constants",
+	"sap/base/Log"
 ], function(ruleBodyBase, ruleBodyConstants, RelConstants, dependenciesObjectsLib, dependenciesHandlerLib,
-		vocConstants, ResponseCollectorLib, utilsBaseLib, utilConstantsLib, decisionTableCellLib, depConstants) {
+		vocConstants, ResponseCollectorLib, utilsBaseLib, utilConstantsLib, decisionTableCellLib, depConstants, Logger) {
     "use strict";
     
     var utilsLib = new utilsBaseLib.utilsBaseLib();
 	var ResponseCollector = ResponseCollectorLib.ResponseCollector;
     function RuleBodyValidator() {
     	
-		jQuery.sap.log.debug("CTOR - Rule Validator");
+		Logger.debug("CTOR - Rule Validator");
 		ruleBodyBase.RuleBody.call(this); //improve inheritance writing
 	
 		this.initValidation();
@@ -337,7 +338,7 @@ sap.ui.define([
 	 * handles Text Condition
 	 */
 	RuleBodyValidator.prototype.handleTextCondition = function handleTextCondition(condition, result, pathPrefix) {
-		jQuery.sap.log.debug("Validate Condition");
+		Logger.debug("Validate Condition");
 	
 		this.currentParserResult = this.getParserAST(condition, RelConstants.VALIDATE_MODE, null, RelConstants.TYPE_BOOLEAN, this.flags);
 		
@@ -1016,7 +1017,7 @@ sap.ui.define([
 	 */
 	RuleBodyValidator.prototype.validateHeader = function validateHeader(header) {
 	
-		jQuery.sap.log.debug("validate header");
+		Logger.debug("validate header");
 	
 		if (header.hasOwnProperty(ruleBodyConstants.RULE_CELL_TYPE)) {
 	
@@ -1678,7 +1679,7 @@ sap.ui.define([
 	RuleBodyValidator.prototype.validateBusinessRule = function validateBusinessRule(ruleBody, vocabulary, vocaRTServ, flags, output, pathPrefixMap, traversalParts) {
 		var result = {};
 	
-		jQuery.sap.log.debug("flags " + JSON.stringify(flags));
+		Logger.debug("flags " + JSON.stringify(flags));
 	
 		// Updating the AST need 
 		this.needDeserializeInput = decisionTableCellLib.needDeserializeInput(flags, ruleBody.relVersion, vocaRTServ);
@@ -1733,14 +1734,14 @@ sap.ui.define([
 		if (this.flags[ruleBodyConstants.outputFlagsEnum.dependenciesOutput] &&
 			this.status === ruleBodyConstants.RULE_SUCCESS && this.dependenciesByFlags) {
 			result.dependencies = this.depHandler.getDependencies();
-			jQuery.sap.log.debug("getDependencies");
+			Logger.debug("getDependencies");
 		}
 	
 		// Getting root object context result
 		if (this.flags[ruleBodyConstants.outputFlagsEnum.rootObjectContextOutput] &&
 			this.status === ruleBodyConstants.RULE_SUCCESS) {
 			result[ruleBodyConstants.outputPropertiesEnum.rootObjectContext] = this.getRootObjectContext();
-			jQuery.sap.log.debug("getRootObjectContext");
+			Logger.debug("getRootObjectContext");
 		}
 		
 		return result;

package/src/sap/rules/ui/providers/ValueHelpDialogProvider.js

@@ -7,13 +7,30 @@
 
 sap.ui.define([
 	"sap/rules/ui/Constants",
-	"sap/ui/core/LocaleData"
-], function(Constants,LocaleData) {
+	"sap/ui/core/LocaleData",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/comp/valuehelpdialog/ValueHelpDialog",
+	"sap/ui/table/Column",
+	"sap/m/Text",
+	"sap/ui/core/library",
+	"sap/base/i18n/Formatting",
+    "sap/ui/core/format/DateFormat",
+    "sap/ui/comp/smartfilterbar/SmartFilterBar",
+    "sap/ui/model/odata/v2/ODataModel",
+    "sap/ui/comp/smartfilterbar/ControlConfiguration",
+    "sap/ui/model/Filter",
+    "sap/ui/model/FilterOperator",
+    "sap/m/Label",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element"
+
+], function(Constants,LocaleData, JSONModel, valuehelpdialog, TableColumn, Text, coreLibrary, Formatting, DateFormat, SmartFilterBar, ODataModel, Element, ControlConfiguration,
+Filter, FilterOperator, Label, coreLib) {
 	"use strict";
 	var valueHelpDialogProvider = {};
 
 	valueHelpDialogProvider._createCpValueHelp = function(valueHelpInfo, curPos, bReplaceWord, bValuehelpLinkPress) {
-		this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 		var bAddSpace = false;
 		var basePath = "";
 
@@ -29,7 +46,7 @@ sap.ui.define([
 			if (tokens && tokens.length > 0) {
 				bAddSpace = (tokens[tokens.length - 1].tokenType !== "whitespace");
 			}
-			basePath = sap.ui.getCore().byId(this.getExpressionLanguage()).getModel().sServiceUrl;
+			basePath = Element.getElementById(this.getExpressionLanguage()).getModel().sServiceUrl;
 		}
 		this.businessDataType = this.valueHelpMetadata.businessDataType;
 		this.serviceUrl = this.valueHelpMetadata.serviceURL;
@@ -41,7 +58,7 @@ sap.ui.define([
 		if (this.oDialog) {
 			this.oDialog.destroy();
 		}
-		sap.ui.core.BusyIndicator.show(0);
+		coreLibrary.BusyIndicator.show(0);
 
 		this._createDialog(basePath, valueHelpInfo, curPos, this.businessDataType, bAddSpace, bReplaceWord, bValuehelpLinkPress);
 	};
@@ -62,8 +79,8 @@ sap.ui.define([
 	// createDialog > _createValueHelpDialog
 	valueHelpDialogProvider._createValueHelpDialogOLD = function(data, curPos, businessDataType) {
 		var that = this;
-		var model = new sap.ui.model.json.JSONModel(data.results);
-		this.oValueHelpDialog = new sap.ui.comp.valuehelpdialog.ValueHelpDialog({
+		var model = new JSONModel(data.results);
+		this.oValueHelpDialog = new ValueHelpDialog({
 			supportMultiselect: false,
 			supportRanges: false,
 			horizontalScrolling: false,
@@ -73,19 +90,19 @@ sap.ui.define([
 			beforeOpen: function() {
 				this.oValueHelpDialog.setModel(model, "valueHelpModel");
 				this.oValueHelpDialog.getTable()
-					.addColumn(new sap.ui.table.Column({
-						label: new sap.m.Text({
+					.addColumn(new TableColumn({
+						label: new Text({
 							text: that.oBundle.getText("valueHelpKeyColumnHeader")
 						}),
-						template: new sap.m.Text({
+						template: new Text({
 							text: "{valueHelpModel>Value}"
 						})
 					}))
-					.addColumn(new sap.ui.table.Column({
-						label: new sap.m.Text({
+					.addColumn(new TableColumn({
+						label: new Text({
 							text: that.oBundle.getText("valueHelpDescriptionColumnHeader")
 						}),
-						template: new sap.m.Text({
+						template: new Text({
 							text: "{valueHelpModel>Description}"
 						})
 					}))
@@ -136,8 +153,8 @@ sap.ui.define([
 			attributePath = attributePath = attributePath.replace(":","%3A");
 		}
         this.attributeName = expressionData.oData[attributePath].Name;
-		sap.ui.core.BusyIndicator.show(0);
-		this.oValueHelpDialog = new sap.ui.comp.valuehelpdialog.ValueHelpDialog({
+		coreLibrary.BusyIndicator.show(0);
+		this.oValueHelpDialog = new ValueHelpDialog({
 			supportMultiselect: false,
 			supportRanges: false,
 			horizontalScrolling: false,
@@ -156,7 +173,7 @@ sap.ui.define([
                     value = parseInt(value);
                 }
 				if (that.basicMode) {
-					var oValueHelpCtrl = sap.ui.getCore().byId("valueHelpCtrl");
+					var oValueHelpCtrl = Element.getElementById("valueHelpCtrl");
 					oValueHelpCtrl.setValue(value);
 					oValueHelpCtrl.fireChange();
 				} else{
@@ -179,7 +196,7 @@ sap.ui.define([
 				that.oValueHelpDialog.destroy();
 				that.focus(that.codeMirror);
 				that.oFilterBar.destroy();
-				sap.ui.core.BusyIndicator.hide();
+				coreLibrary.BusyIndicator.hide();
 			}
 		});
 	};
@@ -244,7 +261,7 @@ sap.ui.define([
 			cursorPos = this.codeMirror.findPosH(cursorPosition, sFormatedValue.length, "char", true);
 			this.codeMirror.setCursor(cursorPos); // set the cursor past the new selection
 		}
-		var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
 		this.getFormattingTokens(oExpressionLanguage);
 		this.ValueHelpRequested = false;
 	};
@@ -263,7 +280,7 @@ sap.ui.define([
 
 	// Utility function to update Modal Property of modal
 	valueHelpDialogProvider._updateModal = function(modalValue) {
-		var pop = sap.ui.getCore().byId("popover");
+		var pop = Element.getElementById("popover");
 		if (pop) {
 			pop.setModal(modalValue);
 		}
@@ -274,12 +291,12 @@ sap.ui.define([
      */
     valueHelpDialogProvider._formatDate = function(value) {
         // Date instance which is used to convert the selected date from calendar control to short format
-        var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+        var oLocale = Formatting.getLanguageTag();
         var oLocaleData = LocaleData.getInstance(oLocale);
  
-        this.oFormatDate = sap.ui.core.format.DateFormat.getInstance({
+        this.oFormatDate = DateFormat.getInstance({
                 pattern: oLocaleData.getDatePattern('short'),
-                calendarType: sap.ui.core.CalendarType.Gregorian
+                calendarType: coreLibrary.CalendarType.Gregorian
             },
             oLocale
         );
@@ -298,7 +315,7 @@ sap.ui.define([
 		} else {
 			this.entitySet = valueHelpInfo.metadata.entitySet;
 		}
-		this.oFilterBar = new sap.ui.comp.smartfilterbar.SmartFilterBar({
+		this.oFilterBar = new SmartFilterBar({
 			entitySet: that.entitySet,
 			enableBasicSearch: true,
 			advancedMode: true,
@@ -311,7 +328,7 @@ sap.ui.define([
 			},
 			controlConfiguration: [that._createControlConfiguration()]
 		});
-		var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
+		var oModel = new ODataModel(basePath);
 		this.oFilterBar.setModel(oModel);
 	};
 
@@ -319,7 +336,7 @@ sap.ui.define([
 	 * Creating the Control Configuration for the smartFilter of the valueHelp Dialog.
 	 */
 	valueHelpDialogProvider._createControlConfiguration = function() {
-		var aControlConfiguration = [new sap.ui.comp.smartfilterbar.ControlConfiguration({
+		var aControlConfiguration = [new ControlConfiguration({
 			hasValueHelpDialog: true,
 			key: "Value",
 			label: "Value",
@@ -327,7 +344,7 @@ sap.ui.define([
 			width: "100px",
 			index: 1
 
-		}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+		}), new ControlConfiguration({
 			hasValueHelpDialog: true,
 			key: "Description",
 			label: "Description",
@@ -335,7 +352,7 @@ sap.ui.define([
 			width: "100px",
 			index: 2
 
-		}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+		}), new ControlConfiguration({
 			hasValueHelpDialog: true,
 			key: "VocabularyId",
 			label: "VocabularyId",
@@ -343,7 +360,7 @@ sap.ui.define([
 			visible: false,
 			index: 3
 
-		}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+		}), new ControlConfiguration({
 			hasValueHelpDialog: true,
 			key: "DataObjectId",
 			label: "DataObjectId",
@@ -352,7 +369,7 @@ sap.ui.define([
 			groupId: "abc",
 			index: 4
 
-		}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+		}), new ControlConfiguration({
 			hasValueHelpDialog: true,
 			key: "AttributeId",
 			label: "AttributeId",
@@ -361,7 +378,7 @@ sap.ui.define([
 			index: 5
 
 		}),
-		 new sap.ui.comp.smartfilterbar.ControlConfiguration({
+		 new ControlConfiguration({
 	            hasValueHelpDialog: true,
 	            key: "Version",
 	            label: "Version",
@@ -402,7 +419,7 @@ sap.ui.define([
 			this._addValueHelpColumn(mEntities.valueHelp.properties[i], oTable);
 		}
 
-		var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
+		var oModel = new ODataModel(basePath);
 		oTable.setModel(oModel);
 		oTable.bindRows(mEntities.valueHelp.collection, null, aFilterParams);
 		oTable.getBinding("rows").attachDataReceived(this._handleRowsDataReceived, this);
@@ -422,13 +439,13 @@ sap.ui.define([
 
 	// Utility function to create columns for the table.
 	valueHelpDialogProvider._addValueHelpColumn = function(oColumName, oTable) {
-		var oColumn = new sap.ui.table.Column().setLabel(new sap.m.Label({
+		var oColumn = new TableColumn().setLabel(new Label({
 			text: oColumName
 		}));
 		if (oColumName === Constants.PROPERTY_VALUE) {
 			oColumn.setSortProperty(oColumName);
 		}
-		oTable.addColumn(oColumn.setTemplate(new sap.m.Text().bindProperty("text", oColumName)));
+		oTable.addColumn(oColumn.setTemplate(new Text().bindProperty("text", oColumName)));
 	};
 
 	/*
@@ -447,9 +464,9 @@ sap.ui.define([
 	valueHelpDialogProvider._fetchFilterParams = function(valueHelpInfo) {
 		var that = this;
 		var aSearchParams = [];
-		var aFilterParams = [new sap.ui.model.Filter("AttributeId", sap.ui.model.FilterOperator.EQ, this.attributeId),
-			new sap.ui.model.Filter("DataObjectId", sap.ui.model.FilterOperator.EQ, this.dataObjectId),
-			new sap.ui.model.Filter("VocabularyId", sap.ui.model.FilterOperator.EQ, this.vocabularyId)
+		var aFilterParams = [new Filter("AttributeId", FilterOperator.EQ, this.attributeId),
+			new Filter("DataObjectId", FilterOperator.EQ, this.dataObjectId),
+			new Filter("VocabularyId", FilterOperator.EQ, this.vocabularyId)
 		];
 
 		var aFilters = this.oFilterBar.getFilters();
@@ -459,8 +476,8 @@ sap.ui.define([
 			searchParam = this.oFilterBar.getParameters().custom.search;
 			aSearchParams = this._getSearchFilters(searchParam);
 			aFilters = that._formatFilterParams(aFilters);
-			aFilterParams.push(new sap.ui.model.Filter({
-				filters: [new sap.ui.model.Filter(aFilters), new sap.ui.model.Filter(aSearchParams)],
+			aFilterParams.push(new Filter({
+				filters: [new Filter(aFilters), new Filter(aSearchParams)],
 				and: true
 			}));
 		} else if (!jQuery.isEmptyObject(searchParam)) {
@@ -573,9 +590,9 @@ sap.ui.define([
 	valueHelpDialogProvider._manageParam = function(sPath, operator, value1, value2) {
 		var filterParam = [];
 		if (value1 && value2) {
-			filterParam = new sap.ui.model.Filter({
-				filters: [new sap.ui.model.Filter(sPath, sap.ui.model.FilterOperator.GT, value1),
-					new sap.ui.model.Filter(sPath, sap.ui.model.FilterOperator.LT, value2)
+			filterParam = new Filter({
+				filters: [new Filter(sPath, FilterOperator.GT, value1),
+					new Filter(sPath, FilterOperator.LT, value2)
 				],
 				and: true
 			});
@@ -585,9 +602,9 @@ sap.ui.define([
 
 	// Utility function to form the search filter params.
 	valueHelpDialogProvider._getSearchFilters = function(searchParam) {
-		return new sap.ui.model.Filter({
-			filters: [new sap.ui.model.Filter(Constants.PROPERTY_VALUE, sap.ui.model.FilterOperator.EQ, searchParam),
-				new sap.ui.model.Filter(Constants.PROPERTY_DESCRIPTION, sap.ui.model.FilterOperator.EQ, searchParam)
+		return new Filter({
+			filters: [new Filter(Constants.PROPERTY_VALUE, FilterOperator.EQ, searchParam),
+				new Filter(Constants.PROPERTY_DESCRIPTION, FilterOperator.EQ, searchParam)
 			],
 			and: false
 		});
@@ -595,12 +612,12 @@ sap.ui.define([
 
 	valueHelpDialogProvider.setValueStateFilter = function(oEvent) {
 		var sId = oEvent.getSource().sId;
-		this._valueFieldValue = sap.ui.getCore().byId(sId + "-filterItemControlA_-Value");
+		this._valueFieldValue = Element.getElementById(sId + "-filterItemControlA_-Value");
 		if (this._valueFieldValue) {
 			this._valueFieldValue.setValueState("None");
 			this._valueFieldValue.setValueStateText("");
 		}
-		this._valueFieldDescription = sap.ui.getCore().byId(sId + "-filterItemControlA_-Description");
+		this._valueFieldDescription = Element.getElementById(sId + "-filterItemControlA_-Description");
 		if (this._valueFieldDescription) {
 			this._valueFieldDescription.setValueState("None");
 			this._valueFieldDescription.setValueStateText("");

package/src/sap/rules/ui/providers/ValueHelpProvider.js

@@ -8,9 +8,10 @@
 // ValueList In/Out/InOut parameter to set data)
 // -----------------------------------------------------------------------------
 sap.ui.define([
-	'jquery.sap.global', 'sap/m/List', 'sap/m/PlacementType', 'sap/m/ResponsivePopover', 'sap/m/StandardListItem',
-	'sap/ui/comp/providers/ValueHelpProvider', 'sap/ui/model/json/JSONModel'
-], function(jQuery, List, PlacementType, ResponsivePopover, StandardListItem, ValueListProvider, JSONModel) {
+	'sap/m/List', 'sap/m/ResponsivePopover', 'sap/m/StandardListItem',
+	'sap/ui/comp/providers/ValueHelpProvider', 'sap/ui/model/json/JSONModel',"sap/m/MultiInput"
+	/*'sap/rules/ui/ExpressionAdvanced',*/ /*'sap/rules/ui/DecisionTableCellExpressionAdvanced'*/
+], function(List,ResponsivePopover, StandardListItem, ValueListProvider, JSONModel, MultiInput /*ExpressionAdvanced,*/ /*DecisionTableCellExpressionAdvanced*/) {
 	"use strict";
 
 	/**
@@ -42,7 +43,7 @@ sap.ui.define([
 		// First close the dialog, since when used in an aggregation - some model updates (setting IN/OUT params to ODataModel) destroy this
 		// instance/control!
 		this._onCancel();
-		if (this.oControl instanceof sap.m.MultiInput) {
+		if (this.oControl instanceof MultiInput) {
 			// Clearing typed text if value is not selected from suggestion list but rather from ValueHelpDialog
 			this.oControl.setValue("");
 			this.oControl.setTokens(aTokens);
@@ -74,7 +75,7 @@ sap.ui.define([
 					aRowData.push(oRowData);
 				}
 			}
-            if (this.oControl instanceof sap.rules.ui.ExpressionAdvanced) {
+            if (this.oControl /*instanceof ExpressionAdvanced TODO:Change by Harsh*/) {
                 this.oControl.setTextOnCursor(sKey, this._cursorPosition, this._bReplaceWord, this._businessDataType, this._bAddSpace);
                 // Manually trigger the change event on sapUI5 control since it doesn't do this internally on setValue!
                 this.oControl.fireChange({
@@ -93,7 +94,7 @@ sap.ui.define([
 		ValueListProvider.prototype._onInitialise.apply(this, [oControlEvent]);
 		var oExpressionAdvanced = this.oControl;
         var oPopOver = oExpressionAdvanced.getParent();
-		if (oExpressionAdvanced instanceof sap.rules.ui.DecisionTableCellExpressionAdvanced) {
+		if (oExpressionAdvanced /*instanceof DecisionTableCellExpressionAdvanced TODO:Change by Harsh*/) {
 			oExpressionAdvanced.setBusy(true);
 			oPopOver.setModal(true);
 		} else if (this._popover) {
@@ -105,7 +106,7 @@ sap.ui.define([
 		this.oValueHelpDialog.close();
 		var oExpressionAdvanced = this.oControl;
         var oPopOver = oExpressionAdvanced.getParent();
-		if (oExpressionAdvanced instanceof sap.rules.ui.DecisionTableCellExpressionAdvanced) {
+		if (oExpressionAdvanced /*instanceof DecisionTableCellExpressionAdvanced TODO:Change by Harsh*/) {
 			oPopOver.setModal(false);
 			oExpressionAdvanced.setBusy(false);
 		} else if (this._popover) {