ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r810793 - /ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
Date Thu, 03 Sep 2009 07:26:20 GMT
Author: bodewig
Date: Thu Sep  3 07:26:20 2009
New Revision: 810793

URL: http://svn.apache.org/viewvc?rev=810793&view=rev
Log:
whitespace and make method paarameters final

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java?rev=810793&r1=810792&r2=810793&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java Thu Sep
 3 07:26:20 2009
@@ -141,20 +141,20 @@
         if (filtersCount > 0) {
             boolean success = false;
             try {
-            for (int i = 0; i < filtersCount; i++) {
-                Object o = finalFilters.elementAt(i);
+                for (int i = 0; i < filtersCount; i++) {
+                    Object o = finalFilters.elementAt(i);
 
-                if (o instanceof AntFilterReader) {
-                    instream =
-                        expandReader((AntFilterReader) finalFilters.elementAt(i),
-                                     instream, classLoadersToCleanUp);
-                } else if (o instanceof ChainableReader) {
-                    setProjectOnObject(o);
-                    instream = ((ChainableReader) o).chain(instream);
-                    setProjectOnObject(instream);
+                    if (o instanceof AntFilterReader) {
+                        instream =
+                            expandReader((AntFilterReader) finalFilters.elementAt(i),
+                                         instream, classLoadersToCleanUp);
+                    } else if (o instanceof ChainableReader) {
+                        setProjectOnObject(o);
+                        instream = ((ChainableReader) o).chain(instream);
+                        setProjectOnObject(instream);
+                    }
                 }
-            }
-            success = true;
+                success = true;
             } finally {
                 if (!success && classLoadersToCleanUp.size() > 0) {
                     cleanUpClassLoaders(classLoadersToCleanUp);
@@ -221,8 +221,9 @@
      *
      * @since Ant 1.8.0
      */
-    private Reader expandReader(AntFilterReader filter, Reader ancestor,
-                                List/*<AntClassLoader>*/ classLoadersToCleanUp) {
+    private Reader expandReader(final AntFilterReader filter,
+                                final Reader ancestor,
+                                final List/*<AntClassLoader>*/ classLoadersToCleanUp)
{
         final String className = filter.getClassName();
         final Path classpath = filter.getClasspath();
         final Project pro = filter.getProject();



Mime
View raw message