Author: toad
Date: 2009-04-02 17:23:00 +0000 (Thu, 02 Apr 2009)
New Revision: 26367
Modified:
trunk/freenet/src/freenet/client/ArchiveHandler.java
trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java
trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
Simplify API
Modified: trunk/freenet/src/freenet/client/ArchiveHandler.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveHandler.java 2009-04-02
17:01:04 UTC (rev 26366)
+++ trunk/freenet/src/freenet/client/ArchiveHandler.java 2009-04-02
17:23:00 UTC (rev 26367)
@@ -29,8 +29,7 @@
* @throws MetadataParseException If there was an error parsing
intermediary metadata.
*/
public abstract Bucket getMetadata(ArchiveContext archiveContext,
- ClientMetadata dm, int recursionLevel,
- boolean dontEnterImplicitArchives, ArchiveManager
manager)
+ ArchiveManager manager)
throws ArchiveFailureException, ArchiveRestartException,
MetadataParseException, FetchException;
@@ -46,9 +45,7 @@
* @throws MetadataParseException
*/
public abstract Bucket get(String internalName,
- ArchiveContext archiveContext,
- ClientMetadata dm, int recursionLevel,
- boolean dontEnterImplicitArchives, ArchiveManager
manager)
+ ArchiveContext archiveContext, ArchiveManager manager)
throws ArchiveFailureException, ArchiveRestartException,
MetadataParseException, FetchException;
Modified: trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java 2009-04-02
17:01:04 UTC (rev 26366)
+++ trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java 2009-04-02
17:23:00 UTC (rev 26367)
@@ -45,8 +45,7 @@
}
public Bucket get(String internalName, ArchiveContext archiveContext,
- ClientMetadata dm, int recursionLevel,
- boolean dontEnterImplicitArchives, ArchiveManager
manager)
+ ArchiveManager manager)
throws ArchiveFailureException, ArchiveRestartException,
MetadataParseException, FetchException {
@@ -67,11 +66,10 @@
return null;
}
- public Bucket getMetadata(ArchiveContext archiveContext, ClientMetadata
dm,
- int recursionLevel, boolean dontEnterImplicitArchives,
+ public Bucket getMetadata(ArchiveContext archiveContext,
ArchiveManager manager) throws ArchiveFailureException,
ArchiveRestartException, MetadataParseException,
FetchException {
- return get(".metadata", archiveContext, dm, recursionLevel,
dontEnterImplicitArchives, manager);
+ return get(".metadata", archiveContext, manager);
}
public void extractToCache(Bucket bucket, ArchiveContext actx,
Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
2009-04-02 17:01:04 UTC (rev 26366)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
2009-04-02 17:23:00 UTC (rev 26367)
@@ -392,7 +392,7 @@
metadata = null; // Copied to archiveMetadata,
so do not need to clear it
// ah is set. This means we are currently
handling an archive.
Bucket metadataBucket;
- metadataBucket = ah.getMetadata(actx, null,
recursionLevel+1, true, context.archiveManager);
+ metadataBucket = ah.getMetadata(actx,
context.archiveManager);
if(metadataBucket != null) {
try {
metadata =
Metadata.construct(metadataBucket);
@@ -471,7 +471,7 @@
throw new
FetchException(FetchException.UNKNOWN_METADATA, "Archive redirect not in an
archive manifest");
String filename = metadata.getZIPInternalName();
if(logMINOR) Logger.minor(this, "Fetching
"+filename);
- Bucket dataBucket = ah.get(filename, actx,
null, recursionLevel+1, true, context.archiveManager);
+ Bucket dataBucket = ah.get(filename, actx,
context.archiveManager);
if(dataBucket != null) {
if(logMINOR) Logger.minor(this,
"Returning data");
final Bucket out;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
