From 1fc53053c4f973264aeb40c104556a88d43df06b Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 12 Apr 2008 21:59:11 +0000 Subject: [PATCH] add PutFetchable git-svn-id: http://trooper/svn/projects/jSite/trunk@744 c3eda9e8-030b-0410-8277-bc7414b0a119 --- TODO | 1 - src/net/pterodactylus/util/fcp/FcpAdapter.java | 7 +++ src/net/pterodactylus/util/fcp/FcpConnection.java | 14 +++++ src/net/pterodactylus/util/fcp/FcpListener.java | 10 ++++ src/net/pterodactylus/util/fcp/PutFetchable.java | 70 +++++++++++++++++++++++ 5 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 src/net/pterodactylus/util/fcp/PutFetchable.java diff --git a/TODO b/TODO index 49129a3..c85bbe3 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,4 @@ GetPluginInfo (since 1075) -PutFetchable ManageNodesDialog * prevent deletion of currently connected nodes diff --git a/src/net/pterodactylus/util/fcp/FcpAdapter.java b/src/net/pterodactylus/util/fcp/FcpAdapter.java index c5d42ab..c2f7fbf 100644 --- a/src/net/pterodactylus/util/fcp/FcpAdapter.java +++ b/src/net/pterodactylus/util/fcp/FcpAdapter.java @@ -249,6 +249,13 @@ public class FcpAdapter implements FcpListener { /** * {@inheritDoc} */ + public void receivedPutFetchable(FcpConnection fcpConnection, PutFetchable putFetchable) { + /* empty. */ + } + + /** + * {@inheritDoc} + */ public void receivedProtocolError(FcpConnection fcpConnection, ProtocolError protocolError) { /* empty. */ } diff --git a/src/net/pterodactylus/util/fcp/FcpConnection.java b/src/net/pterodactylus/util/fcp/FcpConnection.java index ac7bb34..f08c8cb 100644 --- a/src/net/pterodactylus/util/fcp/FcpConnection.java +++ b/src/net/pterodactylus/util/fcp/FcpConnection.java @@ -574,6 +574,18 @@ public class FcpConnection { } /** + * Notifies all listeners that a “PutFetchable” message was received. + * + * @param putFetchable + * The “PutFetchable” message + */ + private void fireReceivedPutFetchable(PutFetchable putFetchable) { + for (FcpListener fcpListener: fcpListeners) { + fcpListener.receivedPutFetchable(this, putFetchable); + } + } + + /** * Notifies all listeners that a “ProtocolError” message was received. * * @param protocolError @@ -684,6 +696,8 @@ public class FcpConnection { fireReceivedFinishedCompression(new FinishedCompression(fcpMessage)); } else if ("GetFailed".equals(messageName)) { fireReceivedGetFailed(new GetFailed(fcpMessage)); + } else if ("PutFetchable".equals(messageName)) { + fireReceivedPutFetchable(new PutFetchable(fcpMessage)); } else if ("PutSuccessful".equals(messageName)) { fireReceivedPutSuccessful(new PutSuccessful(fcpMessage)); } else if ("PutFailed".equals(messageName)) { diff --git a/src/net/pterodactylus/util/fcp/FcpListener.java b/src/net/pterodactylus/util/fcp/FcpListener.java index bbd0e00..65baa36 100644 --- a/src/net/pterodactylus/util/fcp/FcpListener.java +++ b/src/net/pterodactylus/util/fcp/FcpListener.java @@ -363,6 +363,16 @@ public interface FcpListener extends EventListener { public void receivedPutSuccessful(FcpConnection fcpConnection, PutSuccessful putSuccessful); /** + * Notifies a listener that a “PutFetchable” message was received. + * + * @param fcpConnection + * The connection that received the message + * @param putFetchable + * The “PutFetchable” message + */ + public void receivedPutFetchable(FcpConnection fcpConnection, PutFetchable putFetchable); + + /** * Notifies a listener that a “ProtocolError” was received. * * @param fcpConnection diff --git a/src/net/pterodactylus/util/fcp/PutFetchable.java b/src/net/pterodactylus/util/fcp/PutFetchable.java new file mode 100644 index 0000000..680adbf --- /dev/null +++ b/src/net/pterodactylus/util/fcp/PutFetchable.java @@ -0,0 +1,70 @@ +/* + * jSite2 - PutFetchable.java - + * Copyright © 2008 David Roden + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package net.pterodactylus.util.fcp; + +/** + * The “PutFetchable” message informs a client that a {@link ClientPut} request + * has progressed far enough that the resulting final URI might already be + * fetchable. + * + * @author David ‘Bombe’ Roden <bombe@freenetproject.org> + * @version $Id$ + */ +public class PutFetchable extends BaseMessage { + + /** + * Creates a new “PutFetchable” message that wraps the received message. + * + * @param receivedMessage + * The received message + */ + PutFetchable(FcpMessage receivedMessage) { + super(receivedMessage); + } + + /** + * Returns the identifier of the request. + * + * @return The identifier of the request + */ + public String getIdentifier() { + return getField("Identifier"); + } + + /** + * Returns whether the request is on the global queue. + * + * @return true if the request is on the global queue, + * false if it is on the client-local queue + */ + public boolean isGlobal() { + return Boolean.valueOf(getField("Global")); + } + + /** + * Returns the URI of the request. + * + * @return The URI of the request + */ + public String getURI() { + return getField("URI"); + } + +} -- 2.7.4