I see Ant folks are putting pressure to rename the _x fields :-)
very gentle pressure ;)
If it can help valuable people from Ant (and others) getting involved, I'm
200% ok to move toward the standard Sun naming convention.
BTW, Kevin, I don't see your patch... is it only me?
Strange in my sent items it has an attachment, here's the patch inline:
Index: AndFilter.java
===================================================================
--- AndFilter.java (revision 538181)
+++ AndFilter.java (working copy)
@@ -18,20 +18,20 @@
package org.apache.ivy.util.filter;
public class AndFilter implements Filter {
- private Filter _op1;
- private Filter _op2;
+ private Filter operand1;
+ private Filter operand2;
- public AndFilter(Filter op1, Filter op2) {
- _op1 = op1;
- _op2 = op2;
+ public AndFilter(final Filter op1, final Filter op2) {
+ this.operand1 = op1;
+ this.operand2 = op2;
}
public Filter getOp1() {
- return _op1;
+ return operand1;
}
public Filter getOp2() {
- return _op2;
+ return operand2;
}
public boolean accept(Object o) {
- return _op1.accept(o) && _op2.accept(o);
+ return operand1.accept(o) && operand2.accept(o);
}
-}
+}
\ No newline at end of file
Index: NoFilter.java
===================================================================
--- NoFilter.java (revision 538181)
+++ NoFilter.java (working copy)
@@ -27,4 +27,4 @@
return true;
}
-}
+}
\ No newline at end of file
Index: NotFilter.java
===================================================================
--- NotFilter.java (revision 538181)
+++ NotFilter.java (working copy)
@@ -18,15 +18,15 @@
package org.apache.ivy.util.filter;
public class NotFilter implements Filter {
- private Filter _op;
+ private Filter operand;
- public NotFilter(Filter op) {
- _op = op;
+ public NotFilter(final Filter operand) {
+ this.operand = operand;
}
public Filter getOp() {
- return _op;
+ return operand;
}
public boolean accept(Object o) {
- return !_op.accept(o);
+ return !operand.accept(o);
}
-}
+}
\ No newline at end of file
Index: OrFilter.java
===================================================================
--- OrFilter.java (revision 538181)
+++ OrFilter.java (working copy)
@@ -18,20 +18,20 @@
package org.apache.ivy.util.filter;
public class OrFilter implements Filter {
- private Filter _op1;
- private Filter _op2;
+ private Filter operand1;
+ private Filter operand2;
- public OrFilter(Filter op1, Filter op2) {
- _op1 = op1;
- _op2 = op2;
+ public OrFilter(final Filter op1, final Filter op2) {
+ this.operand1 = op1;
+ this.operand2 = op2;
}
public Filter getOp1() {
- return _op1;
+ return operand1;
}
public Filter getOp2() {
- return _op2;
+ return operand2;
}
public boolean accept(Object o) {
- return _op1.accept(o) || _op2.accept(o);
+ return operand1.accept(o) || operand2.accept(o);
}
-}
+}
\ No newline at end of file
