whitespace
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/f240237b Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/f240237b Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/f240237b Branch: refs/heads/master Commit: f240237b06e9d9aa797172e9cd1eaf3fcabe57c5 Parents: b247eae Author: Stefan Bodewig <[email protected]> Authored: Sat May 6 19:45:41 2017 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sat May 6 19:45:41 2017 +0200 ---------------------------------------------------------------------- .../ant/compress/resources/SevenZScanner.java | 46 ++++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/f240237b/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 3ecdd3f..8c954ec 100644 --- a/src/main/org/apache/ant/compress/resources/SevenZScanner.java +++ b/src/main/org/apache/ant/compress/resources/SevenZScanner.java @@ -90,32 +90,32 @@ public class SevenZScanner extends CommonsCompressArchiveScanner { SevenZArchiveEntry entry = null; try (SevenZFile zf = new SevenZFile(srcFile)) { - entry = zf.getNextEntry(); - while (entry != null) { - /* TODO implement canReadEntryData in CC - if (getSkipUnreadableEntries() && !zf.canReadEntryData(entry)) { - log(Messages.skippedIsUnreadable(entry)); - continue; + entry = zf.getNextEntry(); + while (entry != null) { + /* TODO implement canReadEntryData in CC + if (getSkipUnreadableEntries() && !zf.canReadEntryData(entry)) { + log(Messages.skippedIsUnreadable(entry)); + continue; + } + */ + Resource r = new SevenZResource(srcFile, encoding, entry); + String name = entry.getName(); + if (entry.isDirectory()) { + name = trimSeparator(name); + dirEntries.put(name, r); + if (match(name)) { + matchDirEntries.put(name, r); } - */ - Resource r = new SevenZResource(srcFile, encoding, entry); - String name = entry.getName(); - if (entry.isDirectory()) { - name = trimSeparator(name); - dirEntries.put(name, r); - if (match(name)) { - matchDirEntries.put(name, r); - } - } else { - fileEntries.put(name, r); - if (match(name)) { - matchFileEntries.put(name, r); - } + } else { + fileEntries.put(name, r); + if (match(name)) { + matchFileEntries.put(name, r); } - entry = zf.getNextEntry(); } - } catch (IOException ex) { - throw new BuildException("Problem opening " + srcFile, ex); + entry = zf.getNextEntry(); } + } catch (IOException ex) { + throw new BuildException("Problem opening " + srcFile, ex); + } } }
