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: Iec46bd50bc973a38b77d8367296adf5474ba515ftags/v3.1.0.201309270735-rc1
@@ -106,7 +106,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> { | |||
* ArchiveOutputStream out = format.createArchiveOutputStream(System.out); | |||
* try { | |||
* for (...) { | |||
* format.putEntry(path, mode, repo.open(objectId), out); | |||
* format.putEntry(out, path, mode, repo.open(objectId)); | |||
* } | |||
* } finally { | |||
* out.close(); | |||
@@ -114,9 +114,8 @@ public class ArchiveCommand extends GitCommand<OutputStream> { | |||
*/ | |||
public static interface Format { | |||
ArchiveOutputStream createArchiveOutputStream(OutputStream s); | |||
void putEntry(String path, FileMode mode, // | |||
ObjectLoader loader, ArchiveOutputStream out) // | |||
throws IOException; | |||
void putEntry(ArchiveOutputStream out, String path, FileMode mode, | |||
ObjectLoader loader) throws IOException; | |||
} | |||
/** | |||
@@ -204,7 +203,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> { | |||
continue; | |||
walk.getObjectId(idBuf, 0); | |||
fmt.putEntry(name, mode, reader.open(idBuf), outa); | |||
fmt.putEntry(outa, name, mode, reader.open(idBuf)); | |||
} | |||
} finally { | |||
outa.close(); |
@@ -57,8 +57,9 @@ class TarFormat implements ArchiveCommand.Format { | |||
return new TarArchiveOutputStream(s); | |||
} | |||
public void putEntry(String path, FileMode mode, ObjectLoader loader, | |||
ArchiveOutputStream out) throws IOException { | |||
public void putEntry(ArchiveOutputStream out, | |||
String path, FileMode mode, ObjectLoader loader) | |||
throws IOException { | |||
if (mode == FileMode.SYMLINK) { | |||
final TarArchiveEntry entry = new TarArchiveEntry( | |||
path, TarConstants.LF_SYMLINK); |
@@ -56,8 +56,9 @@ class ZipFormat implements ArchiveCommand.Format { | |||
return new ZipArchiveOutputStream(s); | |||
} | |||
public void putEntry(String path, FileMode mode, ObjectLoader loader, | |||
ArchiveOutputStream out) throws IOException { | |||
public void putEntry(ArchiveOutputStream out, | |||
String path, FileMode mode, ObjectLoader loader) | |||
throws IOException { | |||
final ZipArchiveEntry entry = new ZipArchiveEntry(path); | |||
if (mode == FileMode.REGULAR_FILE) { |