diff options
| author | Dave Borowitz | 2012-02-14 18:33:05 +0000 |
|---|---|---|
| committer | Shawn O. Pearce | 2012-03-01 03:09:24 +0000 |
| commit | 903e1b81d43af97e9aff611c77e82cb0969530d8 (patch) | |
| tree | 5789ce7db4973a32f1378181cf539c762879d3a2 | |
| parent | 9d41dbd9585794bacff736d7b353ee3f17bc5a2b (diff) | |
| download | jgit-903e1b81d43af97e9aff611c77e82cb0969530d8.tar.gz jgit-903e1b81d43af97e9aff611c77e82cb0969530d8.tar.xz jgit-903e1b81d43af97e9aff611c77e82cb0969530d8.zip | |
Remove PreUploadHook.onPreAdvertiseRefs
AdvertiseRefsHook.advertiseRefs subsumes this behavior.
Change-Id: Id2d1ebb2503c9ba79eda58aaea2fd76ec233427f
3 files changed, 0 insertions, 27 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHook.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHook.java index 91de77da98..0360f120e0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHook.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHook.java @@ -58,11 +58,6 @@ import org.eclipse.jgit.lib.ObjectId; public interface PreUploadHook { /** A simple no-op hook. */ public static final PreUploadHook NULL = new PreUploadHook() { - public void onPreAdvertiseRefs(UploadPack up) - throws ServiceMayNotContinueException { - // Do nothing. - } - public void onBeginNegotiateRound(UploadPack up, Collection<? extends ObjectId> wants, int cntOffered) throws ServiceMayNotContinueException { @@ -85,21 +80,6 @@ public interface PreUploadHook { }; /** - * Invoked just before {@link UploadPack#sendAdvertisedRefs(RefAdvertiser)}. - * <p> - * New code should prefer implementing - * {@link AdvertiseRefsHook#advertiseRefs(UploadPack)}, which is more powerful - * and may replace this method in the future. - * - * @param up - * the upload pack instance handling the connection. - * @throws ServiceMayNotContinueException - * abort; the message will be sent to the user. - */ - public void onPreAdvertiseRefs(UploadPack up) - throws ServiceMayNotContinueException; - - /** * Invoked before negotiation round is started. * * @param up diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHookChain.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHookChain.java index 25323eb5f2..7f515e038c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHookChain.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PreUploadHookChain.java @@ -79,12 +79,6 @@ public class PreUploadHookChain implements PreUploadHook { return new PreUploadHookChain(newHooks, i); } - public void onPreAdvertiseRefs(UploadPack up) - throws ServiceMayNotContinueException { - for (int i = 0; i < count; i++) - hooks[i].onPreAdvertiseRefs(up); - } - public void onBeginNegotiateRound(UploadPack up, Collection<? extends ObjectId> wants, int cntOffered) throws ServiceMayNotContinueException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index debbab51fc..c61a23cabb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -609,7 +609,6 @@ public class UploadPack { public void sendAdvertisedRefs(final RefAdvertiser adv) throws IOException, ServiceMayNotContinueException { try { - preUploadHook.onPreAdvertiseRefs(this); advertiseRefsHook.advertiseRefs(this); } catch (ServiceMayNotContinueException fail) { if (fail.getMessage() != null) { |