Author: j16sdiz
Date: 2009-04-14 04:39:39 +0000 (Tue, 14 Apr 2009)
New Revision: 26759
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
Log:
Warnings (ArchiveManager.java)
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2009-04-14
04:39:19 UTC (rev 26758)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2009-04-14
04:39:39 UTC (rev 26759)
@@ -9,7 +9,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Set;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -250,7 +250,6 @@
* OTOH maybe extracting inline on the database thread for small
containers would be useful?
*/
public void extractToCache(FreenetURI key, ARCHIVE_TYPE archiveType,
COMPRESSOR_TYPE ctype, Bucket data, ArchiveContext archiveContext,
ArchiveStoreContext ctx, String element, ArchiveExtractCallback callback,
ObjectContainer container, ClientContext context) throws
ArchiveFailureException, ArchiveRestartException {
-
logMINOR = Logger.shouldLog(Logger.MINOR, this);
MutableBoolean gotElement = element != null ? new
MutableBoolean() : null;
@@ -471,7 +470,7 @@
* @param callbackName If we generate a
* @throws ArchiveFailureException
*/
- private ArchiveStoreItem generateMetadata(ArchiveStoreContext ctx,
FreenetURI key, HashSet names, MutableBoolean gotElement, String element2,
ArchiveExtractCallback callback, ObjectContainer container, ClientContext
context) throws ArchiveFailureException {
+ private ArchiveStoreItem generateMetadata(ArchiveStoreContext ctx,
FreenetURI key, Set<String> names, MutableBoolean gotElement, String element2,
ArchiveExtractCallback callback, ObjectContainer container, ClientContext
context) throws ArchiveFailureException {
/* What we have to do is to:
* - Construct a filesystem tree of the names.
* - Turn each level of the tree into a Metadata object,
including those below it, with
@@ -482,9 +481,7 @@
// Root directory.
// String -> either itself, or another HashMap
HashMap<String, Object> dir = new HashMap<String, Object>();
- Iterator i = names.iterator();
- while(i.hasNext()) {
- String name = (String) i.next();
+ for (String name : names) {
addToDirectory(dir, name, "");
}
Metadata metadata = new Metadata(dir, "");
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
