[freenet-cvs] r20314 - branches/db4o/freenet/src/freenet/client

[t...@freenetproject.org]

Author: toad
Date: 2008-06-13 17:08:14 +0000 (Fri, 13 Jun 2008)
New Revision: 20314

Modified:
   branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
Log:
Make HighLevelSimpleClientImpl compile. This class will probably be 
non-persistent...

Modified: 
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2008-06-13 17:07:20 UTC (rev 20313)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2008-06-13 17:08:14 UTC (rev 20314)
@@ -100,7 +100,6 @@
                this.cacheLocalRequests = cacheLocalRequests;
                this.persistentBucketFactory = 
node.persistentEncryptedTempBucketFactory;
                this.healingQueue = node.getHealingQueue();
-               this.blockEncoder = node.backgroundBlockEncoder;
        }

        public void setMaxLength(long maxLength) {
@@ -119,7 +118,7 @@
                FetchContext context = getFetchContext();
                FetchWaiter fw = new FetchWaiter();
                ClientGetter get = new ClientGetter(fw, 
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler, 
uri, context, priorityClass, this, null, null);
-               get.start();
+               core.clientContext.start(get);
                return fw.waitForCompletion();
        }

@@ -132,7 +131,7 @@
                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);
-               get.start();
+               core.clientContext.start(get);
                return fw.waitForCompletion();
        }

@@ -146,7 +145,7 @@
                ClientPutter put = new ClientPutter(pw, insert.getData(), 
insert.desiredURI, insert.clientMetadata, 
                                context, core.requestStarters.chkPutScheduler, 
core.requestStarters.sskPutScheduler, priorityClass, 
                                getCHKOnly, isMetadata, this, null, 
filenameHint, false);
-               put.start(false);
+               core.clientContext.start(put, false);
                return pw.waitForCompletion();
        }

@@ -171,7 +170,7 @@
                PutWaiter pw = new PutWaiter();
                SimpleManifestPutter putter =
                        new SimpleManifestPutter(pw, 
core.requestStarters.chkPutScheduler, core.requestStarters.sskPutScheduler, 
SimpleManifestPutter.bucketsByNameToManifestEntries(bucketsByName), 
priorityClass, insertURI, defaultName, getInsertContext(true), false, this, 
false);
-               putter.start();
+               core.clientContext.start(putter);
                return pw.waitForCompletion();
        }

@@ -206,7 +205,7 @@
                                forceNonPersistent ? new 
NullPersistentFileTracker() : persistentFileTracker,
                                random, INSERT_RETRIES, 
CONSECUTIVE_RNFS_ASSUME_SUCCESS,
                                SPLITFILE_INSERT_THREADS, 
SPLITFILE_BLOCKS_PER_SEGMENT, SPLITFILE_CHECK_BLOCKS_PER_SEGMENT, 
-                               globalEventProducer, cacheLocalRequests, 
core.uskManager, blockEncoder, core.getExecutor());
+                               globalEventProducer, cacheLocalRequests, 
core.uskManager, core.getExecutor());
        }

        public FreenetURI[] generateKeyPair(String docName) {
@@ -258,7 +257,7 @@

                }, timeout);
                try {
-                       get.start();
+                       core.clientContext.start(get);
                } catch (FetchException e) {
                        // Ignore
                }