|
|
@@ -139,7 +139,7 @@ public class Compare extends Expr {
|
|
|
return ((Comparable)leftValue).compareTo((Comparable)rightValue) > 0;
|
|
|
}
|
|
|
|
|
|
- return checkType(leftValue, rightValue);
|
|
|
+ return checkComparisonValue(leftValue, rightValue);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
|
|
@@ -172,7 +172,7 @@ public class Compare extends Expr {
|
|
|
return ((Comparable)leftValue).compareTo((Comparable)rightValue) >= 0;
|
|
|
}
|
|
|
|
|
|
- return checkType(leftValue, rightValue);
|
|
|
+ return checkComparisonValue(leftValue, rightValue);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
|
|
@@ -205,7 +205,7 @@ public class Compare extends Expr {
|
|
|
return ((Comparable)leftValue).compareTo((Comparable)rightValue) < 0;
|
|
|
}
|
|
|
|
|
|
- return checkType(leftValue, rightValue);
|
|
|
+ return checkComparisonValue(leftValue, rightValue);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
|
|
@@ -238,7 +238,7 @@ public class Compare extends Expr {
|
|
|
return ((Comparable)leftValue).compareTo((Comparable)rightValue) <= 0;
|
|
|
}
|
|
|
|
|
|
- return checkType(leftValue, rightValue);
|
|
|
+ return checkComparisonValue(leftValue, rightValue);
|
|
|
}
|
|
|
|
|
|
private int getMaxType(Number obj1, Number obj2) {
|
|
|
@@ -274,7 +274,7 @@ public class Compare extends Expr {
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- private Boolean checkType(Object leftValue, Object rightValue) {
|
|
|
+ private Boolean checkComparisonValue(Object leftValue, Object rightValue) {
|
|
|
if (leftValue == null) {
|
|
|
throw new TemplateException("The operation target on the left side of \"" + op.value() + "\" can not be null", location);
|
|
|
}
|