Author: bodewig
Date: Fri Aug 5 13:22:24 2011
New Revision: 1154205
URL: http://svn.apache.org/viewvc?rev=1154205&view=rev
Log:
whitespace only
Modified:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
Modified:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java?rev=1154205&r1=1154204&r2=1154205&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
Fri Aug 5 13:22:24 2011
@@ -101,10 +101,10 @@ public class CommonsCompressArchiveScann
(FileAwareArchiveStreamFactory) factory;
ai = f.getArchiveInputStream(p.getFile(), encoding);
} else {
- ai =
- factory.getArchiveStream(new BufferedInputStream(src
-
.getInputStream()),
- encoding);
+ ai =
+ factory.getArchiveStream(new BufferedInputStream(src
+
.getInputStream()),
+ encoding);
}
} catch (IOException ex) {
throw new BuildException("problem opening " + src, ex);
Modified:
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java?rev=1154205&r1=1154204&r2=1154205&view=diff
==============================================================================
---
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
(original)
+++
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
Fri Aug 5 13:22:24 2011
@@ -159,24 +159,24 @@ public abstract class ExpandBase extends
private void expandArchiveStream(String name, ArchiveInputStream is,
File dir)
throws IOException {
- FileNameMapper mapper = getMapper();
- log("Expanding: " + name + " into " + dir, Project.MSG_INFO);
- boolean empty = true;
- ArchiveEntry ent = null;
- while ((ent = is.getNextEntry()) != null) {
- if (skipUnreadable && !is.canReadEntryData(ent)) {
- log(Messages.skippedIsUnreadable(ent));
- continue;
- }
- empty = false;
- log("extracting " + ent.getName(), Project.MSG_DEBUG);
- extractFile(FileUtils.getFileUtils(), null, dir, is,
- ent.getName(), ent.getLastModifiedDate(),
- ent.isDirectory(), mapper);
+ FileNameMapper mapper = getMapper();
+ log("Expanding: " + name + " into " + dir, Project.MSG_INFO);
+ boolean empty = true;
+ ArchiveEntry ent = null;
+ while ((ent = is.getNextEntry()) != null) {
+ if (skipUnreadable && !is.canReadEntryData(ent)) {
+ log(Messages.skippedIsUnreadable(ent));
+ continue;
}
- if (empty && getFailOnEmptyArchive()) {
- throw new BuildException("archive '" + name + "' is empty");
- }
- log("expand complete", Project.MSG_VERBOSE);
+ empty = false;
+ log("extracting " + ent.getName(), Project.MSG_DEBUG);
+ extractFile(FileUtils.getFileUtils(), null, dir, is,
+ ent.getName(), ent.getLastModifiedDate(),
+ ent.isDirectory(), mapper);
+ }
+ if (empty && getFailOnEmptyArchive()) {
+ throw new BuildException("archive '" + name + "' is empty");
+ }
+ log("expand complete", Project.MSG_VERBOSE);
}
}