Author: sebb
Date: Mon Aug 15 15:10:46 2011
New Revision: 1157880
URL: http://svn.apache.org/viewvc?rev=1157880&view=rev
Log:
Missing @Override
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
Mon Aug 15 15:10:46 2011
@@ -76,6 +76,7 @@ public abstract class ArchiveInputStream
* @throws IOException
* if an I/O error has occurred
*/
+ @Override
public int read() throws IOException {
int num = read(SINGLE, 0, 1);
return num == -1 ? -1 : SINGLE[0] & BYTE_MASK;
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
Mon Aug 15 15:10:46 2011
@@ -107,6 +107,7 @@ public abstract class ArchiveOutputStrea
* @param b The byte to be written.
* @throws IOException on error
*/
+ @Override
public void write(int b) throws IOException {
oneByte[0] = (byte) (b & BYTE_MASK);
write(oneByte, 0, 1);
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
Mon Aug 15 15:10:46 2011
@@ -169,6 +169,7 @@ public class DumpArchiveInputStream exte
/**
* Read the next entry.
*/
+ @Override
public DumpArchiveEntry getNextEntry() throws IOException {
DumpArchiveEntry entry = null;
String path = null;
@@ -403,6 +404,7 @@ outer:
* @return The number of bytes read, or -1 at EOF.
* @throws IOException on error
*/
+ @Override
public int read(byte[] buf, int off, int len) throws IOException {
int totalRead = 0;
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
Mon Aug 15 15:10:46 2011
@@ -41,6 +41,7 @@ public class JarArchiveInputStream exten
return entry == null ? null : new JarArchiveEntry(entry);
}
+ @Override
public ArchiveEntry getNextEntry() throws IOException {
return getNextJarEntry();
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
Mon Aug 15 15:10:46 2011
@@ -42,6 +42,7 @@ public class JarArchiveOutputStream exte
}
// @throws ClassCastException if entry is not an instance of
ZipArchiveEntry
+ @Override
public void putArchiveEntry(ArchiveEntry ze) throws IOException {
if (!jarMarkerAdded) {
((ZipArchiveEntry)ze).addAsFirstExtraField(JarMarker.getInstance());
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
Mon Aug 15 15:10:46 2011
@@ -317,6 +317,7 @@ public class AsiExtraField implements Zi
return type | (mode & PERM_MASK);
}
+ @Override
public Object clone() {
try {
AsiExtraField cloned = (AsiExtraField) super.clone();
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java
Mon Aug 15 15:10:46 2011
@@ -82,6 +82,7 @@ public class UnsupportedZipFeatureExcept
this.name = name;
}
+ @Override
public String toString() {
return name;
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Mon Aug 15 15:10:46 2011
@@ -186,6 +186,7 @@ public class ZipArchiveEntry extends jav
*
* @since Apache Commons Compress 1.1
*/
+ @Override
public int getMethod() {
return method;
}
@@ -197,6 +198,7 @@ public class ZipArchiveEntry extends jav
*
* @since Apache Commons Compress 1.1
*/
+ @Override
public void setMethod(int method) {
if (method < 0) {
throw new IllegalArgumentException(
@@ -497,6 +499,7 @@ public class ZipArchiveEntry extends jav
* Is this entry a directory?
* @return true if the entry is a directory
*/
+ @Override
public boolean isDirectory() {
return getName().endsWith("/");
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Mon Aug 15 15:10:46 2011
@@ -1445,6 +1445,7 @@ public class ZipArchiveOutputStream exte
private UnicodeExtraFieldPolicy(String n) {
name = n;
}
+ @Override
public String toString() {
return name;
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Mon Aug 15 15:10:46 2011
@@ -331,6 +331,7 @@ public class ZipFile {
bis.addDummy();
final Inflater inflater = new Inflater(true);
return new InflaterInputStream(bis, inflater) {
+ @Override
public void close() throws IOException {
super.close();
inflater.end();
@@ -347,6 +348,7 @@ public class ZipFile {
* there are no more references to it.
* @see #close()
*/
+ @Override
protected void finalize() throws Throwable {
try {
if (!closed) {
@@ -867,6 +869,7 @@ public class ZipFile {
loc = start;
}
+ @Override
public int read() throws IOException {
if (remaining-- <= 0) {
if (addDummyByte) {
@@ -881,6 +884,7 @@ public class ZipFile {
}
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
if (remaining <= 0) {
if (addDummyByte) {
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
Mon Aug 15 15:10:46 2011
@@ -57,6 +57,7 @@ public abstract class AbstractTestCase e
super(name);
}
+ @Override
protected void setUp() throws Exception {
dir = mkdir("dir");
resultDir = mkdir("dir-result");
@@ -74,6 +75,7 @@ public abstract class AbstractTestCase e
return new File("src/test/resources", path);
}
+ @Override
protected void tearDown() throws Exception {
rmdir(dir);
rmdir(resultDir);
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
Mon Aug 15 15:10:46 2011
@@ -88,6 +88,7 @@ public class ArchiveReadTests extends Ab
}
// files.txt contains size and filename
+ @Override
protected String getExpectedString(ArchiveEntry entry) {
return entry.getSize() + " " + entry.getName();
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java
Mon Aug 15 15:10:46 2011
@@ -35,10 +35,12 @@ import org.apache.commons.compress.utils
public class ArchiveOutputStreamTest extends AbstractTestCase {
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
Mon Aug 15 15:10:46 2011
@@ -41,6 +41,7 @@ public final class MemoryArchiveInputStr
p = 0;
}
+ @Override
public ArchiveEntry getNextEntry() throws IOException {
if (p >= filenames.length) {
return null;
@@ -53,6 +54,7 @@ public final class MemoryArchiveInputStr
return content[p++];
}
+ @Override
public int read() throws IOException {
return 0;
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
Mon Aug 15 15:10:46 2011
@@ -42,6 +42,7 @@ public class ExtraFieldUtilsTest extends
private byte[] data;
private byte[] aLocal;
+ @Override
public void setUp() {
a = new AsiExtraField();
a.setMode(0755);
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
Mon Aug 15 15:10:46 2011
@@ -28,6 +28,7 @@ import junit.framework.TestCase;
public class ZipFileTest extends TestCase {
private ZipFile zf = null;
+ @Override
public void tearDown() {
ZipFile.closeQuietly(zf);
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java?rev=1157880&r1=1157879&r2=1157880&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
Mon Aug 15 15:10:46 2011
@@ -35,6 +35,7 @@ public class ZipUtilTest extends TestCas
super(name);
}
+ @Override
protected void setUp() throws Exception {
time = new Date();
Calendar cal = Calendar.getInstance();
@@ -56,6 +57,7 @@ public class ZipUtilTest extends TestCas
zl = new ZipLong(result);
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
