[freenet-cvs] r23243 - in trunk/freenet/src/freenet: client/async node/fcp

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-10-31 13:21:25 +0000 (Fri, 31 Oct 2008)
New Revision: 23243

Modified:
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
Log:
generic, import, for-loop

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-10-31 13:11:35 UTC (rev 23242)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-10-31 13:21:25 UTC (rev 23243)
@@ -1,6 +1,5 @@
 package freenet.client.async;

-import freenet.client.ArchiveManager.ARCHIVE_TYPE;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -8,10 +7,15 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.tar.TarOutputStream;
+
 import freenet.client.ClientMetadata;
 import freenet.client.DefaultMIMETypes;
 import freenet.client.InsertBlock;
@@ -19,14 +23,13 @@
 import freenet.client.InsertException;
 import freenet.client.Metadata;
 import freenet.client.MetadataUnresolvedException;
+import freenet.client.ArchiveManager.ARCHIVE_TYPE;
 import freenet.client.events.SplitfileProgressEvent;
 import freenet.keys.BaseClientKey;
 import freenet.keys.FreenetURI;
 import freenet.support.Logger;
 import freenet.support.api.Bucket;
 import freenet.support.io.BucketTools;
-import org.apache.tools.tar.TarEntry;
-import org.apache.tools.tar.TarOutputStream;

 public class SimpleManifestPutter extends BaseClientPutter implements 
PutCompletionCallback {
        // Only implements PutCompletionCallback for the final metadata insert
@@ -747,25 +750,25 @@
         * Note that this can throw a ClassCastException if the vector passed 
in is
         * bogus (has files pretending to be directories).
         */
-       public static HashMap unflatten(Vector v) {
-               HashMap manifestElements = new HashMap();
-               for(int i=0;i<v.size();i++) {
-                       ManifestElement oldElement = (ManifestElement)v.get(i);
+       public static <T> HashMap<String, Object> 
unflatten(List<ManifestElement> v) {
+               HashMap<String, Object> manifestElements = new HashMap<String, 
Object>();
+               for(ManifestElement oldElement : v) {
                        add(oldElement, oldElement.getName(), manifestElements);
                }
                return manifestElements;
        }

-       private static void add(ManifestElement e, String namePart, HashMap 
target) {
+       private static void add(ManifestElement e, String namePart, Map<String, 
Object> target) {
                int idx = namePart.indexOf('/');
                if(idx < 0) {
                        target.put(namePart, new ManifestElement(e, namePart));
                } else {
                        String before = namePart.substring(0, idx);
                        String after = namePart.substring(idx+1);
-                       HashMap hm = (HashMap) (target.get(before));
+                       @SuppressWarnings("unchecked")
+                       HashMap<String, Object> hm = (HashMap<String, Object>) 
target.get(before);
                        if(hm == null) {
-                               hm = new HashMap();
+                               hm = new HashMap<String, Object>();
                                target.put(before.intern(), hm);
                        }
                        add(e, after, hm);

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2008-10-31 13:11:35 UTC 
(rev 23242)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2008-10-31 13:21:25 UTC 
(rev 23243)
@@ -150,8 +150,9 @@
                fctx.maxTempLength = message.maxTempSize;

                if(message.allowedMIMETypes != null) {
-                       fctx.allowedMIMETypes = new HashSet();
-                       for(int i=0;i<message.allowedMIMETypes.length;i++) 
fctx.allowedMIMETypes.add(message.allowedMIMETypes[i]);
+                       fctx.allowedMIMETypes = new HashSet<String>();
+                       for(String mime : message.allowedMIMETypes) 
+                               fctx.allowedMIMETypes.add(mime);
                }

                this.returnType = message.returnType;
@@ -577,7 +578,8 @@
                fs.putSingle("Finished", Boolean.toString(finished));
                fs.putSingle("Succeeded", Boolean.toString(succeeded));
                if(fctx.allowedMIMETypes != null)
-                       fs.putOverwrite("AllowedMIMETypes", (String[]) 
fctx.allowedMIMETypes.toArray(new String[fctx.allowedMIMETypes.size()]));
+                       fs.putOverwrite("AllowedMIMETypes", (String[]) 
+                                       fctx.allowedMIMETypes.toArray(new 
String[fctx.allowedMIMETypes.size()]));
                if(finished) {
                        if(succeeded) {
                                fs.putSingle("FoundDataLength", 
Long.toString(foundDataLength));