r26894 - trunk/freenet/src/freenet/node/fcp

[email protected] Thu, 16 Apr 2009 18:49:16 +0000
Newsgroups gmane.network.freenet.cvs,gmane.spam.detected
Message-ID <[email protected]>
Author: saces
Date: 2009-04-16 18:49:16 +0000 (Thu, 16 Apr 2009)
New Revision: 26894

Modified:
   trunk/freenet/src/freenet/node/fcp/AddPeer.java
   trunk/freenet/src/freenet/node/fcp/AllDataMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
   trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
   trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
   trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java
   trunk/freenet/src/freenet/node/fcp/ConfigData.java
   trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java
   trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java
   trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java
   trunk/freenet/src/freenet/node/fcp/EndListPeerNotesMessage.java
   trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java
   trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
   trunk/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
   trunk/freenet/src/freenet/node/fcp/FCPPluginReply.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
   trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java
   trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java
   trunk/freenet/src/freenet/node/fcp/GetConfig.java
   trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
   trunk/freenet/src/freenet/node/fcp/GetNode.java
   trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
   trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
   trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
   trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
   trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java
   trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
   trunk/freenet/src/freenet/node/fcp/NodeData.java
   trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
   trunk/freenet/src/freenet/node/fcp/PeerMessage.java
   trunk/freenet/src/freenet/node/fcp/PeerNote.java
   trunk/freenet/src/freenet/node/fcp/PeerRemoved.java
   trunk/freenet/src/freenet/node/fcp/PersistentGet.java
   trunk/freenet/src/freenet/node/fcp/PersistentPut.java
   trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
   trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java
   trunk/freenet/src/freenet/node/fcp/PersistentRequestRemovedMessage.java
   trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
   trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
   trunk/freenet/src/freenet/node/fcp/PutFetchableMessage.java
   trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
   trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java
   trunk/freenet/src/freenet/node/fcp/RemovePeer.java
   trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
   trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java
   trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
   trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
   trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java
   trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java
   trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java
   trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
   trunk/freenet/src/freenet/node/fcp/TestDDAReplyMessage.java
   trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java
   trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java
   trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java
   trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java
   trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java
   trunk/freenet/src/freenet/node/fcp/WatchGlobal.java
Log:
add missing @Override annotation

Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -160,6 +160,7 @@
 		handler.outputHandler.queue(new PeerMessage(pn, true, true, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/AllDataMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AllDataMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/AllDataMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -69,6 +69,7 @@
 		return global;
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -292,6 +292,7 @@
 	 * Must be called just after construction, but within a transaction.
 	 * @throws IdentifierCollisionException If the identifier is already in use.
 	 */
+	@Override
 	void register(ObjectContainer container, boolean lazyResume, boolean noTags) throws IdentifierCollisionException {
 		if(client != null)
 			assert(this.persistenceType == client.persistenceType);

Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -270,6 +270,7 @@
 		throw new IllegalArgumentException("Invalid or unsupported return type: "+returnTypeString(s));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		uri.removeFrom(container);
 		container.delete(diskFile);

Modified: trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -51,6 +51,7 @@
 		handler.setClientName(clientName);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -347,6 +347,7 @@
 		
 	}
 
+	@Override
 	void register(ObjectContainer container, boolean lazyResume, boolean noTags) throws IdentifierCollisionException {
 		if(persistenceType != PERSIST_CONNECTION)
 			client.register(this, false, container);

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -183,6 +183,7 @@
 		}
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		filesToRead.clear();
 		container.activate(filesByName, Integer.MAX_VALUE);

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDir.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDir.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -106,6 +106,7 @@
 		if(logMINOR) Logger.minor(this, "Putting dir "+identifier+" : "+priorityClass);
 	}
 
+	@Override
 	void register(ObjectContainer container, boolean lazyResume, boolean noTags) throws IdentifierCollisionException {
 		if(persistenceType != PERSIST_CONNECTION)
 			client.register(this, false, container);
@@ -421,10 +422,12 @@
 
 	public void onSuccess(FetchResult result, ClientGetter state, ObjectContainer container) {}
 	
+	@Override
 	public void onSuccess(BaseClientPutter state, ObjectContainer container) {
 		super.onSuccess(state, container);
 	}
 	
+	@Override
 	public void onFailure(InsertException e, BaseClientPutter state, ObjectContainer container) {
 		super.onFailure(e, state, container);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -120,6 +120,7 @@
 		// Do nothing
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(dirname);
 		container.delete(this);

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -292,6 +292,7 @@
 		return global;
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		uri.removeFrom(container);
 		container.delete(origFilename);

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -56,6 +56,7 @@
 	protected final RequestClient lowLevelClient;
 	private final int hashCode; // for debugging it is good to have a persistent id
 	
+	@Override
 	public int hashCode() {
 		return hashCode;
 	}

Modified: trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -30,6 +30,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "CloseConnectionDuplicateClientName goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ConfigData.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ConfigData.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ConfigData.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -105,6 +105,7 @@
 	}
 
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -50,6 +50,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "DataFound goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -57,6 +57,7 @@
 		return data;
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		data.free();
 		data.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -43,6 +43,7 @@
 		return file;
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(file);
 		container.delete(this);

Modified: trunk/freenet/src/freenet/node/fcp/EndListPeerNotesMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/EndListPeerNotesMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/EndListPeerNotesMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -39,6 +39,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "EndListPeerNotes goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -36,6 +36,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "EndListPeers goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -28,6 +28,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "EndListPersistentRequests goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -76,6 +76,7 @@
 
 	static {
 		Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+			@Override
 			public void shouldUpdate(){
 				logMINOR = Logger.shouldLog(Logger.MINOR, this);
 			}

Modified: trunk/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPPersistentRoot.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/FCPPersistentRoot.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -28,6 +28,7 @@
 
 	public static FCPPersistentRoot create(final long nodeDBHandle, ObjectContainer container) {
 		ObjectSet<FCPPersistentRoot> set = container.query(new Predicate<FCPPersistentRoot>() {
+			@Override
 			public boolean match(FCPPersistentRoot root) {
 				return root.nodeDBHandle == nodeDBHandle;
 			}

Modified: trunk/freenet/src/freenet/node/fcp/FCPPluginReply.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPPluginReply.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/FCPPluginReply.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -81,6 +81,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, NAME + " goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -329,10 +329,12 @@
 		
 		boolean enabled;
 		
+		@Override
 		public Boolean get() {
 			return enabled;
 		}
 		
+		@Override
 		public void set(Boolean set) throws InvalidConfigValueException {
 			// This option will be removed completely soon, so there is little
 			// point in translating it. FIXME remove.

Modified: trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -46,6 +46,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "FinishedCompression goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -42,6 +42,7 @@
     	handler.outputHandler.queue(msg);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/GetConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetConfig.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/GetConfig.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -54,6 +54,7 @@
 		handler.outputHandler.queue(new ConfigData(node, withCurrent, withDefaults, withSortOrder, withExpertFlag, withForceWriteFlag, withShortDescription, withLongDescription, withDataTypes, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -139,6 +139,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "GetFailed goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		if(redirectURI != null) {
 			container.activate(redirectURI, 5);

Modified: trunk/freenet/src/freenet/node/fcp/GetNode.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetNode.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/GetNode.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -47,6 +47,7 @@
 		handler.outputHandler.queue(new NodeData(node, giveOpennetRef, withPrivate, withVolatile, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -62,6 +62,7 @@
 		}
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -37,6 +37,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "IdentifierCollision goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -50,6 +50,7 @@
 		handler.outputHandler.queue(new PeerMessage(pn, true, true, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -58,6 +58,7 @@
 		handler.outputHandler.queue(new EndListPeerNotesMessage(nodeIdentifier, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -49,6 +49,7 @@
 		handler.outputHandler.queue(new EndListPeersMessage(identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -62,6 +62,7 @@
 		}, NativeThread.HIGH_PRIORITY-1, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyConfig.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ModifyConfig.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -72,6 +72,7 @@
 		handler.outputHandler.queue(new ConfigData(node, true, false, false, false, false, false, false, false, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeer.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeer.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -90,6 +90,7 @@
 		handler.outputHandler.queue(new PeerMessage(pn, true, true, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -84,6 +84,7 @@
 		handler.outputHandler.queue(new PeerNote(nodeIdentifier, noteText, peerNoteType, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -99,6 +99,7 @@
 		}
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/NodeData.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/NodeData.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/NodeData.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -63,6 +63,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "NodeData goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -60,6 +60,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "NodeHello goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/PeerMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PeerMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PeerMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -55,6 +55,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "Peer goes from server to client not the other way around", null, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/PeerNote.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PeerNote.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PeerNote.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -52,6 +52,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PeerNote goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/PeerRemoved.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PeerRemoved.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PeerRemoved.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -42,6 +42,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PeerRemoved goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/PersistentGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentGet.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PersistentGet.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -90,6 +90,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PersistentGet goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(uri, 5);
 		uri.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/PersistentPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPut.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPut.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -95,6 +95,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PersistentPut goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(uri, 5);
 		uri.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -132,6 +132,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PersistentPut goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(uri, 5);
 		uri.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -54,6 +54,7 @@
         throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PersistentRequestModified goes from server to client not the other way around", ident, global);
     }
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/PersistentRequestRemovedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentRequestRemovedMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PersistentRequestRemovedMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -39,6 +39,7 @@
         throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PersistentRequestRemoved goes from server to client not the other way around", ident, global);
     }
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -176,6 +176,7 @@
 		return "ProtocolError";
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -113,6 +113,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PutFailed goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(this, 5); // everything
 		if(tracker != null)

Modified: trunk/freenet/src/freenet/node/fcp/PutFetchableMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutFetchableMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PutFetchableMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -42,6 +42,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "PutFetchable goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(uri, 5);
 		uri.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -48,6 +48,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "InsertSuccessful goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(uri, 5);
 		uri.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -38,6 +38,7 @@
 		return new ManifestElement(name, targetURI, getMIMEType());
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(targetURI, 5);
 		targetURI.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/RemovePeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePeer.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/RemovePeer.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -52,6 +52,7 @@
 		handler.outputHandler.queue(new PeerRemoved(identity, nodeIdentifier, identifier));
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -67,6 +67,7 @@
 		}
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -41,6 +41,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "SSKKeypair goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(insertURI, 5);
 		insertURI.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -36,6 +36,7 @@
 		node.exit("Received FCP shutdown message");
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}	

Modified: trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -73,6 +73,7 @@
 		return event.finalizedTotal;
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(event, 1);
 		event.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -42,6 +42,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "StartedCompression goes from server to client not the other way around", identifier, global);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -76,6 +76,7 @@
 		handler.outputHandler.queue(reply);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -49,6 +49,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "SubscribedUSKUpdate goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -82,6 +82,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, name + " goes from server to client not the other way around", name, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/TestDDAReplyMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDAReplyMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/TestDDAReplyMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -57,6 +57,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, name + " goes from server to client not the other way around", name, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -65,6 +65,7 @@
 		handler.outputHandler.queue(reply);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -62,6 +62,7 @@
 		handler.outputHandler.queue(reply);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		throw new UnsupportedOperationException();
 	}

Modified: trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -41,6 +41,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "URIGenerated goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.activate(uri, 5);
 		uri.removeFrom(container);

Modified: trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/UnknownNodeIdentifierMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -38,6 +38,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "UnknownNodeIdentifier goes from server to client not the other way around", nodeIdentifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/UnknownPeerNoteTypeMessage.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -38,6 +38,7 @@
 		throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "UnknownPeerNoteType goes from server to client not the other way around", identifier, false);
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}

Modified: trunk/freenet/src/freenet/node/fcp/WatchGlobal.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/WatchGlobal.java	2009-04-16 18:47:43 UTC (rev 26893)
+++ trunk/freenet/src/freenet/node/fcp/WatchGlobal.java	2009-04-16 18:49:16 UTC (rev 26894)
@@ -61,6 +61,7 @@
 		
 	}
 
+	@Override
 	public void removeFrom(ObjectContainer container) {
 		container.delete(this);
 	}