Author: toad Date: 2008-06-13 18:42:01 +0000 (Fri, 13 Jun 2008) New Revision: 20325
Modified: branches/db4o/freenet/src/freenet/client/ArchiveHandler.java branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java Log: Make SingleFileFetcher.ah use ArchiveHandler not ArchiveStoreContext Modified: branches/db4o/freenet/src/freenet/client/ArchiveHandler.java =================================================================== --- branches/db4o/freenet/src/freenet/client/ArchiveHandler.java 2008-06-13 18:39:11 UTC (rev 20324) +++ branches/db4o/freenet/src/freenet/client/ArchiveHandler.java 2008-06-13 18:42:01 UTC (rev 20325) @@ -3,6 +3,7 @@ * http://www.gnu.org/ for further details of the GPL. */ package freenet.client; +import freenet.keys.FreenetURI; import freenet.support.api.Bucket; /** @@ -51,6 +52,11 @@ public abstract short getArchiveType(); /** + * Get the key. + */ + public abstract FreenetURI getKey(); + + /** * Unpack a fetched archive to cache, and call the callback if there is one. * @param bucket The downloaded data for the archive. * @param actx The ArchiveContext. Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java =================================================================== --- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java 2008-06-13 18:39:11 UTC (rev 20324) +++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java 2008-06-13 18:42:01 UTC (rev 20325) @@ -12,6 +12,7 @@ import freenet.client.ArchiveContext; import freenet.client.ArchiveExtractCallback; import freenet.client.ArchiveFailureException; +import freenet.client.ArchiveHandler; import freenet.client.ArchiveManager; import freenet.client.ArchiveRestartException; import freenet.client.ArchiveStoreContext; @@ -50,7 +51,7 @@ private Metadata archiveMetadata; final ArchiveContext actx; /** Archive handler. We can only have one archive handler at a time. */ - private ArchiveStoreContext ah; + private ArchiveHandler ah; private int recursionLevel; /** The URI of the currently-being-processed data, for archives etc. */ private FreenetURI thisKey; @@ -67,7 +68,7 @@ */ public SingleFileFetcher(ClientRequester parent, GetCompletionCallback cb, ClientMetadata metadata, ClientKey key, LinkedList metaStrings, FreenetURI origURI, int addedMetaStrings, FetchContext ctx, - ArchiveContext actx, ArchiveStoreContext ah, Metadata archiveMetadata, int maxRetries, int recursionLevel, + ArchiveContext actx, ArchiveHandler ah, Metadata archiveMetadata, int maxRetries, int recursionLevel, boolean dontTellClientGet, long l, boolean isEssential, Bucket returnBucket, boolean isFinal) throws FetchException { super(key, maxRetries, ctx, parent, cb, isEssential, false, l);
