Fixing the 'if condition' in Java 8. Issue #251

Top-Q · Nov 5, 2015 · 6d1a6f3 · 6d1a6f3
1 parent 99d553f
commit 6d1a6f3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...core-projects/jsystemAnt/src/main/resources/com/aqua/anttask/jsystem/ifScriptCondition.js b/...core-projects/jsystemAnt/src/main/resources/com/aqua/anttask/jsystem/ifScriptCondition.js
@@ -9,17 +9,18 @@ self.setValue(result); // the result for the condition
  * Parse a given expression, using optional operators array
  */
 function parseExpression(expression, optionalOperators){
+	// This is done for compatability with Java 8
+	expression = expression.replaceAll(separator,"");
 	for (var i=0 ; i<optionalOperators.length ; i++){
 		if (expression.contains(optionalOperators[i])){
 			var temp = expression.split(optionalOperators[i]);
 			if (temp.length < 2){
 				return false;
 			}
-			
+
 			return [temp[0].trim(),temp[1].trim()];
 		}
 	}
-
 	return false;
 }
 
@@ -39,7 +40,7 @@ function getComparisonTypeAndRest(expression){
  * Evaluate a mathematical comparison expression
  */
 function evaluateMath(expression){
-	var numbers = parseExpression(expression, ['>=','<=','=','!=','<','>']);
+	var numbers = parseExpression(expression, ['>=','<=','!=','=','<','>']);
 
 	if (numbers == false || isNaN(numbers[0]) || isNaN(numbers[1])){
 		print("Not a mathematical expression: " + expression);
@@ -49,6 +50,8 @@ function evaluateMath(expression){
 	numbers[0] = parseFloat(numbers[0]);
 	numbers[1] = parseFloat(numbers[1]);
 
+	// This is done for compatability with Java 8
+	expression = expression.replaceAll(separator,"");
 	if (expression.contains(">=")){
 		return (numbers[0] >= numbers[1]);
 	}
@@ -84,6 +87,8 @@ function evaluateString(expression,isCaseSensitive){
 		numbers[0] = numbers[0].toLowerCase();
 		numbers[1] = numbers[1].toLowerCase();
 	}
+	// This is done for compatability with Java 8
+	expression = expression.replaceAll(separator,"");
 	if (expression.contains("NOT_EQUALS")){
 		return (!numbers[0].equals(numbers[1]));
 	}

diff --git a/jsystem-core-projects/jsystemApp/scripts/ifScriptCondition.js b/jsystem-core-projects/jsystemApp/scripts/ifScriptCondition.js
@@ -9,17 +9,18 @@ self.setValue(result); // the result for the condition
  * Parse a given expression, using optional operators array
  */
 function parseExpression(expression, optionalOperators){
+	// This is done for compatability with Java 8
+	expression = expression.replaceAll(separator,"");
 	for (var i=0 ; i<optionalOperators.length ; i++){
 		if (expression.contains(optionalOperators[i])){
 			var temp = expression.split(optionalOperators[i]);
 			if (temp.length < 2){
 				return false;
 			}
-			
+
 			return [temp[0].trim(),temp[1].trim()];
 		}
 	}
-
 	return false;
 }
 
@@ -39,7 +40,7 @@ function getComparisonTypeAndRest(expression){
  * Evaluate a mathematical comparison expression
  */
 function evaluateMath(expression){
-	var numbers = parseExpression(expression, ['>=','<=','=','!=','<','>']);
+	var numbers = parseExpression(expression, ['>=','<=','!=','=','<','>']);
 
 	if (numbers == false || isNaN(numbers[0]) || isNaN(numbers[1])){
 		print("Not a mathematical expression: " + expression);
@@ -49,6 +50,8 @@ function evaluateMath(expression){
 	numbers[0] = parseFloat(numbers[0]);
 	numbers[1] = parseFloat(numbers[1]);
 
+	// This is done for compatability with Java 8
+	expression = expression.replaceAll(separator,"");
 	if (expression.contains(">=")){
 		return (numbers[0] >= numbers[1]);
 	}
@@ -84,6 +87,8 @@ function evaluateString(expression,isCaseSensitive){
 		numbers[0] = numbers[0].toLowerCase();
 		numbers[1] = numbers[1].toLowerCase();
 	}
+	// This is done for compatability with Java 8
+	expression = expression.replaceAll(separator,"");
 	if (expression.contains("NOT_EQUALS")){
 		return (!numbers[0].equals(numbers[1]));
 	}