Author: toad
Date: 2009-02-18 12:56:48 +0000 (Wed, 18 Feb 2009)
New Revision: 25679
Modified:
branches/db4o/freenet/src/freenet/client/ArchiveContext.java
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
branches/db4o/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
branches/db4o/freenet/src/freenet/client/async/SendableRequestSet.java
branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
branches/db4o/freenet/src/freenet/client/async/TransientSendableRequestSet.java
branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
branches/db4o/freenet/src/freenet/client/async/USKManager.java
branches/db4o/freenet/src/freenet/clients/http/FProxyToadlet.java
branches/db4o/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
branches/db4o/freenet/src/freenet/node/Node.java
branches/db4o/freenet/src/freenet/node/NodeARKInserter.java
branches/db4o/freenet/src/freenet/node/RequestClient.java
branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Implement some more removeFrom(), for ClientRequester, ClientPutter and
ClientGetter, and RequestClient.
Modified: branches/db4o/freenet/src/freenet/client/ArchiveContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveContext.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/ArchiveContext.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -4,6 +4,9 @@
package freenet.client;
import java.util.HashSet;
+
+import com.db4o.ObjectContainer;
+
import freenet.keys.FreenetURI;
/**
@@ -33,4 +36,9 @@
if(soFar.size() > maxArchiveLevels)
throw new
ArchiveFailureException(ArchiveFailureException.TOO_MANY_LEVELS);
}
+
+ public void removeFrom(ObjectContainer container) {
+ container.delete(soFar);
+ container.delete(this);
+ }
}
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -273,4 +273,8 @@
return false;
}
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -408,4 +408,11 @@
public ClientCallback getClientCallback() {
return clientCallback;
}
-}
\ No newline at end of file
+
+ public void removeFrom(ObjectContainer container) {
+ uri.removeFrom(container);
+ ctx.removeFrom(container);
+ actx.removeFrom(container);
+ super.removeFrom(container);
+ }
+}
Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -328,4 +328,12 @@
// Ignore, at the moment
}
+ public void removeFrom(ObjectContainer container) {
+ cm.removeFrom(container);
+ ctx.removeFrom(container);
+ targetURI.removeFrom(container);
+ if(uri != null)
+ uri.removeFrom(container);
+ super.removeFrom(container);
+ }
}
Modified: branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -178,7 +178,9 @@
public void removeFrom(ObjectContainer container) {
- // TODO FIXME do something!
+ client.removeFrom(container);
+ requests.removeFrom(container);
+ container.delete(this);
}
public void objectOnActivate(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -230,4 +230,8 @@
return context.getChkFetchScheduler();
}
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified:
branches/db4o/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
2009-02-18 12:46:44 UTC (rev 25678)
+++
branches/db4o/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -56,4 +56,9 @@
return true;
}
+ public void removeFrom(ObjectContainer container) {
+ container.delete(list);
+ container.delete(this);
+ }
+
}
Modified: branches/db4o/freenet/src/freenet/client/async/SendableRequestSet.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SendableRequestSet.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/SendableRequestSet.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -12,4 +12,6 @@
public boolean removeRequest(SendableRequest req, ObjectContainer
container);
+ public void removeFrom(ObjectContainer container);
+
}
Modified: branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -28,6 +28,9 @@
super(prio, new RequestClient() {
public boolean persistent() {
return false;
+ }
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
} });
this.ctx = context;
this.runningInserters = new HashMap();
Modified:
branches/db4o/freenet/src/freenet/client/async/TransientSendableRequestSet.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/TransientSendableRequestSet.java
2009-02-18 12:46:44 UTC (rev 25678)
+++
branches/db4o/freenet/src/freenet/client/async/TransientSendableRequestSet.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -30,4 +30,8 @@
return set.remove(req);
}
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -82,6 +82,10 @@
// The actual USK fetch is non-persistent, only the
tags survive a restart.
return false;
}
+
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
};
Modified: branches/db4o/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKManager.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/client/async/USKManager.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -329,4 +329,8 @@
public boolean persistent() {
return false;
}
+
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
}
Modified: branches/db4o/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/FProxyToadlet.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/clients/http/FProxyToadlet.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -10,6 +10,8 @@
import java.util.HashSet;
import java.util.Set;
+import com.db4o.ObjectContainer;
+
import freenet.client.DefaultMIMETypes;
import freenet.client.FetchException;
import freenet.client.FetchResult;
@@ -444,6 +446,9 @@
FetchResult result = fetch(key, maxSize, new
RequestClient() {
public boolean persistent() {
return false;
+ }
+ public void removeFrom(ObjectContainer
container) {
+ throw new
UnsupportedOperationException();
} });
// Now, is it safe?
Modified:
branches/db4o/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
---
branches/db4o/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2009-02-18 12:46:44 UTC (rev 25678)
+++
branches/db4o/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -377,4 +377,8 @@
public boolean persistent() {
return false;
}
+
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
}
Modified: branches/db4o/freenet/src/freenet/node/Node.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Node.java 2009-02-18 12:46:44 UTC
(rev 25678)
+++ branches/db4o/freenet/src/freenet/node/Node.java 2009-02-18 12:56:48 UTC
(rev 25679)
@@ -4083,6 +4083,9 @@
public boolean persistent() {
return false;
}
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
};
public void onTooLowMTU(int minAdvertisedMTU, int minAcceptableMTU) {
Modified: branches/db4o/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeARKInserter.java 2009-02-18
12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/node/NodeARKInserter.java 2009-02-18
12:56:48 UTC (rev 25679)
@@ -266,4 +266,8 @@
return false;
}
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
}
\ No newline at end of file
Modified: branches/db4o/freenet/src/freenet/node/RequestClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestClient.java 2009-02-18
12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/node/RequestClient.java 2009-02-18
12:56:48 UTC (rev 25679)
@@ -3,6 +3,8 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.node;
+import com.db4o.ObjectContainer;
+
/**
* Must be implemented by any client object returned by
SendableRequest.getClient().
* Mostly this is for scheduling, but it does have one key purpose: to
identify whether
@@ -16,4 +18,6 @@
*/
public boolean persistent();
+ public void removeFrom(ObjectContainer container);
+
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -73,6 +73,10 @@
public boolean persistent() {
return false;
}
+
+ public void removeFrom(ObjectContainer
container) {
+ throw new
UnsupportedOperationException();
+ }
};
this.client = null;
@@ -107,6 +111,10 @@
public boolean persistent() {
return false;
}
+
+ public void removeFrom(ObjectContainer
container) {
+ throw new
UnsupportedOperationException();
+ }
};
} else {
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2009-02-18
12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2009-02-18
12:56:48 UTC (rev 25679)
@@ -57,6 +57,12 @@
public boolean persistent() {
return forever;
}
+ public void removeFrom(ObjectContainer container) {
+ if(forever)
+ container.delete(this);
+ else
+ throw new
UnsupportedOperationException();
+ }
};
completionCallback = cb;
if(persistenceType == ClientRequest.PERSIST_FOREVER) {
Modified: branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -504,5 +504,9 @@
Logger.error(this, "Not storing NodeUpdater in database", new
Exception("error"));
return false;
}
+
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
}
Modified: branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
2009-02-18 12:46:44 UTC (rev 25678)
+++ branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -260,4 +260,8 @@
return false;
}
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified:
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
---
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2009-02-18 12:46:44 UTC (rev 25678)
+++
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2009-02-18 12:56:48 UTC (rev 25679)
@@ -1698,4 +1698,8 @@
public boolean persistent() {
return false;
}
+
+ public void removeFrom(ObjectContainer container) {
+ throw new UnsupportedOperationException();
+ }
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
