Author: toad Date: 2008-06-17 17:30:09 +0000 (Tue, 17 Jun 2008) New Revision: 20407
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 Log: freenet.client: minor client layer compile fixes Modified: branches/db4o/freenet/src/freenet/client/FetchWaiter.java =================================================================== --- branches/db4o/freenet/src/freenet/client/FetchWaiter.java 2008-06-17 17:27:20 UTC (rev 20406) +++ branches/db4o/freenet/src/freenet/client/FetchWaiter.java 2008-06-17 17:30:09 UTC (rev 20407) @@ -3,6 +3,8 @@ * http://www.gnu.org/ for further details of the GPL. */ package freenet.client; +import com.db4o.ObjectContainer; + import freenet.client.async.BaseClientPutter; import freenet.client.async.ClientCallback; import freenet.client.async.ClientGetter; @@ -14,25 +16,25 @@ private FetchException error; private boolean finished; - public synchronized void onSuccess(FetchResult result, ClientGetter state) { + public synchronized void onSuccess(FetchResult result, ClientGetter state, ObjectContainer container) { if(finished) return; this.result = result; finished = true; notifyAll(); } - public synchronized void onFailure(FetchException e, ClientGetter state) { + public synchronized void onFailure(FetchException e, ClientGetter state, ObjectContainer container) { if(finished) return; this.error = e; finished = true; notifyAll(); } - public void onSuccess(BaseClientPutter state) { + public void onSuccess(BaseClientPutter state, ObjectContainer container) { throw new UnsupportedOperationException(); } - public void onFailure(InsertException e, BaseClientPutter state) { + public void onFailure(InsertException e, BaseClientPutter state, ObjectContainer container) { throw new UnsupportedOperationException(); } Modified: branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java =================================================================== --- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java 2008-06-17 17:27:20 UTC (rev 20406) +++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java 2008-06-17 17:30:09 UTC (rev 20407) @@ -7,6 +7,8 @@ import java.util.HashMap; import java.util.Set; +import com.db4o.ObjectContainer; + import freenet.client.async.BaseClientPutter; import freenet.client.async.ClientCallback; import freenet.client.async.ClientGetter; @@ -160,7 +162,7 @@ public FreenetURI insertManifest(FreenetURI insertURI, HashMap bucketsByName, String defaultName) throws InsertException { 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); + new SimpleManifestPutter(pw, SimpleManifestPutter.bucketsByNameToManifestEntries(bucketsByName), priorityClass, insertURI, defaultName, getInsertContext(true), false, this, false); core.clientContext.start(putter); return pw.waitForCompletion(); } @@ -205,11 +207,11 @@ private final ClientCallback nullCallback = new ClientCallback() { - public void onFailure(FetchException e, ClientGetter state) { + public void onFailure(FetchException e, ClientGetter state, ObjectContainer container) { // Ignore } - public void onFailure(InsertException e, BaseClientPutter state) { + public void onFailure(InsertException e, BaseClientPutter state, ObjectContainer container) { // Impossible } @@ -225,11 +227,11 @@ // Ignore } - public void onSuccess(FetchResult result, ClientGetter state) { + public void onSuccess(FetchResult result, ClientGetter state, ObjectContainer container) { result.data.free(); } - public void onSuccess(BaseClientPutter state) { + public void onSuccess(BaseClientPutter state, ObjectContainer container) { // Impossible } Modified: branches/db4o/freenet/src/freenet/client/PutWaiter.java =================================================================== --- branches/db4o/freenet/src/freenet/client/PutWaiter.java 2008-06-17 17:27:20 UTC (rev 20406) +++ branches/db4o/freenet/src/freenet/client/PutWaiter.java 2008-06-17 17:30:09 UTC (rev 20407) @@ -1,5 +1,7 @@ package freenet.client; +import com.db4o.ObjectContainer; + import freenet.client.async.BaseClientPutter; import freenet.client.async.ClientCallback; import freenet.client.async.ClientGetter; @@ -13,21 +15,21 @@ private FreenetURI uri; private InsertException error; - public void onSuccess(FetchResult result, ClientGetter state) { + public void onSuccess(FetchResult result, ClientGetter state, ObjectContainer container) { // Ignore } - public void onFailure(FetchException e, ClientGetter state) { + public void onFailure(FetchException e, ClientGetter state, ObjectContainer container) { // Ignore } - public synchronized void onSuccess(BaseClientPutter state) { + public synchronized void onSuccess(BaseClientPutter state, ObjectContainer container) { succeeded = true; finished = true; notifyAll(); } - public synchronized void onFailure(InsertException e, BaseClientPutter state) { + public synchronized void onFailure(InsertException e, BaseClientPutter state, ObjectContainer container) { error = e; finished = true; notifyAll();
