Rename CompositeExpression.expr property to exprTree
This commit is contained in:
parent
e1aa90c2ec
commit
cb6bc0a72b
@ -206,7 +206,7 @@ public class CompositeExpression implements Expression {
|
|||||||
/**
|
/**
|
||||||
* The underlying expression tree.
|
* The underlying expression tree.
|
||||||
*/
|
*/
|
||||||
private Expression expr;
|
private Expression exprTree;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a {@code CompositeExpression}
|
* Constructs a {@code CompositeExpression}
|
||||||
@ -215,7 +215,7 @@ public class CompositeExpression implements Expression {
|
|||||||
* @param expr the underlying expression
|
* @param expr the underlying expression
|
||||||
*/
|
*/
|
||||||
public CompositeExpression(Expression expr) {
|
public CompositeExpression(Expression expr) {
|
||||||
this.expr = expr;
|
exprTree = expr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -226,7 +226,7 @@ public class CompositeExpression implements Expression {
|
|||||||
* @return this {@code CompositeExpression}
|
* @return this {@code CompositeExpression}
|
||||||
*/
|
*/
|
||||||
public CompositeExpression and(Expression expr) {
|
public CompositeExpression and(Expression expr) {
|
||||||
this.expr = new And(this.expr, expr);
|
exprTree = new And(exprTree, expr);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -239,7 +239,7 @@ public class CompositeExpression implements Expression {
|
|||||||
* @return this {@code CompositeExpression}
|
* @return this {@code CompositeExpression}
|
||||||
*/
|
*/
|
||||||
public CompositeExpression or(Expression expr) {
|
public CompositeExpression or(Expression expr) {
|
||||||
this.expr = new Or(this.expr, expr);
|
exprTree = new Or(exprTree, expr);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -261,6 +261,6 @@ public class CompositeExpression implements Expression {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean interpret(Version version) {
|
public boolean interpret(Version version) {
|
||||||
return expr.interpret(version);
|
return exprTree.interpret(version);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user