Repository: ant-antlibs-compress Updated Branches: refs/heads/master 401cd2cf5 -> 05aaa77a0
add @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/d770c637 Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/d770c637 Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/d770c637 Branch: refs/heads/master Commit: d770c637a46718e9649be049d24df4a7235a8221 Parents: 401cd2c Author: Stefan Bodewig <[email protected]> Authored: Sat May 6 18:39:56 2017 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sat May 6 18:39:56 2017 +0200 ---------------------------------------------------------------------- src/main/org/apache/ant/compress/conditions/HasGroupId.java | 1 + .../org/apache/ant/compress/conditions/HasGroupName.java | 1 + src/main/org/apache/ant/compress/conditions/HasMode.java | 1 + src/main/org/apache/ant/compress/conditions/HasUserId.java | 1 + src/main/org/apache/ant/compress/conditions/HasUserName.java | 1 + src/main/org/apache/ant/compress/resources/ArFileSet.java | 2 ++ src/main/org/apache/ant/compress/resources/Archives.java | 8 +++++++- src/main/org/apache/ant/compress/resources/ArjFileSet.java | 2 ++ .../compress/resources/CommonsCompressArchiveResource.java | 4 ++++ .../compress/resources/CommonsCompressArchiveScanner.java | 3 ++- .../resources/CommonsCompressCompressorResource.java | 3 +++ src/main/org/apache/ant/compress/resources/CpioFileSet.java | 2 ++ .../org/apache/ant/compress/resources/DevZeroResource.java | 1 + src/main/org/apache/ant/compress/resources/DumpFileSet.java | 2 ++ .../org/apache/ant/compress/resources/SevenZFileSet.java | 2 ++ .../org/apache/ant/compress/resources/SevenZResource.java | 3 +++ .../org/apache/ant/compress/resources/SevenZScanner.java | 1 + src/main/org/apache/ant/compress/resources/TarFileSet.java | 4 ++++ src/main/org/apache/ant/compress/resources/TarResource.java | 1 + src/main/org/apache/ant/compress/resources/ZipFileSet.java | 2 ++ src/main/org/apache/ant/compress/resources/ZipResource.java | 2 ++ src/main/org/apache/ant/compress/resources/ZipScanner.java | 3 ++- src/main/org/apache/ant/compress/taskdefs/Ar.java | 3 ++- src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java | 1 + src/main/org/apache/ant/compress/taskdefs/ExpandBase.java | 2 ++ .../org/apache/ant/compress/taskdefs/Pack200Normalize.java | 3 ++- src/main/org/apache/ant/compress/taskdefs/PackBase.java | 1 + src/main/org/apache/ant/compress/taskdefs/Un7z.java | 1 + src/main/org/apache/ant/compress/taskdefs/Unarj.java | 1 + src/main/org/apache/ant/compress/taskdefs/Uncpio.java | 1 + src/main/org/apache/ant/compress/taskdefs/Undump.java | 1 + src/main/org/apache/ant/compress/taskdefs/UnpackBase.java | 2 ++ src/main/org/apache/ant/compress/taskdefs/Untar.java | 1 + src/main/org/apache/ant/compress/taskdefs/Unzip.java | 1 + src/main/org/apache/ant/compress/util/ArStreamFactory.java | 4 +++- src/main/org/apache/ant/compress/util/ArjStreamFactory.java | 2 ++ .../org/apache/ant/compress/util/BZip2StreamFactory.java | 5 ++++- src/main/org/apache/ant/compress/util/CpioStreamFactory.java | 2 ++ src/main/org/apache/ant/compress/util/DumpStreamFactory.java | 2 ++ src/main/org/apache/ant/compress/util/GZipStreamFactory.java | 5 ++++- src/main/org/apache/ant/compress/util/LZMAStreamFactory.java | 2 ++ .../org/apache/ant/compress/util/Pack200StreamFactory.java | 6 +++++- .../org/apache/ant/compress/util/SevenZStreamFactory.java | 4 ++++ .../org/apache/ant/compress/util/SnappyStreamFactory.java | 2 ++ src/main/org/apache/ant/compress/util/TarStreamFactory.java | 4 +++- src/main/org/apache/ant/compress/util/XZStreamFactory.java | 5 ++++- src/main/org/apache/ant/compress/util/ZStreamFactory.java | 2 ++ src/main/org/apache/ant/compress/util/ZipStreamFactory.java | 6 +++++- 48 files changed, 107 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/conditions/HasGroupId.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/conditions/HasGroupId.java b/src/main/org/apache/ant/compress/conditions/HasGroupId.java index 8a513cf..220f59d 100644 --- a/src/main/org/apache/ant/compress/conditions/HasGroupId.java +++ b/src/main/org/apache/ant/compress/conditions/HasGroupId.java @@ -60,6 +60,7 @@ public class HasGroupId extends ProjectComponent implements Condition { } } + @Override public boolean eval() throws BuildException { validate(); int actual = ccResource != null http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/conditions/HasGroupName.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/conditions/HasGroupName.java b/src/main/org/apache/ant/compress/conditions/HasGroupName.java index b670ba5..7d6641b 100644 --- a/src/main/org/apache/ant/compress/conditions/HasGroupName.java +++ b/src/main/org/apache/ant/compress/conditions/HasGroupName.java @@ -59,6 +59,7 @@ public class HasGroupName extends ProjectComponent implements Condition { } } + @Override public boolean eval() throws BuildException { validate(); String actual = ccResource != null http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/conditions/HasMode.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/conditions/HasMode.java b/src/main/org/apache/ant/compress/conditions/HasMode.java index 57f4903..637e1ad 100644 --- a/src/main/org/apache/ant/compress/conditions/HasMode.java +++ b/src/main/org/apache/ant/compress/conditions/HasMode.java @@ -52,6 +52,7 @@ public class HasMode extends ProjectComponent implements Condition { } } + @Override public boolean eval() throws BuildException { validate(); int actual = resource.getMode(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/conditions/HasUserId.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/conditions/HasUserId.java b/src/main/org/apache/ant/compress/conditions/HasUserId.java index de3c1e0..dd6e418 100644 --- a/src/main/org/apache/ant/compress/conditions/HasUserId.java +++ b/src/main/org/apache/ant/compress/conditions/HasUserId.java @@ -60,6 +60,7 @@ public class HasUserId extends ProjectComponent implements Condition { } } + @Override public boolean eval() throws BuildException { validate(); int actual = ccResource != null http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/conditions/HasUserName.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/conditions/HasUserName.java b/src/main/org/apache/ant/compress/conditions/HasUserName.java index cc0d6e0..e474b9d 100644 --- a/src/main/org/apache/ant/compress/conditions/HasUserName.java +++ b/src/main/org/apache/ant/compress/conditions/HasUserName.java @@ -59,6 +59,7 @@ public class HasUserName extends ProjectComponent implements Condition { } } + @Override public boolean eval() throws BuildException { validate(); String actual = ccResource != null http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 ce9f3d3..282d9ce 100644 --- a/src/main/org/apache/ant/compress/resources/ArFileSet.java +++ b/src/main/org/apache/ant/compress/resources/ArFileSet.java @@ -69,6 +69,7 @@ public class ArFileSet extends CommonsCompressFileSet { * Create a new scanner. * @return the created scanner. */ + @Override protected ArchiveScanner newArchiveScanner() { return new CommonsCompressArchiveScanner(new ArStreamFactory(), new CommonsCompressArchiveScanner.ResourceBuilder() { @@ -79,6 +80,7 @@ public class ArFileSet extends CommonsCompressFileSet { }, getSkipUnreadableEntries(), getProject()); } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof ArFileSet) { return new ArFileSet((ArFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/Archives.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/Archives.java b/src/main/org/apache/ant/compress/resources/Archives.java index 0727538..27b85cc 100644 --- a/src/main/org/apache/ant/compress/resources/Archives.java +++ b/src/main/org/apache/ant/compress/resources/Archives.java @@ -94,6 +94,7 @@ public class Archives extends DataType /** * Sums the sizes of nested archives. */ + @Override public int size() { if (isReference()) { return ((Archives) getCheckedRef()).size(); @@ -109,6 +110,7 @@ public class Archives extends DataType /** * Merges the nested collections. */ + @Override public Iterator iterator() { if (isReference()) { return ((Archives) getCheckedRef()).iterator(); @@ -125,6 +127,7 @@ public class Archives extends DataType /** * @return false */ + @Override public boolean isFilesystemOnly() { if (isReference()) { return ((Archives) getCheckedRef()).isFilesystemOnly(); @@ -137,6 +140,7 @@ public class Archives extends DataType * Overrides the base version. * @param r the Reference to set. */ + @Override public void setRefid(Reference r) { if (zips.getResourceCollections().size() > 0 || ars.getResourceCollections().size() > 0 @@ -152,6 +156,7 @@ public class Archives extends DataType * well. * @return a cloned instance. */ + @Override public Object clone() { try { Archives a = (Archives) super.clone(); @@ -210,6 +215,7 @@ public class Archives extends DataType * @param p the project to use to dereference the references. * @throws BuildException on error. */ + @Override protected synchronized void dieOnCircularReference(Stack stk, Project p) throws BuildException { if (isChecked()) { @@ -226,4 +232,4 @@ public class Archives extends DataType } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 86027f6..ee12fe4 100644 --- a/src/main/org/apache/ant/compress/resources/ArjFileSet.java +++ b/src/main/org/apache/ant/compress/resources/ArjFileSet.java @@ -70,6 +70,7 @@ public class ArjFileSet extends CommonsCompressFileSet { * Create a new scanner. * @return the created scanner. */ + @Override protected ArchiveScanner newArchiveScanner() { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new ArjStreamFactory(), @@ -83,6 +84,7 @@ public class ArjFileSet extends CommonsCompressFileSet { return cs; } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof ArjFileSet) { return new ArjFileSet((ArjFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java b/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java index c8b8585..c71f3f3 100644 --- a/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java +++ b/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java @@ -107,6 +107,7 @@ public abstract class CommonsCompressArchiveResource extends ArchiveResource { * Overrides the super version. * @param r the Reference to set. */ + @Override public void setRefid(Reference r) { if (getEncoding() != null) { throw tooManyAttributes(); @@ -120,6 +121,7 @@ public abstract class CommonsCompressArchiveResource extends ArchiveResource { * @throws IOException if the archive cannot be opened, * or the entry cannot be read. */ + @Override public InputStream getInputStream() throws IOException { if (isReference()) { return ((Resource) getCheckedRef()).getInputStream(); @@ -145,6 +147,7 @@ public abstract class CommonsCompressArchiveResource extends ArchiveResource { * @throws UnsupportedOperationException if OutputStreams are not * supported for this Resource type. */ + @Override public OutputStream getOutputStream() throws IOException { if (isReference()) { return ((Resource) getCheckedRef()).getOutputStream(); @@ -180,6 +183,7 @@ public abstract class CommonsCompressArchiveResource extends ArchiveResource { /** * fetches information from the named entry inside the archive. */ + @Override protected void fetchEntry() { ArchiveInputStream i = null; try { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java b/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java index 8595798..52002ca 100644 --- a/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java +++ b/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java @@ -84,6 +84,7 @@ public class CommonsCompressArchiveScanner extends ArchiveScanner { * resources found inside the archive that matched all include * patterns and didn't match any exclude patterns. */ + @Override protected void fillMapsFromArchive(Resource src, String encoding, Map fileEntries, Map matchFileEntries, Map dirEntries, Map matchDirEntries) { @@ -148,4 +149,4 @@ public class CommonsCompressArchiveScanner extends ArchiveScanner { Resource buildResource(Resource archive, String encoding, ArchiveEntry entry); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java b/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java index 6cc6f68..5967cc1 100644 --- a/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java +++ b/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java @@ -103,6 +103,7 @@ public abstract class CommonsCompressCompressorResource * @return the wrapped stream. * @throws IOException if there is a problem. */ + @Override protected final InputStream wrapStream(InputStream in) throws IOException { if (factory instanceof CompressorWithConcatenatedStreamsFactory) { CompressorWithConcatenatedStreamsFactory f @@ -120,6 +121,7 @@ public abstract class CommonsCompressCompressorResource * @return the wrapped stream. * @throws IOException if there is a problem. */ + @Override protected final OutputStream wrapStream(OutputStream out) throws IOException { return factory.getCompressorStream(new BufferedOutputStream(out)); @@ -129,6 +131,7 @@ public abstract class CommonsCompressCompressorResource * Get the string representation of this Resource. * @return this Resource formatted as a String. */ + @Override public String toString() { return name + " compressed " + super.toString(); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 901baa1..49f4c90 100644 --- a/src/main/org/apache/ant/compress/resources/CpioFileSet.java +++ b/src/main/org/apache/ant/compress/resources/CpioFileSet.java @@ -69,6 +69,7 @@ public class CpioFileSet extends CommonsCompressFileSet { * Create a new scanner. * @return the created scanner. */ + @Override protected ArchiveScanner newArchiveScanner() { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new CpioStreamFactory(), @@ -82,6 +83,7 @@ public class CpioFileSet extends CommonsCompressFileSet { return cs; } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof CpioFileSet) { return new CpioFileSet((CpioFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/DevZeroResource.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/DevZeroResource.java b/src/main/org/apache/ant/compress/resources/DevZeroResource.java index 726d5c2..1b0240d 100644 --- a/src/main/org/apache/ant/compress/resources/DevZeroResource.java +++ b/src/main/org/apache/ant/compress/resources/DevZeroResource.java @@ -31,6 +31,7 @@ import java.util.Arrays; */ public class DevZeroResource extends Resource { + @Override public InputStream getInputStream() { final long size = getSize(); return new InputStream() { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 a5bc520..134a501 100644 --- a/src/main/org/apache/ant/compress/resources/DumpFileSet.java +++ b/src/main/org/apache/ant/compress/resources/DumpFileSet.java @@ -70,6 +70,7 @@ public class DumpFileSet extends CommonsCompressFileSet { * Create a new scanner. * @return the created scanner. */ + @Override protected ArchiveScanner newArchiveScanner() { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new DumpStreamFactory(), @@ -83,6 +84,7 @@ public class DumpFileSet extends CommonsCompressFileSet { return cs; } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof DumpFileSet) { return new DumpFileSet((DumpFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/SevenZFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/SevenZFileSet.java b/src/main/org/apache/ant/compress/resources/SevenZFileSet.java index 9b5f44d..c0795af 100644 --- a/src/main/org/apache/ant/compress/resources/SevenZFileSet.java +++ b/src/main/org/apache/ant/compress/resources/SevenZFileSet.java @@ -65,10 +65,12 @@ public class SevenZFileSet extends CommonsCompressFileSet { * Return a new archive scanner based on this one. * @return a new SevenZScanner with the same encoding as this one. */ + @Override protected ArchiveScanner newArchiveScanner() { return new SevenZScanner(getSkipUnreadableEntries(), getProject()); } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof SevenZFileSet) { return new SevenZFileSet((SevenZFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 516d1aa..db491a9 100644 --- a/src/main/org/apache/ant/compress/resources/SevenZResource.java +++ b/src/main/org/apache/ant/compress/resources/SevenZResource.java @@ -104,6 +104,7 @@ public final class SevenZResource extends CommonsCompressArchiveResource { * @throws IOException if the sevenz file cannot be opened, * or the entry cannot be read. */ + @Override public InputStream getInputStream() throws IOException { if (isReference()) { return ((Resource) getCheckedRef()).getInputStream(); @@ -155,6 +156,7 @@ public final class SevenZResource extends CommonsCompressArchiveResource { /** * fetches information from the named entry inside the archive. */ + @Override protected void fetchEntry() { File f = getSevenZFile(); if (f == null) { @@ -188,6 +190,7 @@ public final class SevenZResource extends CommonsCompressArchiveResource { } } + @Override protected void setEntry(ArchiveEntry e) { super.setEntry(e); if (e != null) { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 4ec677a..1f73f20 100644 --- a/src/main/org/apache/ant/compress/resources/SevenZScanner.java +++ b/src/main/org/apache/ant/compress/resources/SevenZScanner.java @@ -73,6 +73,7 @@ public class SevenZScanner extends CommonsCompressArchiveScanner { * resources found inside the archive that matched all include * patterns and didn't match any exclude patterns. */ + @Override protected void fillMapsFromArchive(Resource src, String encoding, Map fileEntries, Map matchFileEntries, Map dirEntries, Map matchDirEntries) { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 0c3dae7..a5b2439 100644 --- a/src/main/org/apache/ant/compress/resources/TarFileSet.java +++ b/src/main/org/apache/ant/compress/resources/TarFileSet.java @@ -134,6 +134,7 @@ public class TarFileSet extends CommonsCompressFileSet { * Create a new scanner. * @return the created scanner. */ + @Override protected ArchiveScanner newArchiveScanner() { CommonsCompressArchiveScanner cs = new CommonsCompressArchiveScanner(new TarStreamFactory(), @@ -156,6 +157,7 @@ public class TarFileSet extends CommonsCompressFileSet { * @param r the <code>Reference</code> to use. * @throws BuildException on error */ + @Override public void setRefid(Reference r) throws BuildException { if (userNameSet || groupNameSet) { throw tooManyAttributes(); @@ -169,6 +171,7 @@ public class TarFileSet extends CommonsCompressFileSet { * specific attributes. * @param zfs the archive fileset to configure. */ + @Override protected void configureFileSet(ArchiveFileSet zfs) { super.configureFileSet(zfs); if (zfs instanceof TarFileSet) { @@ -178,6 +181,7 @@ public class TarFileSet extends CommonsCompressFileSet { } } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof TarFileSet) { return new TarFileSet((TarFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/TarResource.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/TarResource.java b/src/main/org/apache/ant/compress/resources/TarResource.java index b1f0acf..cfd716a 100644 --- a/src/main/org/apache/ant/compress/resources/TarResource.java +++ b/src/main/org/apache/ant/compress/resources/TarResource.java @@ -109,6 +109,7 @@ public final class TarResource extends CommonsCompressArchiveResource { return groupName; } + @Override protected void setEntry(ArchiveEntry e) { super.setEntry(e); if (e != null) { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/resources/ZipFileSet.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/resources/ZipFileSet.java b/src/main/org/apache/ant/compress/resources/ZipFileSet.java index 3f0df20..bcdc216 100644 --- a/src/main/org/apache/ant/compress/resources/ZipFileSet.java +++ b/src/main/org/apache/ant/compress/resources/ZipFileSet.java @@ -64,12 +64,14 @@ public class ZipFileSet extends CommonsCompressFileSet { * Return a new archive scanner based on this one. * @return a new ZipScanner with the same encoding as this one. */ + @Override protected ArchiveScanner newArchiveScanner() { ZipScanner zs = new ZipScanner(getSkipUnreadableEntries(), getProject()); zs.setEncoding(getEncoding()); return zs; } + @Override protected CommonsCompressFileSet newFileSet(FileSet fs) { if (fs instanceof ZipFileSet) { return new ZipFileSet((ZipFileSet) fs); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 e9cf764..e54169a 100644 --- a/src/main/org/apache/ant/compress/resources/ZipResource.java +++ b/src/main/org/apache/ant/compress/resources/ZipResource.java @@ -107,6 +107,7 @@ public final class ZipResource extends CommonsCompressArchiveResource { * @throws IOException if the zip file cannot be opened, * or the entry cannot be read. */ + @Override public InputStream getInputStream() throws IOException { if (isReference()) { return ((Resource) getCheckedRef()).getInputStream(); @@ -163,6 +164,7 @@ public final class ZipResource extends CommonsCompressArchiveResource { /** * fetches information from the named entry inside the archive. */ + @Override protected void fetchEntry() { File f = getZipfile(); if (f == null) { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 8d7653a..d194f36 100644 --- a/src/main/org/apache/ant/compress/resources/ZipScanner.java +++ b/src/main/org/apache/ant/compress/resources/ZipScanner.java @@ -72,6 +72,7 @@ public class ZipScanner extends CommonsCompressArchiveScanner { * resources found inside the archive that matched all include * patterns and didn't match any exclude patterns. */ + @Override protected void fillMapsFromArchive(Resource src, String encoding, Map fileEntries, Map matchFileEntries, Map dirEntries, Map matchDirEntries) { @@ -122,4 +123,4 @@ public class ZipScanner extends CommonsCompressArchiveScanner { ZipFile.closeQuietly(zf); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 397e2c6..dbb57a4 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Ar.java +++ b/src/main/org/apache/ant/compress/taskdefs/Ar.java @@ -101,6 +101,7 @@ public class Ar extends ArchiveBase { }); } + @Override public void setFilesOnly(boolean b) { if (!b) { throw new BuildException(NO_DIRS_MESSAGE); @@ -145,4 +146,4 @@ public class Ar extends ArchiveBase { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 afb8ea3..c5bf808 100644 --- a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java +++ b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java @@ -271,6 +271,7 @@ public abstract class ArchiveBase extends Task { emptyBehavior = we; } + @Override public void execute() { validate(); final Resource targetArchive = getDest(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java b/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java index 4de2b11..0eef517 100644 --- a/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java +++ b/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java @@ -98,6 +98,7 @@ public abstract class ExpandBase extends Expand { } /** {@inheritDoc} */ + @Override protected void expandFile(FileUtils fileUtils, File srcF, File dir) { if (!srcF.exists()) { throw new BuildException("Unable to expand " + srcF @@ -125,6 +126,7 @@ public abstract class ExpandBase extends Expand { } /** {@inheritDoc} */ + @Override protected void expandResource(Resource srcR, File dir) { if (!srcR.isExists()) { throw new BuildException("Unable to expand " + srcR.getName() http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java b/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java index c2b58d9..5eb08da 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java +++ b/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java @@ -81,6 +81,7 @@ public class Pack200Normalize extends Task { properties.put(prop.getKey(), prop.getValue()); } + @Override public void execute() { validate(); if (isOutOfDate()) { @@ -132,4 +133,4 @@ public class Pack200Normalize extends Task { + src, ex); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/PackBase.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/PackBase.java b/src/main/org/apache/ant/compress/taskdefs/PackBase.java index 9521831..9c5d6de 100644 --- a/src/main/org/apache/ant/compress/taskdefs/PackBase.java +++ b/src/main/org/apache/ant/compress/taskdefs/PackBase.java @@ -187,6 +187,7 @@ public abstract class PackBase extends Task { * validate, then hand off to the subclass * @throws BuildException on error */ + @Override public void execute() throws BuildException { validate(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/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 d21e8be..c6df0a2 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Un7z.java +++ b/src/main/org/apache/ant/compress/taskdefs/Un7z.java @@ -44,6 +44,7 @@ public class Un7z extends ExpandBase { } // overridden in order to take advantage of SevenzFile + @Override protected void expandFile(FileUtils fileUtils, File srcF, File dir) { if (!srcF.exists()) { throw new BuildException("Unable to expand " + srcF http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/Unarj.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Unarj.java b/src/main/org/apache/ant/compress/taskdefs/Unarj.java index 4f6b69e..139b67f 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Unarj.java +++ b/src/main/org/apache/ant/compress/taskdefs/Unarj.java @@ -33,6 +33,7 @@ public class Unarj extends ExpandBase { * Set the file-name encoding for this archive, defaults to the * native encoding. */ + @Override public void setEncoding(String encoding) { internalSetEncoding(encoding); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/Uncpio.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Uncpio.java b/src/main/org/apache/ant/compress/taskdefs/Uncpio.java index d7177da..e462b7d 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Uncpio.java +++ b/src/main/org/apache/ant/compress/taskdefs/Uncpio.java @@ -33,6 +33,7 @@ public class Uncpio extends ExpandBase { * encoding. * @since Apache Compress Antlib 1.3 */ + @Override public void setEncoding(String encoding) { internalSetEncoding(encoding); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/Undump.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Undump.java b/src/main/org/apache/ant/compress/taskdefs/Undump.java index e5fec5d..67fa262 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Undump.java +++ b/src/main/org/apache/ant/compress/taskdefs/Undump.java @@ -34,6 +34,7 @@ public class Undump extends ExpandBase { * native encoding. * @since Apache Compress Antlib 1.3 */ + @Override public void setEncoding(String encoding) { internalSetEncoding(encoding); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java b/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java index 77c4107..6c77f43 100644 --- a/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java +++ b/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java @@ -90,6 +90,7 @@ public abstract class UnpackBase extends Unpack { /** * Implement the uncompression. */ + @Override protected void extract() { if (source.lastModified() > dest.lastModified()) { log("Expanding " + source.getAbsolutePath() + " to " @@ -127,6 +128,7 @@ public abstract class UnpackBase extends Unpack { /** * Yes, we can. */ + @Override protected final boolean supportsNonFileResources() { return true; } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/Untar.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Untar.java b/src/main/org/apache/ant/compress/taskdefs/Untar.java index aa0ae82..9f4ce03 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Untar.java +++ b/src/main/org/apache/ant/compress/taskdefs/Untar.java @@ -28,6 +28,7 @@ public class Untar extends ExpandBase { super(new TarStreamFactory()); } + @Override public void setEncoding(String encoding) { internalSetEncoding(encoding); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/taskdefs/Unzip.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/taskdefs/Unzip.java b/src/main/org/apache/ant/compress/taskdefs/Unzip.java index c6ca2b7..aa47f15 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Unzip.java +++ b/src/main/org/apache/ant/compress/taskdefs/Unzip.java @@ -44,6 +44,7 @@ public class Unzip extends ExpandBase { super(new ZipStreamFactory()); } + @Override public void setEncoding(String encoding) { internalSetEncoding(encoding); } http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/ArStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/ArStreamFactory.java b/src/main/org/apache/ant/compress/util/ArStreamFactory.java index 2ccc7ab..a7d7611 100644 --- a/src/main/org/apache/ant/compress/util/ArStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/ArStreamFactory.java @@ -33,6 +33,7 @@ public class ArStreamFactory implements ArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names, ignored */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -43,10 +44,11 @@ public class ArStreamFactory implements ArchiveStreamFactory { * @param stream the stream to write to, should be buffered * @param encoding the encoding of the entry names, ignored */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { return new ArArchiveOutputStream(stream); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/ArjStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/ArjStreamFactory.java b/src/main/org/apache/ant/compress/util/ArjStreamFactory.java index 265f6a2..c613117 100644 --- a/src/main/org/apache/ant/compress/util/ArjStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/ArjStreamFactory.java @@ -37,6 +37,7 @@ public class ArjStreamFactory implements ArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -50,6 +51,7 @@ public class ArjStreamFactory implements ArchiveStreamFactory { /** * Not implemented. */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/BZip2StreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/BZip2StreamFactory.java b/src/main/org/apache/ant/compress/util/BZip2StreamFactory.java index 9066e5c..0ebdbbd 100644 --- a/src/main/org/apache/ant/compress/util/BZip2StreamFactory.java +++ b/src/main/org/apache/ant/compress/util/BZip2StreamFactory.java @@ -35,6 +35,7 @@ public class BZip2StreamFactory implements CompressorWithConcatenatedStreamsFact /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return getCompressorStream(stream, false); @@ -48,6 +49,7 @@ public class BZip2StreamFactory implements CompressorWithConcatenatedStreamsFact * stream * @since Apache Compress Antlib 1.2 */ + @Override public CompressorInputStream getCompressorStream(InputStream stream, boolean decompressConcatenated) throws IOException { @@ -58,8 +60,9 @@ public class BZip2StreamFactory implements CompressorWithConcatenatedStreamsFact /** * @param stream the stream to write to, should be buffered */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { return new BZip2CompressorOutputStream(stream); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/CpioStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/CpioStreamFactory.java b/src/main/org/apache/ant/compress/util/CpioStreamFactory.java index 2e990df..53bce53 100644 --- a/src/main/org/apache/ant/compress/util/CpioStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/CpioStreamFactory.java @@ -33,6 +33,7 @@ public class CpioStreamFactory implements ArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -43,6 +44,7 @@ public class CpioStreamFactory implements ArchiveStreamFactory { * @param stream the stream to write to, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/DumpStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/DumpStreamFactory.java b/src/main/org/apache/ant/compress/util/DumpStreamFactory.java index a6897f6..ff38ef3 100644 --- a/src/main/org/apache/ant/compress/util/DumpStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/DumpStreamFactory.java @@ -37,6 +37,7 @@ public class DumpStreamFactory implements ArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -50,6 +51,7 @@ public class DumpStreamFactory implements ArchiveStreamFactory { /** * Not implemented. */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/GZipStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/GZipStreamFactory.java b/src/main/org/apache/ant/compress/util/GZipStreamFactory.java index 992e416..ce1f91d 100644 --- a/src/main/org/apache/ant/compress/util/GZipStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/GZipStreamFactory.java @@ -35,6 +35,7 @@ public class GZipStreamFactory implements CompressorWithConcatenatedStreamsFacto /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return getCompressorStream(stream, false); @@ -48,6 +49,7 @@ public class GZipStreamFactory implements CompressorWithConcatenatedStreamsFacto * stream * @since Apache Compress Antlib 1.2 */ + @Override public CompressorInputStream getCompressorStream(InputStream stream, boolean decompressConcatenated) throws IOException { @@ -58,8 +60,9 @@ public class GZipStreamFactory implements CompressorWithConcatenatedStreamsFacto /** * @param stream the stream to write to, should be buffered */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { return new GzipCompressorOutputStream(stream); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java b/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java index 2c9cede..b96cd9b 100644 --- a/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/LZMAStreamFactory.java @@ -35,6 +35,7 @@ public class LZMAStreamFactory implements CompressorStreamFactory { /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return new LZMACompressorInputStream(stream); @@ -43,6 +44,7 @@ public class LZMAStreamFactory implements CompressorStreamFactory { /** * Not implemented. */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/Pack200StreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/Pack200StreamFactory.java b/src/main/org/apache/ant/compress/util/Pack200StreamFactory.java index 3c57ac7..b13c7e1 100644 --- a/src/main/org/apache/ant/compress/util/Pack200StreamFactory.java +++ b/src/main/org/apache/ant/compress/util/Pack200StreamFactory.java @@ -39,6 +39,7 @@ public class Pack200StreamFactory implements FileAwareCompressorStreamFactory { /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return new Pack200CompressorInputStream(stream); @@ -47,6 +48,7 @@ public class Pack200StreamFactory implements FileAwareCompressorStreamFactory { /** * @param stream the stream to write to, should be buffered */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { return new Pack200CompressorOutputStream(stream); @@ -55,6 +57,7 @@ public class Pack200StreamFactory implements FileAwareCompressorStreamFactory { /** * @param file the file to read from */ + @Override public CompressorInputStream getCompressorInputStream(File file) throws IOException { return new Pack200CompressorInputStream(file); @@ -63,9 +66,10 @@ public class Pack200StreamFactory implements FileAwareCompressorStreamFactory { /** * @param file the file to write to */ + @Override public CompressorOutputStream getCompressorOutputStream(File file) throws IOException { return getCompressorStream(new BufferedOutputStream(new FileOutputStream(file))); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/SevenZStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/SevenZStreamFactory.java b/src/main/org/apache/ant/compress/util/SevenZStreamFactory.java index fae06d2..b5cb41a 100644 --- a/src/main/org/apache/ant/compress/util/SevenZStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/SevenZStreamFactory.java @@ -39,6 +39,7 @@ public class SevenZStreamFactory implements FileAwareArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -49,6 +50,7 @@ public class SevenZStreamFactory implements FileAwareArchiveStreamFactory { * @param stream the stream to write to, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { @@ -59,6 +61,7 @@ public class SevenZStreamFactory implements FileAwareArchiveStreamFactory { * @param file the file to read from * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveInputStream(File file, String encoding) throws IOException { @@ -69,6 +72,7 @@ public class SevenZStreamFactory implements FileAwareArchiveStreamFactory { * @param file the file to write to * @param encoding the encoding of the entry names */ + @Override public ArchiveOutputStream getArchiveOutputStream(File file, String encoding) throws IOException { http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/SnappyStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/SnappyStreamFactory.java b/src/main/org/apache/ant/compress/util/SnappyStreamFactory.java index 1b763d0..3e911bc 100644 --- a/src/main/org/apache/ant/compress/util/SnappyStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/SnappyStreamFactory.java @@ -48,6 +48,7 @@ public class SnappyStreamFactory implements CompressorStreamFactory { /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return framed ? new FramedSnappyCompressorInputStream(stream) @@ -57,6 +58,7 @@ public class SnappyStreamFactory implements CompressorStreamFactory { /** * Not implemented. */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/TarStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/TarStreamFactory.java b/src/main/org/apache/ant/compress/util/TarStreamFactory.java index 65ce02f..57859d4 100644 --- a/src/main/org/apache/ant/compress/util/TarStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/TarStreamFactory.java @@ -33,6 +33,7 @@ public class TarStreamFactory implements ArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -43,9 +44,10 @@ public class TarStreamFactory implements ArchiveStreamFactory { * @param stream the stream to write to, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { return new TarArchiveOutputStream(stream, encoding); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/XZStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/XZStreamFactory.java b/src/main/org/apache/ant/compress/util/XZStreamFactory.java index 4c3d04e..e407aa3 100644 --- a/src/main/org/apache/ant/compress/util/XZStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/XZStreamFactory.java @@ -36,6 +36,7 @@ public class XZStreamFactory implements CompressorWithConcatenatedStreamsFactory /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return getCompressorStream(stream, false); @@ -48,6 +49,7 @@ public class XZStreamFactory implements CompressorWithConcatenatedStreamsFactory * input; if false, stop after the first * stream */ + @Override public CompressorInputStream getCompressorStream(InputStream stream, boolean decompressConcatenated) throws IOException { @@ -57,8 +59,9 @@ public class XZStreamFactory implements CompressorWithConcatenatedStreamsFactory /** * @param stream the stream to write to, should be buffered */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { return new XZCompressorOutputStream(stream); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/ZStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/ZStreamFactory.java b/src/main/org/apache/ant/compress/util/ZStreamFactory.java index 53609de..0a32d4e 100644 --- a/src/main/org/apache/ant/compress/util/ZStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/ZStreamFactory.java @@ -35,6 +35,7 @@ public class ZStreamFactory implements CompressorStreamFactory { /** * @param stream the stream to read from, should be buffered */ + @Override public CompressorInputStream getCompressorStream(InputStream stream) throws IOException { return new ZCompressorInputStream(stream); @@ -43,6 +44,7 @@ public class ZStreamFactory implements CompressorStreamFactory { /** * Not implemented. */ + @Override public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/d770c637/src/main/org/apache/ant/compress/util/ZipStreamFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/ant/compress/util/ZipStreamFactory.java b/src/main/org/apache/ant/compress/util/ZipStreamFactory.java index 3ccfd5e..fc1da5e 100644 --- a/src/main/org/apache/ant/compress/util/ZipStreamFactory.java +++ b/src/main/org/apache/ant/compress/util/ZipStreamFactory.java @@ -36,6 +36,7 @@ public class ZipStreamFactory implements FileAwareArchiveStreamFactory { * @param stream the stream to read from, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveStream(InputStream stream, String encoding) throws IOException { @@ -46,6 +47,7 @@ public class ZipStreamFactory implements FileAwareArchiveStreamFactory { * @param stream the stream to write to, should be buffered * @param encoding the encoding of the entry names */ + @Override public ArchiveOutputStream getArchiveStream(OutputStream stream, String encoding) throws IOException { @@ -58,6 +60,7 @@ public class ZipStreamFactory implements FileAwareArchiveStreamFactory { * @param file the file to read from * @param encoding the encoding of the entry names */ + @Override public ArchiveInputStream getArchiveInputStream(File file, String encoding) throws IOException { @@ -70,6 +73,7 @@ public class ZipStreamFactory implements FileAwareArchiveStreamFactory { * @param file the file to write to * @param encoding the encoding of the entry names */ + @Override public ArchiveOutputStream getArchiveOutputStream(File file, String encoding) throws IOException { @@ -77,4 +81,4 @@ public class ZipStreamFactory implements FileAwareArchiveStreamFactory { o.setEncoding(encoding); return o; } -} \ No newline at end of file +}
