summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2013-04-27 16:38:16 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2013-04-27 16:38:16 -0400
commit46a3863f21dcb57f5bd5a4487855c14545f57d98 (patch)
tree974edbb4a1cf89cb89f143e8dcea10efbe89b3f2
parente3cce3e4dbc427e0000326def4011604d9b39887 (diff)
parentd0727fc52757c9eb0bd80dd237a19a0f0b86296f (diff)
downloadjgit-46a3863f21dcb57f5bd5a4487855c14545f57d98.tar.gz
jgit-46a3863f21dcb57f5bd5a4487855c14545f57d98.zip
Merge "Cleanup imports and javadocs in ArchiveCommand"
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java
index 7c2e7c0993..e34d706abb 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java
@@ -42,12 +42,10 @@
*/
package org.eclipse.jgit.pgm.archive;
-import java.lang.String;
import java.io.IOException;
import java.io.OutputStream;
import java.util.EnumMap;
import java.util.Map;
-import java.text.MessageFormat;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -55,6 +53,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.archivers.tar.TarConstants;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.GitCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
@@ -106,7 +105,10 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
* the --format= option)
*/
public static enum Format {
+ /** Zip format */
ZIP,
+
+ /** Posix TAR-format */
TAR
}
@@ -242,8 +244,9 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
/**
* @param tree
- * the tag, commit, or tree object to produce an archive for
+ * the tag, commit, or tree object to produce an archive for
* @return this
+ * @throws IOException
*/
public ArchiveCommand setTree(ObjectId tree) throws IOException {
final RevWalk rw = new RevWalk(walk.getObjectReader());