Repository: ant-antlibs-compress Updated Branches: refs/heads/compress-1.14 0d561ceba -> bb057ad20
more missing @Overrides Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/e838ac0e Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/e838ac0e Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/e838ac0e Branch: refs/heads/compress-1.14 Commit: e838ac0e9b6631dc434f62b07c5011bf210ec033 Parents: 0d561ce Author: Stefan Bodewig <bode...@apache.org> Authored: Mon May 8 18:59:54 2017 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Mon May 8 18:59:54 2017 +0200 ---------------------------------------------------------------------- .../org/apache/ant/compress/resources/ArFileSet.java | 1 + .../org/apache/ant/compress/resources/ArjFileSet.java | 1 + .../apache/ant/compress/resources/CpioFileSet.java | 1 + .../apache/ant/compress/resources/DumpFileSet.java | 1 + .../apache/ant/compress/resources/SevenZResource.java | 4 ++++ .../apache/ant/compress/resources/SevenZScanner.java | 1 + .../org/apache/ant/compress/resources/TarFileSet.java | 1 + .../apache/ant/compress/resources/ZipResource.java | 2 ++ .../org/apache/ant/compress/resources/ZipScanner.java | 1 + src/main/org/apache/ant/compress/taskdefs/Ar.java | 5 +++++ .../org/apache/ant/compress/taskdefs/ArchiveBase.java | 1 + src/main/org/apache/ant/compress/taskdefs/BZip2.java | 3 ++- src/main/org/apache/ant/compress/taskdefs/Cpio.java | 4 ++++ src/main/org/apache/ant/compress/taskdefs/GZip.java | 2 ++ src/main/org/apache/ant/compress/taskdefs/LZMA.java | 1 + .../org/apache/ant/compress/taskdefs/Pack200.java | 4 ++++ src/main/org/apache/ant/compress/taskdefs/SevenZ.java | 3 +++ src/main/org/apache/ant/compress/taskdefs/Tar.java | 6 +++++- src/main/org/apache/ant/compress/taskdefs/Un7z.java | 14 ++++++++------ .../org/apache/ant/compress/taskdefs/UnPack200.java | 2 ++ src/main/org/apache/ant/compress/taskdefs/XZ.java | 3 ++- src/main/org/apache/ant/compress/taskdefs/Zip.java | 8 +++++++- 22 files changed, 59 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/ArFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/ArFileSet.java b/src/main/org/apache/ant/compress/resources/ArFileSet.java index 282d9ce..d78a8fd 100644 --- a/src/main/org/apache/ant/compress/resources/ArFileSet.java +++ b/src/main/org/apache/ant/compress/resources/ArFileSet.java @@ -73,6 +73,7 @@ public class ArFileSet extends CommonsCompressFileSet { protected ArchiveScanner newArchiveScanner() { return new CommonsCompressArchiveScanner(new ArStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new ArResource(archive, (ArArchiveEntry) entry); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/ArjFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/ArjFileSet.java b/src/main/org/apache/ant/compress/resources/ArjFileSet.java index ee12fe4..78d34c9 100644 --- a/src/main/org/apache/ant/compress/resources/ArjFileSet.java +++ b/src/main/org/apache/ant/compress/resources/ArjFileSet.java @@ -75,6 +75,7 @@ public class ArjFileSet extends CommonsCompressFileSet { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new ArjStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new ArjResource(archive, encoding, (ArjArchiveEntry) entry); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/CpioFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/CpioFileSet.java b/src/main/org/apache/ant/compress/resources/CpioFileSet.java index 49f4c90..b4138d2 100644 --- a/src/main/org/apache/ant/compress/resources/CpioFileSet.java +++ b/src/main/org/apache/ant/compress/resources/CpioFileSet.java @@ -74,6 +74,7 @@ public class CpioFileSet extends CommonsCompressFileSet { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new CpioStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new CpioResource(archive, encoding, (CpioArchiveEntry) entry); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/DumpFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/DumpFileSet.java b/src/main/org/apache/ant/compress/resources/DumpFileSet.java index 134a501..81cbb42 100644 --- a/src/main/org/apache/ant/compress/resources/DumpFileSet.java +++ b/src/main/org/apache/ant/compress/resources/DumpFileSet.java @@ -75,6 +75,7 @@ public class DumpFileSet extends CommonsCompressFileSet { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new DumpStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new DumpResource(archive, encoding, (DumpArchiveEntry) entry); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/SevenZResource.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/SevenZResource.java b/src/main/org/apache/ant/compress/resources/SevenZResource.java index 9a5d25d..379248c 100644 --- a/src/main/org/apache/ant/compress/resources/SevenZResource.java +++ b/src/main/org/apache/ant/compress/resources/SevenZResource.java @@ -120,15 +120,19 @@ public final class SevenZResource extends CommonsCompressArchiveResource { while (ze != null) { if (ze.getName().equals(getName())) { return new InputStream() { + @Override public int read() throws IOException { return z.read(); } + @Override public int read(byte[] b) throws IOException { return z.read(b); } + @Override public void close() throws IOException { z.close(); } + @Override protected void finalize() throws Throwable { try { close(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/SevenZScanner.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/SevenZScanner.java b/src/main/org/apache/ant/compress/resources/SevenZScanner.java index 8c954ec..3e3c8f4 100644 --- a/src/main/org/apache/ant/compress/resources/SevenZScanner.java +++ b/src/main/org/apache/ant/compress/resources/SevenZScanner.java @@ -47,6 +47,7 @@ public class SevenZScanner extends CommonsCompressArchiveScanner { public SevenZScanner(boolean skipUnreadable, Project project) { super(new SevenZStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new SevenZResource(archive, encoding, http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/TarFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/TarFileSet.java b/src/main/org/apache/ant/compress/resources/TarFileSet.java index a5b2439..d17f09a 100644 --- a/src/main/org/apache/ant/compress/resources/TarFileSet.java +++ b/src/main/org/apache/ant/compress/resources/TarFileSet.java @@ -139,6 +139,7 @@ public class TarFileSet extends CommonsCompressFileSet { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new TarStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new TarResource(archive, encoding, http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/ZipResource.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/ZipResource.java b/src/main/org/apache/ant/compress/resources/ZipResource.java index a8ab509..3fca5d4 100644 --- a/src/main/org/apache/ant/compress/resources/ZipResource.java +++ b/src/main/org/apache/ant/compress/resources/ZipResource.java @@ -125,10 +125,12 @@ public final class ZipResource extends CommonsCompressArchiveResource { + getArchive()); } return new FilterInputStream(z.getInputStream(ze)) { + @Override public void close() throws IOException { FileUtils.close(in); z.close(); } + @Override protected void finalize() throws Throwable { try { close(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/resources/ZipScanner.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/ZipScanner.java b/src/main/org/apache/ant/compress/resources/ZipScanner.java index d194f36..34fbf03 100644 --- a/src/main/org/apache/ant/compress/resources/ZipScanner.java +++ b/src/main/org/apache/ant/compress/resources/ZipScanner.java @@ -47,6 +47,7 @@ public class ZipScanner extends CommonsCompressArchiveScanner { public ZipScanner(boolean skipUnreadable, Project project) { super(new ZipStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { + @Override public Resource buildResource(Resource archive, String encoding, ArchiveEntry entry) { return new ZipResource(archive, encoding, http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/Ar.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Ar.java b/src/main/org/apache/ant/compress/taskdefs/Ar.java index dbb57a4..4089062 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Ar.java +++ b/src/main/org/apache/ant/compress/taskdefs/Ar.java @@ -43,6 +43,7 @@ public class Ar extends ArchiveBase { public Ar() { setFactory(new ArStreamFactory() { + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { @@ -57,6 +58,7 @@ public class Ar extends ArchiveBase { }); setEntryBuilder( new ArchiveBase.EntryBuilder() { + @Override public ArchiveEntry buildEntry(ArchiveBase.ResourceWithFlags r) { boolean isDir = r.getResource().isDirectory(); if (isDir) { @@ -93,6 +95,7 @@ public class Ar extends ArchiveBase { } }); setFileSetBuilder(new ArchiveBase.FileSetBuilder() { + @Override public ArchiveFileSet buildFileSet(Resource dest) { ArchiveFileSet afs = new ArFileSet(); afs.setSrcResource(dest); @@ -136,10 +139,12 @@ public class Ar extends ArchiveBase { setValue(AR_NAME); } + @Override public String[] getValues() { return new String[] {AR_NAME, BSD_NAME}; } + @Override public boolean equals(Object other) { return other instanceof Format && ((Format) other).getValue().equals(getValue()); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java index 74e34fc..acbc24b 100644 --- a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java +++ b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java @@ -508,6 +508,7 @@ public abstract class ArchiveBase extends Task { */ protected void sort(List/*<ResourceWithFlags>*/ l) { Collections.sort(l, new Comparator/*<ResourceWithFlags>*/() { + @Override public int compare(Object o1, Object o2) { ResourceWithFlags r1 = (ResourceWithFlags) o1; ResourceWithFlags r2 = (ResourceWithFlags) o2; http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/BZip2.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/BZip2.java b/src/main/org/apache/ant/compress/taskdefs/BZip2.java index a92cb33..4210227 100644 --- a/src/main/org/apache/ant/compress/taskdefs/BZip2.java +++ b/src/main/org/apache/ant/compress/taskdefs/BZip2.java @@ -31,10 +31,11 @@ public final class BZip2 extends PackBase { public BZip2() { super(new BZip2StreamFactory(), new PackBase.ResourceWrapper() { + @Override public CommonsCompressCompressorResource wrap(Resource dest) { return new BZip2Resource(dest); } }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/Cpio.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Cpio.java b/src/main/org/apache/ant/compress/taskdefs/Cpio.java index 0706ea8..2c5e1a9 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Cpio.java +++ b/src/main/org/apache/ant/compress/taskdefs/Cpio.java @@ -41,6 +41,7 @@ public class Cpio extends ArchiveBase { public Cpio() { setFactory(new CpioStreamFactory() { + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { @@ -52,6 +53,7 @@ public class Cpio extends ArchiveBase { }); setEntryBuilder( new ArchiveBase.EntryBuilder() { + @Override public ArchiveEntry buildEntry(ArchiveBase.ResourceWithFlags r) { boolean isDir = r.getResource().isDirectory(); CpioArchiveEntry ent = @@ -91,6 +93,7 @@ public class Cpio extends ArchiveBase { } }); setFileSetBuilder(new ArchiveBase.FileSetBuilder() { + @Override public ArchiveFileSet buildFileSet(Resource dest) { ArchiveFileSet afs = new CpioFileSet(); afs.setSrcResource(dest); @@ -142,6 +145,7 @@ public class Cpio extends ArchiveBase { setValue(BINARY_NAME); } + @Override public String[] getValues() { return new String[] { BINARY_NAME, OLD_ASCII_NAME, ODC_NAME, NEW_ASCII_NAME, //CRC_NAME http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/GZip.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/GZip.java b/src/main/org/apache/ant/compress/taskdefs/GZip.java index 97b9b00..ba7709d 100644 --- a/src/main/org/apache/ant/compress/taskdefs/GZip.java +++ b/src/main/org/apache/ant/compress/taskdefs/GZip.java @@ -38,11 +38,13 @@ public final class GZip extends PackBase { public GZip() { super(new PackBase.ResourceWrapper() { + @Override public CommonsCompressCompressorResource wrap(Resource dest) { return new GZipResource(dest); } }); setFactory(new GZipStreamFactory() { + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { GzipParameters params = new GzipParameters(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/LZMA.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/LZMA.java b/src/main/org/apache/ant/compress/taskdefs/LZMA.java index ca98412..d25b1c7 100644 --- a/src/main/org/apache/ant/compress/taskdefs/LZMA.java +++ b/src/main/org/apache/ant/compress/taskdefs/LZMA.java @@ -32,6 +32,7 @@ public final class LZMA extends PackBase { public LZMA() { super(new LZMAStreamFactory(), new PackBase.ResourceWrapper() { + @Override public CommonsCompressCompressorResource wrap(Resource dest) { return new LZMAResource(dest); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/Pack200.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Pack200.java b/src/main/org/apache/ant/compress/taskdefs/Pack200.java index 83e30d3..1908377 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Pack200.java +++ b/src/main/org/apache/ant/compress/taskdefs/Pack200.java @@ -46,11 +46,13 @@ public final class Pack200 extends PackBase { public Pack200() { super(new PackBase.ResourceWrapper() { + @Override public CommonsCompressCompressorResource wrap(Resource dest) { return new Pack200Resource(dest); } }); setFactory(new CompressorStreamFactory() { + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { @@ -59,6 +61,7 @@ public final class Pack200 extends PackBase { .getStrategy(), properties); } + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { @@ -97,6 +100,7 @@ public final class Pack200 extends PackBase { STRATEGIES.put(TEMP_FILE_KEY, Pack200Strategy.TEMP_FILE); } + @Override public String[] getValues() { return new String[] {IN_MEMORY_KEY, TEMP_FILE_KEY}; } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/SevenZ.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/SevenZ.java b/src/main/org/apache/ant/compress/taskdefs/SevenZ.java index 99b72de..e4bee13 100644 --- a/src/main/org/apache/ant/compress/taskdefs/SevenZ.java +++ b/src/main/org/apache/ant/compress/taskdefs/SevenZ.java @@ -48,6 +48,7 @@ public class SevenZ extends ArchiveBase { public SevenZ() { setFactory(new SevenZStreamFactory() { + @Override public ArchiveOutputStream getArchiveOutputStream(File f, String encoding) throws IOException { @@ -64,6 +65,7 @@ public class SevenZ extends ArchiveBase { }); setEntryBuilder( new ArchiveBase.EntryBuilder() { + @Override public ArchiveEntry buildEntry(ArchiveBase.ResourceWithFlags r) { SevenZArchiveEntry entry = new SevenZArchiveEntry(); entry.setName(r.getName()); @@ -80,6 +82,7 @@ public class SevenZ extends ArchiveBase { } }); setFileSetBuilder(new ArchiveBase.FileSetBuilder() { + @Override public ArchiveFileSet buildFileSet(Resource dest) { ArchiveFileSet afs = new SevenZFileSet(); afs.setSrcResource(dest); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/Tar.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Tar.java b/src/main/org/apache/ant/compress/taskdefs/Tar.java index 4e59d02..b01a512 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Tar.java +++ b/src/main/org/apache/ant/compress/taskdefs/Tar.java @@ -39,6 +39,7 @@ public class Tar extends ArchiveBase { public Tar() { setFactory(new TarStreamFactory(){ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { @@ -69,6 +70,7 @@ public class Tar extends ArchiveBase { }); setEntryBuilder( new ArchiveBase.EntryBuilder() { + @Override public ArchiveEntry buildEntry(ArchiveBase.ResourceWithFlags r) { boolean isDir = r.getResource().isDirectory(); String name = r.getName(); @@ -124,6 +126,7 @@ public class Tar extends ArchiveBase { } }); setFileSetBuilder(new ArchiveBase.FileSetBuilder() { + @Override public ArchiveFileSet buildFileSet(Resource dest) { ArchiveFileSet afs = new TarFileSet(); afs.setSrcResource(dest); @@ -163,6 +166,7 @@ public class Tar extends ArchiveBase { setValue(USTAR_NAME); } + @Override public String[] getValues() { return new String[] { USTAR_NAME, OLDGNU_NAME, GNU_NAME, @@ -175,4 +179,4 @@ public class Tar extends ArchiveBase { && ((Format) other).getValue().equals(getValue()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/Un7z.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Un7z.java b/src/main/org/apache/ant/compress/taskdefs/Un7z.java index 8adfb06..3fa4e74 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Un7z.java +++ b/src/main/org/apache/ant/compress/taskdefs/Un7z.java @@ -68,12 +68,14 @@ public class Un7z extends ExpandBase { */ log("extracting " + ze.getName(), Project.MSG_DEBUG); try (InputStream is = new InputStream() { - public int read() throws IOException { - return zf.read(); - } - public int read(byte[] b) throws IOException { - return zf.read(b); - } + @Override + public int read() throws IOException { + return zf.read(); + } + @Override + public int read(byte[] b) throws IOException { + return zf.read(b); + } }) { extractFile(fileUtils, srcF, dir, is, ze.getName(), ze.getLastModifiedDate(), http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/UnPack200.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/UnPack200.java b/src/main/org/apache/ant/compress/taskdefs/UnPack200.java index 0877f1d..8342928 100644 --- a/src/main/org/apache/ant/compress/taskdefs/UnPack200.java +++ b/src/main/org/apache/ant/compress/taskdefs/UnPack200.java @@ -42,6 +42,7 @@ public final class UnPack200 extends UnpackBase { public UnPack200() { super(".pack"); setFactory(new Pack200StreamFactory() { + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { @@ -50,6 +51,7 @@ public final class UnPack200 extends UnpackBase { .getStrategy(), properties); } + @Override public CompressorInputStream getCompressorInputStream(File file) throws IOException { return new Pack200CompressorInputStream(file, http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/XZ.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/XZ.java b/src/main/org/apache/ant/compress/taskdefs/XZ.java index d9f50a8..2a6b5ac 100644 --- a/src/main/org/apache/ant/compress/taskdefs/XZ.java +++ b/src/main/org/apache/ant/compress/taskdefs/XZ.java @@ -32,10 +32,11 @@ public final class XZ extends PackBase { public XZ() { super(new XZStreamFactory(), new PackBase.ResourceWrapper() { + @Override public CommonsCompressCompressorResource wrap(Resource dest) { return new XZResource(dest); } }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/e838ac0e/src/main/org/apache/ant/compress/taskdefs/Zip.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Zip.java b/src/main/org/apache/ant/compress/taskdefs/Zip.java index 2fb22cd..7a1880f 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Zip.java +++ b/src/main/org/apache/ant/compress/taskdefs/Zip.java @@ -50,6 +50,7 @@ public class Zip extends ArchiveBase { public Zip() { setFactory(new ZipStreamFactory() { + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { @@ -59,6 +60,7 @@ public class Zip extends ArchiveBase { configure(o); return o; } + @Override public ArchiveOutputStream getArchiveOutputStream(File f, String encoding) throws IOException { @@ -70,6 +72,7 @@ public class Zip extends ArchiveBase { }); setEntryBuilder( new ArchiveBase.EntryBuilder() { + @Override public ArchiveEntry buildEntry(ArchiveBase.ResourceWithFlags r) { boolean isDir = r.getResource().isDirectory(); ZipArchiveEntry ent = new ZipArchiveEntry(r.getName()); @@ -104,6 +107,7 @@ public class Zip extends ArchiveBase { } }); setFileSetBuilder(new ArchiveBase.FileSetBuilder() { + @Override public ArchiveFileSet buildFileSet(Resource dest) { ArchiveFileSet afs = new ZipFileSet(); afs.setSrcResource(dest); @@ -201,6 +205,7 @@ public class Zip extends ArchiveBase { .NOT_ENCODEABLE); } + @Override public String[] getValues() { return new String[] {NEVER_KEY, ALWAYS_KEY, N_E_KEY}; } @@ -237,6 +242,7 @@ public class Zip extends ArchiveBase { POLICIES.put(A_N_KEY, Zip64Mode.AsNeeded); } + @Override public String[] getValues() { return new String[] {NEVER_KEY, ALWAYS_KEY, A_N_KEY}; } @@ -254,4 +260,4 @@ public class Zip extends ArchiveBase { return (Zip64Mode) POLICIES.get(getValue()); } } -} \ No newline at end of file +}
