From cb6bc0a72b56bf54c9400fddcc1d18d78bd19517 Mon Sep 17 00:00:00 2001 From: Zafar Khaja Date: Tue, 21 Oct 2014 16:22:13 +0300 Subject: [PATCH] Rename CompositeExpression.expr property to exprTree --- .../zafarkhaja/semver/expr/CompositeExpression.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/zafarkhaja/semver/expr/CompositeExpression.java b/src/main/java/com/github/zafarkhaja/semver/expr/CompositeExpression.java index 8a6c4f8..f295c08 100644 --- a/src/main/java/com/github/zafarkhaja/semver/expr/CompositeExpression.java +++ b/src/main/java/com/github/zafarkhaja/semver/expr/CompositeExpression.java @@ -206,7 +206,7 @@ public class CompositeExpression implements Expression { /** * The underlying expression tree. */ - private Expression expr; + private Expression exprTree; /** * Constructs a {@code CompositeExpression} @@ -215,7 +215,7 @@ public class CompositeExpression implements Expression { * @param expr the underlying expression */ public CompositeExpression(Expression expr) { - this.expr = expr; + exprTree = expr; } /** @@ -226,7 +226,7 @@ public class CompositeExpression implements Expression { * @return this {@code CompositeExpression} */ public CompositeExpression and(Expression expr) { - this.expr = new And(this.expr, expr); + exprTree = new And(exprTree, expr); return this; } @@ -239,7 +239,7 @@ public class CompositeExpression implements Expression { * @return this {@code CompositeExpression} */ public CompositeExpression or(Expression expr) { - this.expr = new Or(this.expr, expr); + exprTree = new Or(exprTree, expr); return this; } @@ -261,6 +261,6 @@ public class CompositeExpression implements Expression { */ @Override public boolean interpret(Version version) { - return expr.interpret(version); + return exprTree.interpret(version); } }