Return-Path: 
 <dev-return-50782-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 30651 invoked from network); 19 Sep 2003 23:25:13 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 19 Sep 2003 23:25:13 -0000
Received: (qmail 69821 invoked by uid 500); 19 Sep 2003 23:24:53 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 69789 invoked by uid 500); 19 Sep 2003 23:24:52 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 69775 invoked from network); 19 Sep 2003 23:24:52 -0000
Received: from unknown (HELO lapis.wpds.com) (209.132.107.35)
  by daedalus.apache.org with SMTP; 19 Sep 2003 23:24:52 -0000
Received: from wpdslajolla.unigold ([209.132.105.36]) by lapis.wpds.com ;
 Fri, 19 Sep 2003 16:29:03 -800
Received: by localhost with Internet Mail Service (5.5.2653.19)
	id <SVQWPFYG>; Fri, 19 Sep 2003 16:24:17 -0700
Message-ID: <EC41DD8A52BBD7118FA800A0C9E56BB217925F@localhost>
From: "Shatzer, Larry" <Larry.Shatzer@Spirent.com>
To: "'dev@ant.apache.org'" <dev@ant.apache.org>
Subject: [PATCH] style patches
Date: Fri, 19 Sep 2003 16:24:16 -0700
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2653.19)
Content-Type: multipart/mixed;
	boundary="----_=_NextPart_000_01C37F05.249F75A0"
X-Server: High Performance Mail Server - http://surgemail.com
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

------_=_NextPart_000_01C37F05.249F75A0
Content-Type: text/plain;
	charset="iso-8859-1"

Fixes stuff like if( to if (, spaces between = and other corrections.

-- Larry


------_=_NextPart_000_01C37F05.249F75A0
Content-Type: text/plain;
	name="patch.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch.txt"

Index: =
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeployme=
ntTool.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee=
/AbstractHotDeploymentTool.java,v
retrieving revision 1.8
diff -u -r1.8 AbstractHotDeploymentTool.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeployme=
ntTool.java	19 Jul 2003 08:11:04 -0000	1.8
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeployme=
ntTool.java	19 Sep 2003 21:15:52 -0000
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -101,9 +101,9 @@
      *  @return A Path object representing the classpath to be used.
      */
     public Path createClasspath() {
-        if (classpath =3D=3D null)
+        if (classpath =3D=3D null) {
             classpath =3D new Path(task.getProject());
-
+        }
         return classpath.createPath();
     }
=20
@@ -126,14 +126,17 @@
      *  @exception org.apache.tools.ant.BuildException if the =
attributes are invalid or incomplete.
      */
     public void validateAttributes() throws BuildException {
-        if (task.getAction() =3D=3D null)
+        if (task.getAction() =3D=3D null) {
             throw new BuildException("The \"action\" attribute must be =
set");
+        }
=20
-        if (!isActionValid())
+        if (!isActionValid()) {
             throw new BuildException("Invalid action \"" + =
task.getAction() + "\" passed");
+        }
=20
-        if (classpath =3D=3D null)
+        if (classpath =3D=3D null) {
             throw new BuildException("The classpath attribute must be =
set");
+        }
     }
=20
     /**
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntR=
esolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/exte=
nsion/resolvers/AntResolver.java,v
retrieving revision 1.5
diff -u -r1.5 AntResolver.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntR=
esolver.java	19 Jul 2003 08:11:04 -0000	1.5
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntR=
esolver.java	19 Sep 2003 21:22:05 -0000
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -99,8 +99,7 @@
             final File dir =3D
                 m_antfile.getParentFile().getCanonicalFile();
             ant.setDir(dir);
-        }
-        catch (final IOException ioe) {
+        } catch (final IOException ioe) {
             throw new BuildException(ioe.getMessage(), ioe);
         }
=20
Index: =
src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/resolver/ApacheC=
atalogResolver.java,v
retrieving revision 1.11
diff -u -r1.11 ApacheCatalogResolver.java
--- =
src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java	=
19 Jul 2003 11:20:22 -0000	1.11
+++ =
src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java	=
19 Sep 2003 21:23:52 -0000
@@ -145,11 +145,9 @@
=20
         try {
             catalog.parseCatalog(file);
-        }
-        catch (MalformedURLException ex) {
+        } catch (MalformedURLException ex) {
             throw new BuildException(ex);
-        }
-        catch (IOException ex) {
+        } catch (IOException ex) {
             throw new BuildException(ex);
         }
     }
Index: src/main/org/apache/tools/ant/types/Assertions.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/Assertions.java,=
v
retrieving revision 1.5
diff -u -r1.5 Assertions.java
--- src/main/org/apache/tools/ant/types/Assertions.java	1 Aug 2003 =
06:44:35 -0000	1.5
+++ src/main/org/apache/tools/ant/types/Assertions.java	19 Sep 2003 =
21:33:31 -0000
@@ -187,7 +187,7 @@
      * @return
      */
     private int getFinalSize() {
-        return assertionList.size()+ =
(enableSystemAssertions!=3Dnull?1:0);
+        return assertionList.size() + (enableSystemAssertions !=3D =
null ? 1 : 0);
     }
=20
     /**
@@ -254,16 +254,16 @@
      * @throws CloneNotSupportedException
      */
     protected Object clone() throws CloneNotSupportedException {
-        Assertions that=3D(Assertions) super.clone();
-        that.assertionList=3D(ArrayList) assertionList.clone();
-		return that;
+        Assertions that =3D (Assertions) super.clone();
+        that.assertionList =3D (ArrayList) assertionList.clone();
+        return that;
     }
=20
     /**
      * base class for our assertion elements.
      */
=20
-    public static abstract class BaseAssertion {
+    public abstract static class BaseAssertion {
         private String packageName;
         private String className;
=20
Index: src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.j=
ava,v
retrieving revision 1.17
diff -u -r1.17 CBZip2OutputStream.java
--- src/main/org/apache/tools/bzip2/CBZip2OutputStream.java	24 Jul 2003 =
14:20:56 -0000	1.17
+++ src/main/org/apache/tools/bzip2/CBZip2OutputStream.java	19 Sep 2003 =
21:47:12 -0000
@@ -204,10 +204,10 @@
=20
                 weight[nNodes] =3D ((weight[n1] & 0xffffff00)
                                   + (weight[n2] & 0xffffff00))
-                    | (1 + (((weight[n1] & 0x000000ff) >
-                             (weight[n2] & 0x000000ff)) ?
-                            (weight[n1] & 0x000000ff) :
-                            (weight[n2] & 0x000000ff)));
+                    | (1 + (((weight[n1] & 0x000000ff)
+                            > (weight[n2] & 0x000000ff))
+                            ? (weight[n1] & 0x000000ff)
+                            : (weight[n2] & 0x000000ff)));
=20
                 parent[nNodes] =3D -1;
                 nHeap++;
@@ -1246,8 +1246,8 @@
                         vv =3D runningOrder[i];
                         j =3D i;
                         while ((ftab[((runningOrder[j - h]) + 1) << 8]
-                                - ftab[(runningOrder[j - h]) << 8]) >
-                               (ftab[((vv) + 1) << 8] - ftab[(vv) << =
8])) {
+                                - ftab[(runningOrder[j - h]) << 8])
+                                > (ftab[((vv) + 1) << 8] - ftab[(vv) =
<< 8])) {
                             runningOrder[j] =3D runningOrder[j - h];
                             j =3D j - h;
                             if (j <=3D (h - 1)) {
@@ -1535,9 +1535,9 @@
       because the number of elems to sort is
       usually small, typically <=3D 20.
     */
-    private int[] incs =3D { 1, 4, 13, 40, 121, 364, 1093, 3280,
+    private int[] incs =3D {1, 4, 13, 40, 121, 364, 1093, 3280,
                            9841, 29524, 88573, 265720,
-                           797161, 2391484 };
+                           797161, 2391484};
=20
     private void allocateCompressStructures () {
         int n =3D baseBlockSize * blockSize100k;
Index: src/main/org/apache/tools/ant/types/Commandline.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/Commandline.java=
,v
retrieving revision 1.31
diff -u -r1.31 Commandline.java
--- src/main/org/apache/tools/ant/types/Commandline.java	1 Aug 2003 =
06:44:36 -0000	1.31
+++ src/main/org/apache/tools/ant/types/Commandline.java	19 Sep 2003 =
21:43:27 -0000
@@ -303,11 +303,11 @@
      * Returns the executable and all defined arguments.
      */
     public String[] getCommandline() {
-        List commands=3Dnew LinkedList();
+        List commands =3D new LinkedList();
         ListIterator list =3D commands.listIterator();
         addCommandToList(list);
         final String[] result =3D new String[commands.size()];
-        return (String[])commands.toArray(result);
+        return (String[]) commands.toArray(result);
     }
=20
     /**
@@ -316,7 +316,7 @@
      * @since Ant 1.6
      */
     public void addCommandToList(ListIterator list) {
-        if(executable!=3Dnull) {
+        if (executable !=3D null) {
             list.add(executable);
         }
         addArgumentsToList(list);
@@ -331,7 +331,7 @@
         List result =3D new ArrayList(arguments.size() * 2);
         addArgumentsToList(result.listIterator());
         String [] res =3D new String[result.size()];
-        return (String[])result.toArray(res);
+        return (String[]) result.toArray(res);
     }
=20
     /**
@@ -374,7 +374,7 @@
         if (argument.indexOf("\"") > -1) {
             if (argument.indexOf("\'") > -1) {
                 throw new BuildException("Can\'t handle single and =
double"
-                        +" quotes in same argument");
+                        + " quotes in same argument");
             } else {
                 return '\'' + argument + '\'';
             }
Index: src/main/org/apache/tools/ant/types/CommandlineJava.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/CommandlineJava.=
java,v
retrieving revision 1.46
diff -u -r1.46 CommandlineJava.java
--- src/main/org/apache/tools/ant/types/CommandlineJava.java	13 Aug =
2003 15:14:31 -0000	1.46
+++ src/main/org/apache/tools/ant/types/CommandlineJava.java	19 Sep =
2003 21:48:58 -0000
@@ -96,13 +96,13 @@
     /**
      *  any assertions to make? Currently only supported in forked =
JVMs
      */
-    private Assertions assertions=3Dnull;
+    private Assertions assertions =3D null;
=20
     /**
      * Indicate whether it will execute a jar file or not, in this =
case
      * the first vm option must be a -jar and the 'executable' is a =
jar file.
      */
-     private boolean executeJar  =3D false;
+     private boolean executeJar =3D false;
=20
     /**
      * Specialized Environment class for System properties
@@ -119,13 +119,13 @@
          */
         public String[] getVariables() throws BuildException {
=20
-            List definitions=3Dnew LinkedList();
-            ListIterator list=3Ddefinitions.listIterator();
+            List definitions =3D new LinkedList();
+            ListIterator list =3D definitions.listIterator();
             addDefinitionsToList(list);
-            if(definitions.size()=3D=3D0) {
+            if (definitions.size() =3D=3D 0) {
                 return null;
             } else {
-                return (String[])definitions.toArray(new String[0]);
+                return (String[]) definitions.toArray(new String[0]);
             }
         }
=20
@@ -135,8 +135,8 @@
          */
         public void addDefinitionsToList(ListIterator listIt) {
             String[] props =3D super.getVariables();
-            if(props!=3Dnull) {
-                for (int i=3D0; i < props.length; i++) {
+            if (props !=3D null) {
+                for (int i =3D 0; i < props.length; i++) {
                     listIt.add("-D" + props[i]);
                 }
             }
@@ -379,12 +379,12 @@
      */
     public String[] getCommandline() {
         //create the list
-        List commands=3Dnew LinkedList();
+        List commands =3D new LinkedList();
         final ListIterator listIterator =3D commands.listIterator();
         //fill it
         addCommandsToList(listIterator);
         //convert to an array
-        return (String[])commands.toArray(new String[0]);
+        return (String[]) commands.toArray(new String[0]);
     }
=20
     /**
@@ -503,8 +503,8 @@
             size++;
         }
         //assertions take up space too
-        if(getAssertions()!=3Dnull) {
-            size+=3DgetAssertions().size();
+        if (getAssertions() !=3D null) {
+            size +=3D getAssertions().size();
         }
         return size;
     }
@@ -582,7 +582,7 @@
             if (bootclasspath !=3D null) {
                 c.bootclasspath =3D (Path) bootclasspath.clone();
             }
-            if( assertions !=3D null ) {
+            if (assertions !=3D null) {
                 c.assertions =3D (Assertions) assertions.clone();
             }
             return c;
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.jav=
a
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotn=
et/DotnetCompile.java,v
retrieving revision 1.14
diff -u -r1.14 DotnetCompile.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.jav=
a	14 Aug 2003 07:02:34 -0000	1.14
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.jav=
a	19 Sep 2003 22:26:57 -0000
@@ -394,7 +394,7 @@
      *@return    The Parameter to CSC
      */
     protected String getIncludeDefaultReferencesParameter() {
-        if(standardLib=3D=3Dnull) {
+        if (standardLib =3D=3D null) {
             return "/nostdlib" + (includeDefaultReferences ? "-" : =
"+");
         } else {
             return null;
@@ -868,7 +868,7 @@
         if (outputFile !=3D null && outputFile.isDirectory()) {
             throw new BuildException("destFile cannot be a =
directory");
         }
-        if(getExecutable()=3D=3Dnull) {
+        if (getExecutable() =3D=3D null) {
             throw new BuildException("There is no executable defined =
for this task");
         }
     }
Index: src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/email/EmailTa=
sk.java,v
retrieving revision 1.24
diff -u -r1.24 EmailTask.java
--- src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java	17 Sep =
2003 20:11:43 -0000	1.24
+++ src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java	19 Sep =
2003 22:28:25 -0000
@@ -602,8 +602,7 @@
             if (failOnError) {
                 throw e;
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
           log("Failed to send email", Project.MSG_WARN);
           if (failOnError) {
             throw new BuildException(e);
Index: src/main/org/apache/tools/ant/taskdefs/Exit.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
retrieving revision 1.24
diff -u -r1.24 Exit.java
--- src/main/org/apache/tools/ant/taskdefs/Exit.java	13 Sep 2003 =
12:58:33 -0000	1.24
+++ src/main/org/apache/tools/ant/taskdefs/Exit.java	19 Sep 2003 =
22:31:12 -0000
@@ -117,24 +117,24 @@
      */
     public void execute() throws BuildException {
         if (testIfCondition() && testUnlessCondition()) {
-            String text=3Dnull;
+            String text =3D null;
             if (message !=3D null && message.length() > 0) {
-                text=3Dmessage;
+                text =3D message;
             } else {
=20
-                if(getProject().getProperty(ifCondition) !=3D null) {
-                    text=3D"if=3D"+ifCondition;
+                if (getProject().getProperty(ifCondition) !=3D null) {
+                    text =3D "if=3D" + ifCondition;
                 }
-                if (unlessCondition!=3Dnull && =
unlessCondition.length()>0
+                if (unlessCondition !=3D null && =
unlessCondition.length() > 0
                         && getProject().getProperty(unlessCondition) =
=3D=3D null) {
                     if (text =3D=3D null) {
                         text =3D "";
                     } else {
-                        text+=3D" and ";
+                        text +=3D " and ";
                     }
-                    text+=3D"unless=3D"+unlessCondition;
+                    text +=3D "unless=3D" + unlessCondition;
                 } else {
-                    if(text=3D=3Dnull) {
+                    if (text =3D=3D null) {
                         text =3D "No message";
                     }
                 }
Index: src/main/org/apache/tools/ant/util/FileUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.55
diff -u -r1.55 FileUtils.java
--- src/main/org/apache/tools/ant/util/FileUtils.java	6 Sep 2003 =
07:03:33 -0000	1.55
+++ src/main/org/apache/tools/ant/util/FileUtils.java	19 Sep 2003 =
22:34:00 -0000
@@ -114,7 +114,7 @@
     /**
      * the granularity of timestamps under FAT
      */
-    public static final long FAT_FILE_TIMESTAMP_GRANULARITY=3D2000;
+    public static final long FAT_FILE_TIMESTAMP_GRANULARITY =3D 2000;
=20
=20
     // stolen from FilePathToURI of the Xerces-J team
@@ -1334,7 +1334,7 @@
     }
=20
     public long getFileTimestampGranularity() {
-        if(Os.isFamily("dos")) {
+        if (Os.isFamily("dos")) {
             return FAT_FILE_TIMESTAMP_GRANULARITY;
         } else {
             return 0;
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymen=
tTool.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee=
/GenericHotDeploymentTool.java,v
retrieving revision 1.10
diff -u -r1.10 GenericHotDeploymentTool.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymen=
tTool.java	19 Jul 2003 08:11:04 -0000	1.10
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymen=
tTool.java	19 Sep 2003 22:37:32 -0000
@@ -144,8 +144,9 @@
     public void validateAttributes() throws BuildException {
         super.validateAttributes();
=20
-        if (className =3D=3D null)
+        if (className =3D=3D null) {
             throw new BuildException("The classname attribute must be =
set");
+        }
     }
=20
     /**
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotn=
et/Ildasm.java,v
retrieving revision 1.1
diff -u -r1.1 Ildasm.java
--- src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java	=
6 Sep 2003 07:09:59 -0000	1.1
+++ src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java	=
19 Sep 2003 22:39:43 -0000
@@ -105,7 +105,7 @@
     /**
      * progress bar switch
      */
-    private boolean progressBar=3Dfalse;
+    private boolean progressBar =3D false;
=20
     /**
      * what is our encoding
@@ -116,45 +116,45 @@
      * /bytes flag for byte markup
      */
=20
-    private boolean bytes=3Dfalse;
+    private boolean bytes =3D false;
=20
     /**
      * line numbers? /linenum
      */
-    private boolean linenumbers=3Dfalse;
+    private boolean linenumbers =3D false;
=20
     /**
      * /raweh flag for raw exception handling
      */
-    private boolean rawExceptionHandling=3Dfalse;
+    private boolean rawExceptionHandling =3D false;
=20
     /**
      * show the source; /source
      */
-    private boolean showSource=3Dfalse;
+    private boolean showSource =3D false;
=20
     /**
      * /quoteallnames to quote all names
      */
-    private boolean quoteallnames=3Dfalse;
+    private boolean quoteallnames =3D false;
=20
     /**
      * /header for header information
      */
-    private boolean header=3Dfalse;
+    private boolean header =3D false;
=20
     /**
      * when false, sets the /noil attribute
      * to suppress assembly info
      */
-    private boolean assembler=3Dtrue;
+    private boolean assembler =3D true;
=20
     /**
      * include metadata
      * /tokens
      */
=20
-    private boolean metadata=3Dfalse;
+    private boolean metadata =3D false;
=20
     /**
      * what visibility do we want.
@@ -171,7 +171,7 @@
     /**
      * override for the executable
      */
-    private String executable=3D"ildasm";
+    private String executable =3D "ildasm";
=20
     /**
      *  name of the directory for resources to be created. We cannot =
control
@@ -338,13 +338,13 @@
      *  verify that source and dest are ok
      */
     private void validate() {
-        if(sourceFile=3D=3Dnull || !sourceFile.exists() || =
!sourceFile.isFile()) {
+        if (sourceFile =3D=3D null || !sourceFile.exists() || =
!sourceFile.isFile()) {
             throw new BuildException("invalid source");
         }
-        if(destFile=3D=3Dnull || destFile.isDirectory()) {
+        if (destFile =3D=3D null || destFile.isDirectory()) {
             throw new BuildException("invalid dest");
         }
-        if(resourceDir!=3Dnull
+        if (resourceDir !=3D null
                 && (!resourceDir.exists() || =
!resourceDir.isDirectory())) {
             throw new BuildException("invalid resource directory");
         }
@@ -355,13 +355,13 @@
      * @return
      */
     private boolean isDisassemblyNeeded() {
-        if(!destFile.exists()) {
+        if (!destFile.exists()) {
             return true;
         }
-        long sourceTime=3DsourceFile.lastModified();
-        long destTime=3DdestFile.lastModified();
-        return sourceTime>(destTime+ =
FileUtils.newFileUtils().getFileTimestampGranularity());
-           =20
+        long sourceTime =3D sourceFile.lastModified();
+        long destTime =3D destFile.lastModified();
+        return sourceTime > (destTime + =
FileUtils.newFileUtils().getFileTimestampGranularity());
+
     }
     /**
      * do the work
@@ -373,11 +373,11 @@
         command.setFailOnError(true);
         //fill in args
         command.addArgument("/text");
-        command.addArgument("/out=3D"+destFile.toString());
-        if(!progressBar) {
+        command.addArgument("/out=3D" + destFile.toString());
+        if (!progressBar) {
             command.addArgument("/nobar");
         }
-        if(linenumbers) {
+        if (linenumbers) {
             command.addArgument("/linenum");
         }
         if (showSource) {
@@ -395,7 +395,7 @@
         if (metadata) {
             command.addArgument("/tokens");
         }
-        command.addArgument("/item:",item);
+        command.addArgument("/item:", item);
         if (rawExceptionHandling) {
             command.addArgument("/raweh");
         }
@@ -403,16 +403,16 @@
         if (bytes) {
             command.addArgument("/bytes");
         }
-        command.addArgument("/vis:",visibility);
+        command.addArgument("/vis:", visibility);
=20
         //add the source file
         command.addArgument(sourceFile.getAbsolutePath());
=20
         //determine directory: resourceDir if set,
         //the dir of the destFile if not
-        File execDir=3DresourceDir;
-        if(execDir=3D=3Dnull) {
-            execDir=3DdestFile.getParentFile();
+        File execDir =3D resourceDir;
+        if (execDir =3D=3D null) {
+            execDir =3D destFile.getParentFile();
         }
         command.setDirectory(execDir);
=20
@@ -421,7 +421,7 @@
             command.runCommand();
         } catch (BuildException e) {
             //forcibly delete the output file in case of trouble
-            if(destFile.exists()) {
+            if (destFile.exists()) {
                 destFile.delete();
             }
             //then rethrow the exception
@@ -434,7 +434,7 @@
      * encoding options; the default is ascii
      */
     public static class EncodingTypes extends EnumeratedAttribute {
-        public final static String UNICODE=3D "unicode";
+        public final static String UNICODE =3D "unicode";
         public final static String UTF8 =3D "utf8";
         public final static String ASCII =3D "ascii";
         public String[] getValues() {
@@ -451,7 +451,7 @@
          * @return
          */
         public static String getEncodingOption(String enumValue) {
-            if(UNICODE.equals(enumValue)) {
+            if (UNICODE.equals(enumValue)) {
                 return "/unicode";
             }
             if (UTF8.equals(enumValue)) {
Index: src/main/org/apache/tools/ant/taskdefs/Java.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.76
diff -u -r1.76 Java.java
--- src/main/org/apache/tools/ant/taskdefs/Java.java	18 Sep 2003 =
14:21:41 -0000	1.76
+++ src/main/org/apache/tools/ant/taskdefs/Java.java	19 Sep 2003 =
22:49:43 -0000
@@ -157,8 +157,8 @@
             + "not compatible with spawn");
         }
         if (fork) {
-            if(perm !=3D null) {
-                log("Permissions can not be set this way in forked =
mode.",Project.MSG_WARN);
+            if (perm !=3D null) {
+                log("Permissions can not be set this way in forked =
mode.", Project.MSG_WARN);
             }
             log(cmdl.describeCommand(), Project.MSG_VERBOSE);
         } else {
Index: src/main/org/apache/tools/ant/util/JAXPUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/util/JAXPUtils.java,v
retrieving revision 1.8
diff -u -r1.8 JAXPUtils.java
--- src/main/org/apache/tools/ant/util/JAXPUtils.java	17 Jul 2003 =
15:44:44 -0000	1.8
+++ src/main/org/apache/tools/ant/util/JAXPUtils.java	19 Sep 2003 =
22:51:57 -0000
@@ -106,7 +106,7 @@
      *
      * @since Ant 1.5
      */
-    public synchronized static SAXParserFactory getParserFactory()
+    public static synchronized SAXParserFactory getParserFactory()
         throws BuildException {
=20
         if (parserFactory =3D=3D null) {
@@ -123,7 +123,7 @@
      *
      * @since Ant 1.6
      */
-    public synchronized static SAXParserFactory getNSParserFactory()
+    public static synchronized SAXParserFactory getNSParserFactory()
         throws BuildException {
=20
         if (nsParserFactory =3D=3D null) {
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/java=
cc/JJDoc.java,v
retrieving revision 1.4
diff -u -r1.4 JJDoc.java
--- src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java	=
13 Sep 2003 12:37:04 -0000	1.4
+++ src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java	=
19 Sep 2003 22:53:25 -0000
@@ -73,7 +73,7 @@
  *
  * @author Jene Jasper <a =
href=3D"mailto:jjasper@abz.nl">jjasper@abz.nl</a>
  * @author thomas.haas@softwired-inc.com
- * @author Michael Saunders=20
+ * @author Michael Saunders
  *         <a href=3D"mailto:michael@amtec.com">michael@amtec.com</a>
  */
 public class JJDoc extends Task {
@@ -156,12 +156,12 @@
         }
=20
         if (outputFile !=3D null) {
-            cmdl.createArgument() .setValue("-" + OUTPUT_FILE + ":"=20
+            cmdl.createArgument() .setValue("-" + OUTPUT_FILE + ":"
                                             + outputFile.replace('\\', =
'/'));
         }
=20
         // use the directory containing the target as the output =
directory
-        File javaFile =3D new File(createOutputFileName(target, =
outputFile,=20
+        File javaFile =3D new File(createOutputFileName(target, =
outputFile,
                                                       plainText));
=20
         if (javaFile.exists()
@@ -173,7 +173,7 @@
=20
         cmdl.createArgument().setValue(target.getAbsolutePath());
=20
-        cmdl.setClassname(JavaCC.getMainClass(javaccHome,=20
+        cmdl.setClassname(JavaCC.getMainClass(javaccHome,
                                               JavaCC.TASKDEF_TYPE_JJDOC=
));
=20
         final Path classpath =3D cmdl.createClasspath(getProject());
@@ -205,7 +205,7 @@
     private String createOutputFileName(File target, String =
optionalOutputFile,
                                         boolean plainText) {
         String suffix =3D DEFAULT_SUFFIX_HTML;
-        String javaccFile =3D =
target.getAbsolutePath().replace('\\','/');
+        String javaccFile =3D target.getAbsolutePath().replace('\\', =
'/');
=20
         if (plainText) {
             suffix =3D DEFAULT_SUFFIX_TEXT;
@@ -228,12 +228,12 @@
                 if (currentSuffix.equals(suffix)) {
                     optionalOutputFile =3D javaccFile + suffix;
                 } else {
-                    optionalOutputFile =3D javaccFile.substring(0, =
suffixPos)=20
+                    optionalOutputFile =3D javaccFile.substring(0, =
suffixPos)
                         + suffix;
                 }
             }
         } else {
-            optionalOutputFile =3D =
optionalOutputFile.replace('\\','/');
+            optionalOutputFile =3D optionalOutputFile.replace('\\', =
'/');
         }
=20
         return (getProject().getBaseDir() + "/" + optionalOutputFile)
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/java=
cc/JJTree.java,v
retrieving revision 1.27
diff -u -r1.27 JJTree.java
--- src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java	=
22 Aug 2003 15:25:44 -0000	1.27
+++ src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java	=
19 Sep 2003 22:54:05 -0000
@@ -308,7 +308,7 @@
                                         String outputDirectory) {
         optionalOutputFile =3D validateOutputFile(optionalOutputFile,
                                                 outputDirectory);
-        String jjtreeFile =3D =
target.getAbsolutePath().replace('\\','/');
+        String jjtreeFile =3D target.getAbsolutePath().replace('\\', =
'/');
=20
         if ((optionalOutputFile =3D=3D null) || =
optionalOutputFile.equals("")) {
             int filePos =3D jjtreeFile.lastIndexOf("/");
@@ -340,7 +340,7 @@
         return (outputDirectory + "/" + =
optionalOutputFile).replace('\\', '/');
     }
=20
- /*  =20
+ /*
   * Not used anymore
     private boolean isAbsolute(String fileName) {
         return (fileName.startsWith("/") || (new =
File(fileName).isAbsolute()));
@@ -357,8 +357,8 @@
      * @return
      * @throws BuildException
      */
-    private String validateOutputFile(String outputFile,=20
-                                      String outputDirectory)=20
+    private String validateOutputFile(String outputFile,
+                                      String outputDirectory)
         throws BuildException {
         if (outputFile =3D=3D null) {
             return null;
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/juni=
t/JUnitTestRunner.java,v
retrieving revision 1.41
diff -u -r1.41 JUnitTestRunner.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.ja=
va	27 Aug 2003 14:23:17 -0000	1.41
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.ja=
va	19 Sep 2003 22:55:12 -0000
@@ -318,16 +318,16 @@
                 }
                 perm =3D null;
             } else {
-                if(perm !=3D null) {
+                if (perm !=3D null) {
                     perm.setSecurityManager();
                 }
             }
-           =20
+
=20
             try {
                 suite.run(res);
             } finally {
-                if(perm !=3D null) {
+                if (perm !=3D null) {
                     perm.restoreSecurityManager();
                 }
                 if (savedOut !=3D null) {
@@ -413,7 +413,7 @@
             res.stop();
         }
     }
-   =20
+
     /**
      * Permissions for the test run.
      * @since Ant 1.6
Index: =
src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/selectors/Mappin=
gSelector.java,v
retrieving revision 1.8
diff -u -r1.8 MappingSelector.java
--- src/main/org/apache/tools/ant/types/selectors/MappingSelector.java	=
10 Sep 2003 15:29:25 -0000	1.8
+++ src/main/org/apache/tools/ant/types/selectors/MappingSelector.java	=
19 Sep 2003 22:58:17 -0000
@@ -78,7 +78,7 @@
      *
      */
     public MappingSelector() {
-        granularity=3D(int) =
FileUtils.newFileUtils().getFileTimestampGranularity();
+        granularity =3D (int) =
FileUtils.newFileUtils().getFileTimestampGranularity();
     }
=20
=20
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotn=
et/NetCommand.java,v
retrieving revision 1.23
diff -u -r1.23 NetCommand.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java	=
6 Sep 2003 07:09:59 -0000	1.23
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java	=
19 Sep 2003 22:59:27 -0000
@@ -244,7 +244,7 @@
         }
         File dir =3D owner.getProject().getBaseDir();
         if (directory !=3D null) {
-            dir=3Ddirectory;
+            dir =3D directory;
         }
=20
         ExecuteStreamHandler handler =3D new LogStreamHandler(owner,
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/perf=
orce/P4Submit.java,v
retrieving revision 1.15
diff -u -r1.15 P4Submit.java
--- =
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java	=
14 Jul 2003 22:13:18 -0000	1.15
+++ =
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java	=
19 Sep 2003 23:00:03 -0000
@@ -136,9 +136,8 @@
                             found =3D true;
                         }
                     }
-                }
-                        // NumberFormatException or =
ArrayOutOfBondsException could happen here
-                catch (Exception e) {
+                // NumberFormatException or ArrayOutOfBondsException =
could happen here
+                } catch (Exception e) {
                     String msg =3D "Failed to parse " + line  + "\n"
                             + " due to " + e.getMessage();
                     throw new BuildException(msg, e, getLocation());
Index: src/main/org/apache/tools/ant/PropertyHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/PropertyHelper.java,v
retrieving revision 1.8
diff -u -r1.8 PropertyHelper.java
--- src/main/org/apache/tools/ant/PropertyHelper.java	12 Sep 2003 =
20:56:45 -0000	1.8
+++ src/main/org/apache/tools/ant/PropertyHelper.java	19 Sep 2003 =
23:03:53 -0000
@@ -156,7 +156,7 @@
      *
      * @return the project's property helper.
      */
-    public synchronized static=20
+    public static synchronized
         PropertyHelper getPropertyHelper(Project project) {
         PropertyHelper helper
             =3D (PropertyHelper) =
project.getReference("ant.PropertyHelper");
Index: src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry=
.java,v
retrieving revision 1.10
diff -u -r1.10 RecorderEntry.java
--- src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java	19 Jul =
2003 08:10:59 -0000	1.10
+++ src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java	19 Sep =
2003 23:05:27 -0000
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,7 @@
     /** The output PrintStream to record to.  */
     private PrintStream out =3D null;
     /** The start time of the last know target.  */
-    private long targetStartTime =3D 0l;
+    private long targetStartTime =3D 0L;
     /** Strip task banners if true.  */
     private boolean emacsMode =3D false;
=20
Index: src/main/org/apache/tools/ant/types/optional/image/Scale.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/optional/image/S=
cale.java,v
retrieving revision 1.7
diff -u -r1.7 Scale.java
--- src/main/org/apache/tools/ant/types/optional/image/Scale.java	10 =
Sep 2003 15:29:25 -0000	1.7
+++ src/main/org/apache/tools/ant/types/optional/image/Scale.java	19 =
Sep 2003 23:08:54 -0000
@@ -83,7 +83,7 @@
     /**
      *  Sets the behaviour regarding the image proportions.
      */
-    public void setProportions(ProportionsAttribute pa){
+    public void setProportions(ProportionsAttribute pa) {
         proportions =3D pa.getValue();
     }
=20
@@ -139,23 +139,20 @@
             y_fl =3D (y_fl / image.getHeight());
         }
=20
-        if("width".equals(proportions)){
+        if ("width".equals(proportions)) {
             y_fl =3D x_fl;
-        }
-        else if("height".equals(proportions)){
+        } else if ("height".equals(proportions)) {
             x_fl =3D y_fl;
-        }
-        else if("fit".equals(proportions)){
-            x_fl =3D y_fl =3D Math.min(x_fl,y_fl);
-        }
-        else if("cover".equals(proportions)){
-            x_fl =3D y_fl =3D Math.max(x_fl,y_fl);
+        } else if ("fit".equals(proportions)) {
+            x_fl =3D y_fl =3D Math.min(x_fl, y_fl);
+        } else if ("cover".equals(proportions)) {
+            x_fl =3D y_fl =3D Math.max(x_fl, y_fl);
         }
=20
         pb.add(new Float(x_fl));
         pb.add(new Float(y_fl));
=20
-        log("\tScaling to " + (x_fl*100) + "% x " + (y_fl*100)+ "%");
+        log("\tScaling to " + (x_fl * 100) + "% x " + (y_fl * 100) + =
"%");
=20
         return JAI.create("scale", pb);
     }
Index: =
src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/=
SetProxy.java,v
retrieving revision 1.16
diff -u -r1.16 SetProxy.java
--- src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java	=
19 Jul 2003 11:20:20 -0000	1.16
+++ src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java	=
19 Sep 2003 23:11:04 -0000
@@ -301,17 +301,13 @@
             Method reset =3D c.getMethod("resetProperties", null);
             reset.invoke(null, null);
             return true;
-        }
-        catch (ClassNotFoundException cnfe) {
+        } catch (ClassNotFoundException cnfe) {
             return false;
-        }
-        catch (NoSuchMethodException e) {
+        } catch (NoSuchMethodException e) {
             return false;
-        }
-        catch (IllegalAccessException e) {
+        } catch (IllegalAccessException e) {
             return false;
-        }
-        catch (InvocationTargetException e) {
+        } catch (InvocationTargetException e) {
             return false;
         }
     }
Index: src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/condition/Soc=
ket.java,v
retrieving revision 1.8
diff -u -r1.8 Socket.java
--- src/main/org/apache/tools/ant/taskdefs/condition/Socket.java	10 Sep =
2003 18:20:46 -0000	1.8
+++ src/main/org/apache/tools/ant/taskdefs/condition/Socket.java	19 Sep =
2003 23:11:59 -0000
@@ -108,13 +108,11 @@
             s =3D new java.net.Socket(server, port);
         } catch (IOException e) {
             return false;
-        }
-        finally {
-          if (s !=3D null){
+        } finally {
+          if (s !=3D null) {
             try {
               s.close();
-            }
-            catch (IOException ioe){
+            } catch (IOException ioe) {
               // Intentionally left blank
             }
           }


------_=_NextPart_000_01C37F05.249F75A0
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
------_=_NextPart_000_01C37F05.249F75A0--