From 77f7ac6ec40f0df6a4130087ac01d04576ced475 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 30 Jul 2012 07:42:23 +0000 Subject: [PATCH] Simple classes do not need getters --- .../java/forge/util/closures/Predicate.java | 47 +++++++------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/src/main/java/forge/util/closures/Predicate.java b/src/main/java/forge/util/closures/Predicate.java index caf4971be01..7652935e8d3 100644 --- a/src/main/java/forge/util/closures/Predicate.java +++ b/src/main/java/forge/util/closures/Predicate.java @@ -1002,17 +1002,14 @@ final class BridgeToInstance extends Predicate { * * @param */ +/* PERFORMANCE CRITICAL - DO NOT GENERATE GETTERS HERE*/ class Node extends Predicate { + /* PERFORMANCE CRITICAL - DO NOT GENERATE GETTERS HERE*/ private final PredicatesOp operator; - /** - * - */ - private final Predicate filter1; - /** - * - */ - private final Predicate filter2; - + protected final Predicate filter1; + protected final Predicate filter2; + /* PERFORMANCE CRITICAL - DO NOT GENERATE GETTERS HERE*/ + /** * * Node. @@ -1031,39 +1028,27 @@ class Node extends Predicate { public boolean isTrue(final T card) { switch (this.operator) { case AND: - return this.getFilter1().isTrue(card) && this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) && this.filter2.isTrue(card); case GT: - return this.getFilter1().isTrue(card) && !this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) && !this.filter2.isTrue(card); case LT: - return !this.getFilter1().isTrue(card) && this.getFilter2().isTrue(card); + return !this.filter1.isTrue(card) && this.filter2.isTrue(card); case NAND: - return !(this.getFilter1().isTrue(card) && this.getFilter2().isTrue(card)); + return !(this.filter1.isTrue(card) && this.filter2.isTrue(card)); case OR: - return this.getFilter1().isTrue(card) || this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) || this.filter2.isTrue(card); case NOR: - return !(this.getFilter1().isTrue(card) || this.getFilter2().isTrue(card)); + return !(this.filter1.isTrue(card) || this.filter2.isTrue(card)); case XOR: - return this.getFilter1().isTrue(card) ^ this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) ^ this.filter2.isTrue(card); case EQ: - return this.getFilter1().isTrue(card) == this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) == this.filter2.isTrue(card); default: return false; } } - /** - * @return the filter1 - */ - public Predicate getFilter1() { - return filter1; - } - /** - * @return the filter2 - */ - public Predicate getFilter2() { - return filter2; - } } /** @@ -1086,7 +1071,7 @@ final class NodeOr extends Node { @Override public boolean isTrue(final T card) { - return this.getFilter1().isTrue(card) || this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) || this.filter2.isTrue(card); } } @@ -1110,7 +1095,7 @@ final class NodeAnd extends Node { @Override public boolean isTrue(final T card) { - return this.getFilter1().isTrue(card) && this.getFilter2().isTrue(card); + return this.filter1.isTrue(card) && this.filter2.isTrue(card); } }