Author: toad
Date: 2008-12-23 16:29:22 +0000 (Tue, 23 Dec 2008)
New Revision: 24776
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.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:
Remove unnecessary parameters
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-12-23 16:24:24 UTC (rev 24775)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-12-23 16:29:22 UTC (rev 24776)
@@ -110,7 +110,7 @@
if(uri == null) throw new NullPointerException();
FetchContext context = getFetchContext();
FetchWaiter fw = new FetchWaiter();
- ClientGetter get = new ClientGetter(fw,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, context, priorityClass, this, null, null);
+ ClientGetter get = new ClientGetter(fw, uri, context,
priorityClass, this, null, null);
core.clientContext.start(get);
return fw.waitForCompletion();
}
@@ -123,14 +123,14 @@
if(uri == null) throw new NullPointerException();
FetchWaiter fw = new FetchWaiter();
FetchContext context = getFetchContext(overrideMaxSize);
- ClientGetter get = new ClientGetter(fw,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, context, priorityClass, clientContext, null, null);
+ ClientGetter get = new ClientGetter(fw, uri, context,
priorityClass, clientContext, null, null);
core.clientContext.start(get);
return fw.waitForCompletion();
}
public ClientGetter fetch(FreenetURI uri, long maxSize, RequestClient
clientContext, ClientCallback callback, FetchContext fctx) throws
FetchException {
if(uri == null) throw new NullPointerException();
- ClientGetter get = new ClientGetter(callback,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, fctx, priorityClass, clientContext, null, null);
+ ClientGetter get = new ClientGetter(callback, uri, fctx,
priorityClass, clientContext, null, null);
core.clientContext.start(get);
return get;
}
@@ -255,7 +255,7 @@
public void prefetch(FreenetURI uri, long timeout, long maxSize, Set
allowedTypes) {
FetchContext ctx = getFetchContext(maxSize);
ctx.allowedMIMETypes = allowedTypes;
- final ClientGetter get = new ClientGetter(nullCallback,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, ctx, RequestStarter.PREFETCH_PRIORITY_CLASS, this, new NullBucket(), null);
+ final ClientGetter get = new ClientGetter(nullCallback, uri,
ctx, RequestStarter.PREFETCH_PRIORITY_CLASS, this, new NullBucket(), null);
core.getTicker().queueTimedJob(new Runnable() {
public void run() {
get.cancel(null, core.clientContext);
Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-12-23 16:24:24 UTC (rev 24775)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-12-23 16:29:22 UTC (rev 24776)
@@ -61,7 +61,7 @@
* write the data directly to the bucket, or copy it and free the
original temporary bucket. Preferably the
* former, obviously!
*/
- public ClientGetter(ClientCallback client, RequestScheduler chkSched,
RequestScheduler sskSched,
+ public ClientGetter(ClientCallback client,
FreenetURI uri, FetchContext ctx, short
priorityClass, RequestClient clientContext, Bucket returnBucket, Bucket
binaryBlobBucket) {
super(priorityClass, clientContext);
this.clientCallback = client;
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-23
16:24:24 UTC (rev 24775)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-23
16:29:22 UTC (rev 24776)
@@ -117,7 +117,7 @@
ret =
server.core.tempBucketFactory.makeBucket(maxOutputLength);
}
returnBucket = ret;
- getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
+ getter = new ClientGetter(this, uri, fctx,
priorityClass,
lowLevelClient,
returnBucket, null);
}
@@ -179,8 +179,8 @@
if(ret == null)
Logger.error(this, "Impossible: ret = null in FCP
constructor for "+this, new Exception("debug"));
returnBucket = ret;
- getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
-
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
+ getter = new ClientGetter(this,
+ uri, fctx, priorityClass,
lowLevelClient,
binaryBlob ? new NullBucket() :
returnBucket, binaryBlob ? returnBucket : null);
}
@@ -277,8 +277,8 @@
fctx.allowedMIMETypes.add(a);
}
- getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
- server.core.requestStarters.sskFetchScheduler,
uri,
+ getter = new ClientGetter(this,
+ uri,
fctx, priorityClass,
lowLevelClient,
binaryBlob ? new NullBucket() : returnBucket,
Modified: branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-12-23 16:24:24 UTC (rev 24775)
+++ branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-12-23 16:29:22 UTC (rev 24776)
@@ -174,7 +174,7 @@
File.createTempFile(blobFilenamePrefix + availableVersion + "-", ".fblob.tmp",
manager.node.clientCore.getPersistentTempDir());
FreenetURI uri =
URI.setSuggestedEdition(availableVersion);
uri = uri.sskForUSK();
- cg = new ClientGetter(this,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
+ cg = new ClientGetter(this,
uri, ctx,
RequestStarter.IMMEDIATE_SPLITFILE_PRIORITY_CLASS,
this, null, new
FileBucket(tempBlobFile, false, false, false, false, false));
toStart = cg;
Modified: branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
2008-12-23 16:24:24 UTC (rev 24775)
+++ branches/db4o/freenet/src/freenet/node/updater/RevocationChecker.java
2008-12-23 16:29:22 UTC (rev 24776)
@@ -107,8 +107,8 @@
} catch (IOException e) {
Logger.error(this, "Cannot
record revocation fetch (therefore cannot pass it on to peers)!: "+e, e);
}
- cg = revocationGetter = new
ClientGetter(this, core.requestStarters.chkFetchScheduler,
-
core.requestStarters.sskFetchScheduler, manager.revocationURI, ctxRevocation,
+ cg = revocationGetter = new
ClientGetter(this,
+ manager.revocationURI,
ctxRevocation,
aggressive ?
RequestStarter.MAXIMUM_PRIORITY_CLASS :
RequestStarter.IMMEDIATE_SPLITFILE_PRIORITY_CLASS,
this, null, tmpBlobFile
== null ? null : new FileBucket(tmpBlobFile, false, false, false, false,
false));
if(logMINOR) Logger.minor(this, "Queued
another revocation fetcher (count="+revocationDNFCounter+")");
Modified:
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
---
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-23 16:24:24 UTC (rev 24775)
+++
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-23 16:29:22 UTC (rev 24776)
@@ -993,8 +993,6 @@
};
ClientGetter cg = new ClientGetter(myCallback,
-
updateManager.node.clientCore.requestStarters.chkFetchScheduler,
-
updateManager.node.clientCore.requestStarters.sskFetchScheduler,
updateManager.revocationURI, tempContext, (short) 0,
this, null, cleanedBlob);
try {
@@ -1494,8 +1492,6 @@
};
ClientGetter cg = new ClientGetter(myCallback,
-
updateManager.node.clientCore.requestStarters.chkFetchScheduler,
-
updateManager.node.clientCore.requestStarters.sskFetchScheduler,
uri, tempContext, (short) 0, this, null, cleanedBlob);
try {
@@ -1617,8 +1613,6 @@
};
ClientGetter cg = new ClientGetter(myCallback,
-
updateManager.node.clientCore.requestStarters.chkFetchScheduler,
-
updateManager.node.clientCore.requestStarters.sskFetchScheduler,
uri, tempContext, (short) 0, this, null,
cleanedBlob);
try {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
