summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDave Borowitz2012-02-27 15:15:49 (EST)
committer Shawn O. Pearce2012-02-29 22:09:24 (EST)
commitd023f2c78bb18ae81817436fb592cd51283eede4 (patch)
treedc0070a7730921f12cc8848f1ee330f3f0e8169c
parent903e1b81d43af97e9aff611c77e82cb0969530d8 (diff)
downloadjgit-d023f2c78bb18ae81817436fb592cd51283eede4.zip
jgit-d023f2c78bb18ae81817436fb592cd51283eede4.tar.gz
jgit-d023f2c78bb18ae81817436fb592cd51283eede4.tar.bz2
Extract filterCommands as a static method on ReceiveCommandrefs/changes/72/5172/5
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java22
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java19
2 files changed, 28 insertions, 13 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java
index a1788d1..b5ee206 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java
@@ -45,6 +45,8 @@ package org.eclipse.jgit.transport;
import java.io.IOException;
import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.ObjectId;
@@ -120,6 +122,26 @@ public class ReceiveCommand {
OK;
}
+ /**
+ * Filter a list of commands according to result.
+ *
+ * @param commands
+ * commands to filter.
+ * @param want
+ * desired status to filter by.
+ * @return a copy of the command list containing only those commands with the
+ * desired status.
+ */
+ public static List<ReceiveCommand> filter(List<ReceiveCommand> commands,
+ final Result want) {
+ List<ReceiveCommand> r = new ArrayList<ReceiveCommand>(commands.size());
+ for (final ReceiveCommand cmd : commands) {
+ if (cmd.getResult() == want)
+ r.add(cmd);
+ }
+ return r;
+ }
+
private final ObjectId oldId;
private final ObjectId newId;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 0d79110..fd57308 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -821,7 +821,8 @@ public class ReceivePack {
});
}
- postReceive.onPostReceive(this, filterCommands(Result.OK));
+ postReceive.onPostReceive(this,
+ ReceiveCommand.filter(commands, Result.OK));
if (unpackError != null)
throw new UnpackException(unpackError);
@@ -1165,9 +1166,11 @@ public class ReceivePack {
}
private void executeCommands() {
- preReceive.onPreReceive(this, filterCommands(Result.NOT_ATTEMPTED));
+ preReceive.onPreReceive(this,
+ ReceiveCommand.filter(commands, Result.NOT_ATTEMPTED));
- List<ReceiveCommand> toApply = filterCommands(Result.NOT_ATTEMPTED);
+ List<ReceiveCommand> toApply = ReceiveCommand.filter(commands,
+ Result.NOT_ATTEMPTED);
ProgressMonitor updating = NullProgressMonitor.INSTANCE;
if (sideBand) {
SideBandProgressMonitor pm = new SideBandProgressMonitor(msgOut);
@@ -1182,16 +1185,6 @@ public class ReceivePack {
updating.endTask();
}
- private List<ReceiveCommand> filterCommands(final Result want) {
- final List<ReceiveCommand> r = new ArrayList<ReceiveCommand>(commands
- .size());
- for (final ReceiveCommand cmd : commands) {
- if (cmd.getResult() == want)
- r.add(cmd);
- }
- return r;
- }
-
private void sendStatusReport(final boolean forClient, final Reporter out)
throws IOException {
if (unpackError != null) {