add IdentifierCollision

git-svn-id: http://trooper/svn/projects/jSite/trunk@724 c3eda9e8-030b-0410-8277-bc7414b0a119

diff --git a/TODO b/TODO
index 1be61e9..8965128 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ FCPPluginMessage (since 1075)
 FCPPluginReply (since 1075)
 GetPluginInfo (since 1075)
 GetRequestStatus
-IdentifierCollision
 ModifyConfig (since 1027)
 ModifyPersistentRequest
 PersistentPutDir

diff --git a/src/net/pterodactylus/util/fcp/FcpAdapter.java b/src/net/pterodactylus/util/fcp/FcpAdapter.java
index 3cc9842..59cfae5 100644 (file)
--- a/src/net/pterodactylus/util/fcp/FcpAdapter.java
+++ b/src/net/pterodactylus/util/fcp/FcpAdapter.java
@@ -193,6 +193,13 @@ public class FcpAdapter implements FcpListener {
        /**
         * {@inheritDoc}
         */
+       public void receivedIdentifierCollision(FcpConnection fcpConnection, IdentifierCollision identifierCollision) {
+               /* 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 0591b9f..e3ddf7c 100644 (file)
--- a/src/net/pterodactylus/util/fcp/FcpConnection.java
+++ b/src/net/pterodactylus/util/fcp/FcpConnection.java
@@ -475,6 +475,19 @@ public class FcpConnection {
        }
 
        /**
+        * Notifies all listeners that an “IdentifierCollision” message was
+        * received.
+        * 
+        * @param identifierCollision
+        *            The “IdentifierCollision” message
+        */
+       private void fireReceivedIdentifierCollision(IdentifierCollision identifierCollision) {
+               for (FcpListener fcpListener: fcpListeners) {
+                       fcpListener.receivedIdentifierCollision(this, identifierCollision);
+               }
+       }
+
+       /**
         * Notifies all listeners that a “ProtocolError” message was received.
         * 
         * @param protocolError
@@ -587,6 +600,8 @@ public class FcpConnection {
                        fireReceivedPutFailed(new PutFailed(fcpMessage));
                } else if ("DataFound".equals(messageName)) {
                        fireReceivedDataFound(new DataFound(fcpMessage));
+               } else if ("IdentifierCollision".equals(messageName)) {
+                       fireReceivedIdentifierCollision(new IdentifierCollision(fcpMessage));
                } else if ("AllData".equals(messageName)) {
                        long dataLength;
                        try {

diff --git a/src/net/pterodactylus/util/fcp/FcpListener.java b/src/net/pterodactylus/util/fcp/FcpListener.java
index 6f02866..e07bc6d 100644 (file)
--- a/src/net/pterodactylus/util/fcp/FcpListener.java
+++ b/src/net/pterodactylus/util/fcp/FcpListener.java
@@ -281,6 +281,16 @@ public interface FcpListener extends EventListener {
        public void receivedPutFailed(FcpConnection fcpConnection, PutFailed putFailed);
 
        /**
+        * Notifies a listener that an “IdentifierCollision” message was receied.
+        * 
+        * @param fcpConnection
+        *            The connection that received the message
+        * @param identifierCollision
+        *            The “IdentifierCollision” message
+        */
+       public void receivedIdentifierCollision(FcpConnection fcpConnection, IdentifierCollision identifierCollision);
+
+       /**
         * Notifies a listener that a “ProtocolError” was received.
         * 
         * @param fcpConnection

diff --git a/src/net/pterodactylus/util/fcp/IdentifierCollision.java b/src/net/pterodactylus/util/fcp/IdentifierCollision.java
new file mode 100644 (file)
index 0000000..2dbcee7
--- /dev/null
+++ b/src/net/pterodactylus/util/fcp/IdentifierCollision.java
@@ -0,0 +1,61 @@
+/*
+ * jSite2 - IdentifierCollision.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 “IdentifierCollision” message signals the client that the identifier
+ * chosen for a request is already existing.
+ * 
+ * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
+ * @version $Id$
+ */
+public class IdentifierCollision extends BaseMessage {
+
+       /**
+        * Creates a new “IdentifierCollision” message that wraps the received
+        * message.
+        * 
+        * @param receivedMessage
+        *            The received message
+        */
+       IdentifierCollision(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 <code>true</code> if the request is on the global queue,
+        *         <code>false</code> if it is on the client-local queue
+        */
+       public boolean isGlobal() {
+               return Boolean.valueOf(getField("Global"));
+       }
+
+}