Changeset f4e9257

Timestamp:

Mar 11, 2011 2:18:15 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

8b737b4

Parents:

b048b01

Message:

more generics

Location:

apps/addressbook/java/src/net/i2p/addressbook

Files:

• AddressBook.java (modified) (2 diffs)
• Daemon.java (modified) (1 diff)

apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java

@@ -25 +25 @@
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
@@ -219 +218 @@
      */
     public void merge(AddressBook other, boolean overwrite, Log log) {
-        Iterator otherIter = other.addresses.keySet().iterator();
-
-        while (otherIter.hasNext()) {
-            String otherKey = (String) otherIter.next();
-            String otherValue = (String) other.addresses.get(otherKey);
+        for (Map.Entry<String, String> entry : other.addresses.entrySet()) {
+            String otherKey = entry.getKey();
+            String otherValue = entry.getValue();
 
             if (valid(otherKey, otherValue)) {

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -65 +65 @@
             File published, SubscriptionList subscriptions, Log log) {
         router.merge(master, true, null);
-        Iterator iter = subscriptions.iterator();
+        Iterator<AddressBook> iter = subscriptions.iterator();
         while (iter.hasNext()) {
             // yes, the EepGet fetch() is done in next()
-            router.merge((AddressBook) iter.next(), false, log);
+            router.merge(iter.next(), false, log);
         }
         router.write();