ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r450609 - /ant/core/trunk/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
Date Wed, 27 Sep 2006 22:33:54 GMT
Author: mbenson
Date: Wed Sep 27 15:33:53 2006
New Revision: 450609

URL: http://svn.apache.org/viewvc?view=rev&rev=450609
Log:
add @since tag, remove unthrowable constructor exception, and shrink some stuff

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

Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java?view=diff&rev=450609&r1=450608&r2=450609
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java Wed Sep
27 15:33:53 2006
@@ -31,6 +31,7 @@
 /**
  * Special <code>InputStream</code> that will
  * concatenate the contents of Resources from a single ResourceCollection.
+ * @since Ant 1.7
  */
 public class ConcatResourceInputStream extends InputStream {
 
@@ -45,9 +46,8 @@
    * Construct a new ConcatResourceInputStream
    * for the specified ResourceCollection.
    * @param rc the ResourceCollection to combine.
-   * @throws IOException if I/O errors occur.
    */
-    public ConcatResourceInputStream(ResourceCollection rc) throws IOException {
+    public ConcatResourceInputStream(ResourceCollection rc) {
         iter = rc.iterator();
     }
 
@@ -104,16 +104,12 @@
         if (managingPc != null) {
             managingPc.log(message, loglevel);
         } else {
-            if (loglevel > Project.MSG_WARN) {
-                System.out.println(message);
-            } else {
-                System.err.println(message);
-            }
+            (loglevel > Project.MSG_WARN ? System.out : System.err).println(message);
         }
     }
 
     private int readCurrent() throws IOException {
-        return (eof || currentStream == null) ? EOF : currentStream.read();
+        return eof || currentStream == null ? EOF : currentStream.read();
     }
 
     private void nextResource() throws IOException {
@@ -141,4 +137,4 @@
         FileUtils.close(currentStream);
         currentStream = null;
     }
-}
\ No newline at end of file
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message