motiejus
/
jgit
1
Fork 0
Code Releases Activity

ArchiveCommand.Format: pass output stream as first argument to putEntry 

This is more consistent with other APIs where the output side is the
first parameter to be analagous to the left-hand side of an
assignment.

Change-Id: Iec46bd50bc973a38b77d8367296adf5474ba515f
This commit is contained in:
Jonathan Nieder 2013-05-23 16:46:29 -07:00
parent d4932620e0
commit d8177d6e19
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java
View File

@ -106,7 +106,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
* ArchiveOutputStream out = format.createArchiveOutputStream(System.out); * ArchiveOutputStream out = format.createArchiveOutputStream(System.out);
* try { * try {
* for (...) { * for (...) {
* format.putEntry(path, mode, repo.open(objectId), out); * format.putEntry(out, path, mode, repo.open(objectId));
* } * }
* } finally { * } finally {
* out.close(); * out.close();
@ -114,9 +114,8 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
*/ */
public static interface Format { public static interface Format {
ArchiveOutputStream createArchiveOutputStream(OutputStream s); ArchiveOutputStream createArchiveOutputStream(OutputStream s);
void putEntry(String path, FileMode mode, // void putEntry(ArchiveOutputStream out, String path, FileMode mode,
ObjectLoader loader, ArchiveOutputStream out) // ObjectLoader loader) throws IOException;
throws IOException;
} }
/** /**
@ -204,7 +203,7 @@ public OutputStream call() throws GitAPIException {
continue; continue;
walk.getObjectId(idBuf, 0); walk.getObjectId(idBuf, 0);
fmt.putEntry(name, mode, reader.open(idBuf), outa); fmt.putEntry(outa, name, mode, reader.open(idBuf));
} }
} finally { } finally {
outa.close(); outa.close();

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/TarFormat.java
View File

@ -57,8 +57,9 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s) {
return new TarArchiveOutputStream(s); return new TarArchiveOutputStream(s);
} }
public void putEntry(String path, FileMode mode, ObjectLoader loader, public void putEntry(ArchiveOutputStream out,
ArchiveOutputStream out) throws IOException { String path, FileMode mode, ObjectLoader loader)
throws IOException {
if (mode == FileMode.SYMLINK) { if (mode == FileMode.SYMLINK) {
final TarArchiveEntry entry = new TarArchiveEntry( final TarArchiveEntry entry = new TarArchiveEntry(
path, TarConstants.LF_SYMLINK); path, TarConstants.LF_SYMLINK);

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ZipFormat.java
View File

@ -56,8 +56,9 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s) {
return new ZipArchiveOutputStream(s); return new ZipArchiveOutputStream(s);
} }
public void putEntry(String path, FileMode mode, ObjectLoader loader, public void putEntry(ArchiveOutputStream out,
ArchiveOutputStream out) throws IOException { String path, FileMode mode, ObjectLoader loader)
throws IOException {
final ZipArchiveEntry entry = new ZipArchiveEntry(path); final ZipArchiveEntry entry = new ZipArchiveEntry(path);
if (mode == FileMode.REGULAR_FILE) { if (mode == FileMode.REGULAR_FILE) {