Author: j16sdiz
Date: 2009-04-22 07:28:09 +0000 (Wed, 22 Apr 2009)
New Revision: 27196
Modified:
trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
trunk/freenet/src/freenet/client/async/ContainerInserter.java
Log:
Use more efficient entrySet()
Modified: trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
2009-04-22 07:27:43 UTC (rev 27195)
+++ trunk/freenet/src/freenet/client/async/BaseManifestPutter.java
2009-04-22 07:28:09 UTC (rev 27196)
@@ -1011,10 +1011,9 @@
}
private void namesToByteArrays(HashMap<String, Object>
putHandlersByName, HashMap<String,Object> namesToByteArrays, ObjectContainer
container) {
- Iterator<String> i = putHandlersByName.keySet().iterator();
- while(i.hasNext()) {
- String name = i.next();
- Object o = putHandlersByName.get(name);
+ for(Map.Entry<String, Object> me :
putHandlersByName.entrySet()) {
+ String name = me.getKey();
+ Object o = me.getValue();
if(o instanceof PutHandler) {
PutHandler ph = (PutHandler) o;
if(persistent())
@@ -1467,12 +1466,11 @@
*/
public static HashMap<String, Object>
bucketsByNameToManifestEntries(HashMap<String,Object> bucketsByName) {
HashMap<String,Object> manifestEntries = new
HashMap<String,Object>();
- Iterator<String> i = bucketsByName.keySet().iterator();
- while(i.hasNext()) {
- String name = i.next();
- Object o = bucketsByName.get(name);
+ for (Map.Entry<String, Object> e : bucketsByName.entrySet()) {
+ String name = e.getKey();
+ Object o = e.getValue();
if(o instanceof Bucket) {
- Bucket data = (Bucket) bucketsByName.get(name);
+ Bucket data = (Bucket) o;
manifestEntries.put(name, new
ManifestElement(name, data, null,data.size()));
} else if(o instanceof HashMap) {
manifestEntries.put(name,
bucketsByNameToManifestEntries((HashMap<String, Object>)o));
@@ -1493,11 +1491,10 @@
}
public static void flatten(HashMap<String,Object> manifestElements,
Vector<ManifestElement> v, String prefix) {
- Iterator<String> i = manifestElements.keySet().iterator();
- while(i.hasNext()) {
- String name = i.next();
+ for(Map.Entry<String, Object> e : manifestElements.entrySet()) {
+ String name = e.getKey();
String fullName = prefix.length() == 0 ? name : prefix+
'/' +name;
- Object o = manifestElements.get(name);
+ Object o = e.getValue();
if(o instanceof HashMap) {
flatten((HashMap<String, Object>)o, v,
fullName);
} else if(o instanceof ManifestElement) {
Modified: trunk/freenet/src/freenet/client/async/ContainerInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ContainerInserter.java
2009-04-22 07:27:43 UTC (rev 27195)
+++ trunk/freenet/src/freenet/client/async/ContainerInserter.java
2009-04-22 07:28:09 UTC (rev 27196)
@@ -8,6 +8,7 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -343,8 +344,9 @@
}
private void makeManifest(HashMap<String, Object> manifestElements,
HashMap<String,Object> manifest, String archivePrefix) {
- for (String name:manifestElements.keySet()) {
- Object o = manifestElements.get(name);
+ for (Map.Entry<String, Object> me :
manifestElements.entrySet()) {
+ String name = me.getKey();
+ Object o = me.getValue();
if(o instanceof HashMap) {
@SuppressWarnings("unchecked")
HashMap<String,Object> hm = (HashMap<String,
Object>) o;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
