diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
index 38c784726..3c07e4dcc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2006 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -32,25 +32,24 @@ import org.apache.tools.ant.taskdefs.UpToDate;
  * @since Ant 1.4
  */
 public abstract class ConditionBase extends ProjectComponent {
-    
-    
+
     /**
      * name of the component
      */
     private String taskName="condition";
-    
+
     /**
      *
      */
     private Vector conditions = new Vector();
-    
+
     /**
      * simple constructor.
      */
     protected ConditionBase() {
         taskName = "component";
     }
-    
+
     /**
      * constructor that takes the name of the task
      * in the task name
@@ -60,7 +59,7 @@ public abstract class ConditionBase extends ProjectComponent {
     protected ConditionBase(String taskName) {
         this.taskName = taskName;
     }
-    
+
     /**
      * Count the conditions.
      *
@@ -70,7 +69,7 @@ public abstract class ConditionBase extends ProjectComponent {
     protected int countConditions() {
         return conditions.size();
     }
-    
+
     /**
      * Iterate through all conditions.
      *
@@ -80,7 +79,7 @@ public abstract class ConditionBase extends ProjectComponent {
     protected final Enumeration getConditions() {
         return conditions.elements();
     }
-    
+
     /**
      * Sets the name to use in logging messages.
      *
@@ -91,7 +90,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void setTaskName(String name) {
         this.taskName = name;
     }
-    
+
     /**
      * Returns the name to use in logging messages.
      *
@@ -101,7 +100,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public String getTaskName() {
         return taskName;
     }
-    
+
     /**
      * Add an <available> condition.
      * @param a an available condition
@@ -110,7 +109,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addAvailable(Available a) {
         conditions.addElement(a);
     }
-    
+
     /**
      * Add an <checksum> condition.
      *
@@ -120,7 +119,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addChecksum(Checksum c) {
         conditions.addElement(c);
     }
-    
+
     /**
      * Add an <uptodate> condition.
      *
@@ -130,7 +129,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addUptodate(UpToDate u) {
         conditions.addElement(u);
     }
-    
+
     /**
      * Add an <not> condition "container".
      *
@@ -140,7 +139,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addNot(Not n) {
         conditions.addElement(n);
     }
-    
+
     /**
      * Add an <and> condition "container".
      *
@@ -150,7 +149,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addAnd(And a) {
         conditions.addElement(a);
     }
-    
+
     /**
      * Add an <or> condition "container".
      *
@@ -160,7 +159,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addOr(Or o) {
         conditions.addElement(o);
     }
-    
+
     /**
      * Add an <equals> condition.
      *
@@ -170,7 +169,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addEquals(Equals e) {
         conditions.addElement(e);
     }
-    
+
     /**
      * Add an <os> condition.
      *
@@ -180,7 +179,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addOs(Os o) {
         conditions.addElement(o);
     }
-    
+
     /**
      * Add an <isset> condition.
      *
@@ -190,7 +189,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsSet(IsSet i) {
         conditions.addElement(i);
     }
-    
+
     /**
      * Add an <http> condition.
      *
@@ -200,7 +199,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addHttp(Http h) {
         conditions.addElement(h);
     }
-    
+
     /**
      * Add a <socket> condition.
      *
@@ -210,7 +209,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addSocket(Socket s) {
         conditions.addElement(s);
     }
-    
+
     /**
      * Add a <filesmatch> condition.
      *
@@ -220,7 +219,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addFilesMatch(FilesMatch test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add a <contains> condition.
      *
@@ -230,7 +229,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addContains(Contains test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add a <istrue> condition.
      *
@@ -240,7 +239,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsTrue(IsTrue test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add a <isfalse> condition.
      *
@@ -250,7 +249,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsFalse(IsFalse test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an <isreference> condition.
      *
@@ -260,7 +259,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsReference(IsReference i) {
         conditions.addElement(i);
     }
-    
+
     /**
      * Add an <typefound> condition.
      * @param test a TypeFound condition
@@ -269,7 +268,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addTypeFound(TypeFound test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an <isfailure> condition.
      *
@@ -278,7 +277,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsFailure(IsFailure test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an <isfileselected> condition.
      * @param test the condition
@@ -286,7 +285,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsFileSelected(IsFileSelected test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an <isreachable> condition.
      *
@@ -296,7 +295,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsReachable(IsReachable test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an <issigned> condition.
      *
@@ -306,7 +305,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addIsSigned(IsSigned test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an <parsersupports> condition.
      *
@@ -316,7 +315,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addParserSupports(ParserSupports test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add a <ResourcesMatch> condition.
      *
@@ -326,8 +325,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addResourcesMatch(ResourcesMatch test) {
         conditions.addElement(test);
     }
-    
-    
+
     /**
      * Add an <xor> condition.
      *
@@ -337,7 +335,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addXor(Xor test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add a  <hasMethod> condition.
      *
@@ -347,8 +345,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addHasMethod(HasMethod test) {
         add(test);
     }
-    
-    
+
     /**
      * Add an <antversion> condition.
      *
@@ -358,7 +355,7 @@ public abstract class ConditionBase extends ProjectComponent {
     public void addAntVersion(AntVersion test) {
         conditions.addElement(test);
     }
-    
+
     /**
      * Add an arbitrary condition
      * @param c a  condition