Author: toad
Date: 2008-06-27 22:36:00 +0000 (Fri, 27 Jun 2008)
New Revision: 20836
Modified:
branches/db4o/freenet/src/freenet/client/FetchWaiter.java
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/PutWaiter.java
branches/db4o/freenet/src/freenet/client/async/BaseClientPutter.java
branches/db4o/freenet/src/freenet/client/async/ClientCallback.java
branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
branches/db4o/freenet/src/freenet/node/NodeARKInserter.java
branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.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:
Add ObjectContainer to onMajorProgress() (both in ClientCallback and the put
interface)
Modified: branches/db4o/freenet/src/freenet/client/FetchWaiter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FetchWaiter.java 2008-06-27
22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/FetchWaiter.java 2008-06-27
22:36:00 UTC (rev 20836)
@@ -55,7 +55,7 @@
return result;
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -223,7 +223,7 @@
// Impossible
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified: branches/db4o/freenet/src/freenet/client/PutWaiter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/PutWaiter.java 2008-06-27
22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/PutWaiter.java 2008-06-27
22:36:00 UTC (rev 20836)
@@ -61,7 +61,7 @@
throw new InsertException(InsertException.INTERNAL_ERROR, "Did
not succeed but no error", uri);
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified: branches/db4o/freenet/src/freenet/client/async/BaseClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseClientPutter.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/async/BaseClientPutter.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -3,6 +3,8 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.client.async;
+import com.db4o.ObjectContainer;
+
import freenet.node.RequestClient;
public abstract class BaseClientPutter extends ClientRequester {
@@ -11,6 +13,6 @@
super(priorityClass, context);
}
- public abstract void onMajorProgress();
+ public abstract void onMajorProgress(ObjectContainer container);
}
Modified: branches/db4o/freenet/src/freenet/client/async/ClientCallback.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientCallback.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/async/ClientCallback.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -29,7 +29,7 @@
/** Called when freenet.async thinks that the request should be
serialized to
* disk, if it is a persistent request. */
- public void onMajorProgress();
+ public void onMajorProgress(ObjectContainer container);
/** Called when the inserted data is fetchable (don't rely on this) */
public void onFetchable(BaseClientPutter state, ObjectContainer
container);
Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -217,8 +217,10 @@
client.onFailure(e, this, container);
}
- public void onMajorProgress() {
- client.onMajorProgress();
+ public void onMajorProgress(ObjectContainer container) {
+ if(persistent())
+ container.activate(client, 1);
+ client.onMajorProgress(container);
}
public void onEncode(BaseClientKey key, ClientPutState state,
ObjectContainer container, ClientContext context) {
Modified: branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -66,7 +66,7 @@
data.free();
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -168,8 +168,8 @@
SimpleManifestPutter.this.blockSetFinalized(container,
context);
}
- public void onMajorProgress() {
- SimpleManifestPutter.this.onMajorProgress();
+ public void onMajorProgress(ObjectContainer container) {
+ SimpleManifestPutter.this.onMajorProgress(container);
}
public void onFetchable(ClientPutState state, ObjectContainer
container) {
@@ -710,8 +710,8 @@
return totalSize;
}
- public void onMajorProgress() {
- cb.onMajorProgress();
+ public void onMajorProgress(ObjectContainer container) {
+ cb.onMajorProgress(container);
}
protected void onFetchable(PutHandler handler, ObjectContainer
container) {
Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -111,7 +111,7 @@
count += segments[i].countCheckBlocks();
countCheckBlocks = count;
// Save progress to disk, don't want to do all that again
(probably includes compression in caller)
- parent.onMajorProgress();
+ parent.onMajorProgress(container);
}
public SplitFileInserter(BaseClientPutter parent, PutCompletionCallback
cb, ClientMetadata clientMetadata, InsertContext ctx, boolean getCHKOnly,
boolean metadata, Object token, boolean insertAsArchiveManifest, SimpleFieldSet
fs, ObjectContainer container, ClientContext context) throws ResumeException {
@@ -247,7 +247,7 @@
container.activate(parent, 1);
if(countDataBlocks > 32)
- parent.onMajorProgress();
+ parent.onMajorProgress(container);
parent.notifyClients(container, context);
}
@@ -283,7 +283,7 @@
if(countDataBlocks > 32) {
if(persistent)
container.activate(parent, 1);
- parent.onMajorProgress();
+ parent.onMajorProgress(container);
}
}
@@ -449,7 +449,7 @@
if(countDataBlocks > 32) {
if(persistent)
container.activate(parent, 1);
- parent.onMajorProgress();
+ parent.onMajorProgress(container);
}
synchronized(this) {
if(finished) {
Modified: branches/db4o/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeARKInserter.java 2008-06-27
22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/node/NodeARKInserter.java 2008-06-27
22:36:00 UTC (rev 20836)
@@ -255,7 +255,7 @@
startInserter();
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -294,7 +294,7 @@
*/
public abstract boolean isTotalFinalized(ObjectContainer container);
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified: branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -301,7 +301,7 @@
return URI;
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
Modified: branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
2008-06-27 22:07:18 UTC (rev 20835)
+++ branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -230,7 +230,7 @@
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// TODO Auto-generated method stub
}
Modified:
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
---
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-06-27 22:07:18 UTC (rev 20835)
+++
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-06-27 22:36:00 UTC (rev 20836)
@@ -759,7 +759,7 @@
// Ignore, not possible
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
@@ -805,7 +805,7 @@
public void onGeneratedURI(FreenetURI uri,
BaseClientPutter state, ObjectContainer container) {
// Ignore
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
public void onSuccess(FetchResult result, ClientGetter
state, ObjectContainer container) {
@@ -1128,7 +1128,7 @@
// Ignore, not possible
}
- public void onMajorProgress() {
+ public void onMajorProgress(ObjectContainer container) {
// Ignore
}
