mbenson 2004/12/16 08:51:11
Modified: src/main/org/apache/tools/ant ComponentHelper.java
Log:
Same LOC count, minus 2 method calls, cute implementation. ;)
Revision Changes Path
1.42 +3 -3 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ComponentHelper.java 16 Dec 2004 14:57:10 -0000 1.41
+++ ComponentHelper.java 16 Dec 2004 16:51:11 -0000 1.42
@@ -585,9 +585,9 @@
*/
private boolean sameDefinition(
AntTypeDefinition def, AntTypeDefinition old) {
- return ((validDefinition(def) && validDefinition(old)
- && def.sameDefinition(old, project))
- || !(validDefinition(def) | validDefinition(old)));
+ boolean defValid = validDefinition(def);
+ boolean sameValidity = !(defValid | validDefinition(old));
+ return sameValidity && (!defValid || def.sameDefinition(old,
project));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]