diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 67314529b..ab1d81b7b 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -490,7 +490,7 @@ public class ProjectHelper {
                 fragments.addElement(value.substring(pos + 1, pos + 2));
                 prev = pos + 2;
                 */
-                if(value.charAt(pos + 1) == '$') {
+                if (value.charAt(pos + 1) == '$') {
                     //backwards compatibility two $ map to one mode
                     fragments.addElement("$");
                     prev = pos + 2;
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
index 60855b1e3..e38819533 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
@@ -302,7 +302,7 @@ public class ChangeLogTask extends Task {
             final CVSEntry[] entrySet = parser.getEntrySetAsArray();
             final CVSEntry[] filteredEntrySet = filterEntrySet(entrySet);
 
-            replaceAuthorIdWithName(userList,filteredEntrySet);
+            replaceAuthorIdWithName(userList, filteredEntrySet);
 
             writeChangeLog(filteredEntrySet);
 
@@ -393,7 +393,7 @@ public class ChangeLogTask extends Task {
      */
     private void replaceAuthorIdWithName(final Properties userList,
                                          final CVSEntry[] entrySet) {
-        for (int i = 0; i < entrySet.length; i++ ) {
+        for (int i = 0; i < entrySet.length; i++) {
 
             final CVSEntry entry = entrySet[ i ];
             if (userList.containsKey(entry.getAuthor())) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
index 94ba4c81a..81818f23f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
@@ -94,9 +94,10 @@ public class VAJImportServlet extends VAJToolsServlet {
                       getBooleanParam(CLASSES_PARAM, false),
                       getBooleanParam(RESOURCES_PARAM, true),
                       getBooleanParam(SOURCES_PARAM, true),
-                      false // no default excludes, because they
-              // are already added on client side
-                      //            getBooleanParam(DEFAULT_EXCLUDES_PARAM, true)
-                      );
+                      false); 
+        // no default excludes, because they
+        // are already added on client side
+        // getBooleanParam(DEFAULT_EXCLUDES_PARAM, true)
+                      
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
index e6feb24f6..964a8f0a4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
@@ -96,7 +96,7 @@ public class SetProxy extends Task {
     /**
      * list of non proxy hosts
      */ 
-    private String nonProxyHosts=null;
+    private String nonProxyHosts = null;
 
     /**
      * set a proxy host. the port should be defined too
@@ -155,14 +155,14 @@ public class SetProxy extends Task {
      */
 
     public void applyWebProxySettings() {
-        boolean settingsChanged=false;
-        boolean enablingProxy=false;
+        boolean settingsChanged = false;
+        boolean enablingProxy = false;
         Properties sysprops = System.getProperties();
-        if(proxyHost!=null) {
-            settingsChanged=true;
-            if (proxyHost.length()!=0) {
+        if (proxyHost != null) {
+            settingsChanged = true;
+            if (proxyHost.length() != 0) {
                 traceSettingInfo();
-                enablingProxy=true;
+                enablingProxy = true;
                 sysprops.put("http.proxyHost", proxyHost);
                 String portString = Integer.toString(proxyPort);
                 sysprops.put("http.proxyPort", portString);
@@ -170,12 +170,12 @@ public class SetProxy extends Task {
                 sysprops.put("https.proxyPort", portString);
                 sysprops.put("ftp.proxyHost", proxyHost);
                 sysprops.put("ftp.proxyPort", portString);
-                if(nonProxyHosts!=null) {
+                if (nonProxyHosts != null) {
                     sysprops.put("http.nonProxyHosts", nonProxyHosts);
                     sysprops.put("ftp.nonProxyHosts", nonProxyHosts);
                 }                    
             } else {
-                log("resetting http proxy",Project.MSG_VERBOSE);
+                log("resetting http proxy", Project.MSG_VERBOSE);
                 sysprops.remove("http.proxyPort");
                 sysprops.remove("https.proxyHost");
                 sysprops.remove("https.proxyPort");
@@ -186,13 +186,13 @@ public class SetProxy extends Task {
 
         //socks
         if (socksProxyHost != null) {
-            settingsChanged=true;
-            if(socksProxyHost.length()!=0) {
-                enablingProxy=true;
+            settingsChanged = true;
+            if (socksProxyHost.length() != 0) {
+                enablingProxy = true;
                 sysprops.put("socksProxyHost", socksProxyHost);
                 sysprops.put("socksProxyPort", Integer.toString(socksProxyPort));
             } else {
-                log("resetting socks proxy",Project.MSG_VERBOSE);
+                log("resetting socks proxy", Project.MSG_VERBOSE);
                 sysprops.remove("socksProxyHost");
                 sysprops.remove("socksProxyPort");
             }
@@ -200,7 +200,7 @@ public class SetProxy extends Task {
         
 
         //for Java1.1 we need to tell the system that the settings are new
-        if(settingsChanged && project.getJavaVersion() == Project.JAVA_1_1) {
+        if (settingsChanged && project.getJavaVersion() == Project.JAVA_1_1) {
             legacyResetProxySettingsCall(enablingProxy);
         }
     }
@@ -210,7 +210,7 @@ public class SetProxy extends Task {
      */ 
     private void traceSettingInfo() {
         log("Setting proxy to " 
-                + (proxyHost!=null?proxyHost:"''") 
+                + (proxyHost != null ? proxyHost : "''") 
                 + ":" + proxyPort,
                 Project.MSG_VERBOSE);
     }