summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
diff options
context:
space:
mode:
authorJonathan Nieder <jrn@google.com>2013-05-29 12:33:44 -0700
committerJonathan Nieder <jrn@google.com>2013-05-29 12:34:04 -0700
commit679382fb201c39d3db5e37ecd42b7da37d54b947 (patch)
tree56ed6ed229b85d826c7f644087964f4a31eeb3ef /org.eclipse.jgit.pgm
parent658401c8ef2e82d5c29e7597df05d303559273be (diff)
downloadjgit-679382fb201c39d3db5e37ecd42b7da37d54b947.tar.gz
jgit-679382fb201c39d3db5e37ecd42b7da37d54b947.zip
Move FormatActivator.start()/stop() to a separate class
This makes the functionality of registering all formats from the org.eclipse.jgit.archive package available in contexts where FormatActivator cannot be built because the OSGi core framework is not readily available to build against. Change-Id: If8e3487e933783a7e12f8e1838cbfe0b5862ce80
Diffstat (limited to 'org.eclipse.jgit.pgm')
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java
index 62341a93bd..105d2a51a3 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java
@@ -46,7 +46,7 @@ package org.eclipse.jgit.pgm;
import org.eclipse.jgit.api.ArchiveCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.archive.FormatActivator;
+import org.eclipse.jgit.archive.ArchiveFormats;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.pgm.TextBuiltin;
import org.eclipse.jgit.pgm.internal.CLIText;
@@ -56,7 +56,7 @@ import org.kohsuke.args4j.Option;
@Command(common = true, usage = "usage_archive")
class Archive extends TextBuiltin {
static {
- FormatActivator.start();
+ ArchiveFormats.registerAll();
}
@Argument(index = 0, metaVar = "metaVar_treeish")