[freenet-cvs] r21935 - trunk/freenet/src/freenet/client

[sa...@freenetproject.org]

Author: saces
Date: 2008-08-16 18:39:18 +0000 (Sat, 16 Aug 2008)
New Revision: 21935

Modified:
   trunk/freenet/src/freenet/client/HighLevelSimpleClient.java
   trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
Log:
return the request handle on non blocking calls

Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClient.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClient.java 2008-08-16 
18:31:24 UTC (rev 21934)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClient.java 2008-08-16 
18:39:18 UTC (rev 21935)
@@ -7,6 +7,8 @@
 import java.util.Set;

 import freenet.client.async.ClientCallback;
+import freenet.client.async.ClientGetter;
+import freenet.client.async.ClientPutter;
 import freenet.client.events.ClientEventListener;
 import freenet.keys.FreenetURI;

@@ -41,7 +43,7 @@
        /**
         * Non-blocking fetch of a URI with a configurable max-size, context 
object, callback and context.
         */
-       public void fetch(FreenetURI uri, long maxSize, Object context, 
ClientCallback callback, FetchContext fctx) throws FetchException;
+       public ClientGetter fetch(FreenetURI uri, long maxSize, Object context, 
ClientCallback callback, FetchContext fctx) throws FetchException;

        /**
         * Blocking insert.
@@ -53,7 +55,7 @@
        /**
         * Non-blocking insert.
         */
-       public void insert(InsertBlock insert, boolean getCHKOnly, String 
filenameHint, boolean isMetadata, InsertContext ctx, ClientCallback cb) throws 
InsertException;
+       public ClientPutter insert(InsertBlock insert, boolean getCHKOnly, 
String filenameHint, boolean isMetadata, InsertContext ctx, ClientCallback cb) 
throws InsertException;

        /**
         * Blocking insert of a redirect.

Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2008-08-16 18:31:24 UTC (rev 21934)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2008-08-16 18:39:18 UTC (rev 21935)
@@ -136,10 +136,11 @@
                return fw.waitForCompletion();
        }

-       public void fetch(FreenetURI uri, long maxSize, Object context, 
ClientCallback callback, FetchContext fctx) throws FetchException {
+       public ClientGetter fetch(FreenetURI uri, long maxSize, Object context, 
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, context, null, null);
                get.start();
+               return get;
        }

        public FreenetURI insert(InsertBlock insert, boolean getCHKOnly, String 
filenameHint) throws InsertException {
@@ -156,11 +157,12 @@
                return pw.waitForCompletion();
        }

-       public void insert(InsertBlock insert, boolean getCHKOnly, String 
filenameHint, boolean isMetadata, InsertContext ctx, ClientCallback cb) throws 
InsertException {
+       public ClientPutter insert(InsertBlock insert, boolean getCHKOnly, 
String filenameHint, boolean isMetadata, InsertContext ctx, ClientCallback cb) 
throws InsertException {
                ClientPutter put = new ClientPutter(cb, insert.getData(), 
insert.desiredURI, insert.clientMetadata, 
                                ctx, core.requestStarters.chkPutScheduler, 
core.requestStarters.sskPutScheduler, priorityClass, 
                                getCHKOnly, isMetadata, this, null, 
filenameHint, false);
                put.start(false);
+               return put;
        }

        public FreenetURI insertRedirect(FreenetURI insertURI, FreenetURI 
targetURI) throws InsertException {