svn commit: r1511316 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java

[ebourg]

Author: ebourg
Date: Wed Aug  7 13:52:00 2013
New Revision: 1511316

URL: http://svn.apache.org/r1511316
Log:
Changed the return type of CpioArchiveInputStream.getNextEntry() to avoid 
casting to CpioArchiveEntry

Modified:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
    
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=1511316&r1=1511315&r2=1511316&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
 Wed Aug  7 13:52:00 2013
@@ -446,7 +446,7 @@ public class CpioArchiveInputStream exte
     }
 
     @Override
-    public ArchiveEntry getNextEntry() throws IOException {
+    public CpioArchiveEntry getNextEntry() throws IOException {
         return getNextCPIOEntry();
     }
 

Modified: 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java?rev=1511316&r1=1511315&r2=1511316&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
 (original)
+++ 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
 Wed Aug  7 13:52:00 2013
@@ -25,25 +25,24 @@ import org.apache.commons.compress.Abstr
 public class CpioArchiveInputStreamTest extends AbstractTestCase {
 
     public void testCpioUnarchive() throws Exception {
-        StringBuffer expected = new StringBuffer();
+        StringBuilder expected = new StringBuilder();
         expected.append("./test1.xml<?xml version=\"1.0\"?>\n");
         expected.append("<empty/>./test2.xml<?xml version=\"1.0\"?>\n");
         expected.append("<empty/>\n");
 
 
-        CpioArchiveInputStream in = 
-                new CpioArchiveInputStream(new 
FileInputStream(getFile("bla.cpio")));
-        CpioArchiveEntry entry= null;
+        CpioArchiveInputStream in = new CpioArchiveInputStream(new 
FileInputStream(getFile("bla.cpio")));
+        CpioArchiveEntry entry;
 
-        StringBuffer result = new StringBuffer();
-        while ((entry = (CpioArchiveEntry) in.getNextEntry()) != null) {
+        StringBuilder result = new StringBuilder();
+        while ((entry = in.getNextEntry()) != null) {
             result.append(entry.getName());
             int tmp;
             while ((tmp = in.read()) != -1) {
                 result.append((char) tmp);
-             }
-         }
-         in.close();
-         assertEquals(result.toString(), expected.toString());
+            }
+        }
+        in.close();
+        assertEquals(result.toString(), expected.toString());
     }
 }