From efe3bd2c0513e2a6e74945a67e2710088fb6b404 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 28 Nov 2013 11:56:54 +0000 Subject: [PATCH] Use for each when Iterator not needed --- .../java/src/net/i2p/i2ptunnel/I2PTunnel.java | 4 +- .../net/i2p/i2ptunnel/I2PTunnelServer.java | 5 +-- .../i2p/router/web/ConfigClientsHelper.java | 7 +--- .../router/web/ProfileOrganizerRenderer.java | 10 ++--- .../src/net/i2p/router/web/SummaryHelper.java | 4 +- apps/sam/java/src/net/i2p/sam/SAMBridge.java | 7 ++-- .../i2p/client/streaming/MessageHandler.java | 5 +-- .../src/src/i2p/susi/webmail/Mail.java | 5 +-- .../crypto/TransientSessionKeyManager.java | 14 ++----- core/java/src/net/i2p/stat/StatManager.java | 8 +--- core/java/src/net/i2p/util/SimpleTimer.java | 4 +- .../junit/net/i2p/stat/SimpleStatDumper.java | 7 +--- router/java/src/net/i2p/router/Blocklist.java | 3 +- .../net/i2p/router/client/ClientManager.java | 13 ++---- .../kademlia/FloodOnlySearchJob.java | 5 +-- .../kademlia/IterativeSearchJob.java | 4 +- .../router/networkdb/kademlia/StoreJob.java | 4 +- .../router/networkdb/kademlia/StoreState.java | 21 +++------- .../router/peermanager/ProfileOrganizer.java | 40 ++++++------------- .../transport/CommSystemFacadeImpl.java | 5 +-- .../router/transport/udp/UDPTransport.java | 6 +-- 21 files changed, 56 insertions(+), 125 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java index 9a8379111..3a2f85987 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java @@ -1667,10 +1667,8 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging { */ void routerDisconnected() { _log.error(getPrefix() + "Router disconnected - firing notification events"); - for (Iterator iter = listeners.iterator(); iter.hasNext();) { - ConnectionEventListener lsnr = iter.next(); + for (ConnectionEventListener lsnr : listeners) if (lsnr != null) lsnr.routerDisconnected(); - } } /** diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index d246e61e1..5daa64935 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -16,7 +16,6 @@ import java.net.Socket; import java.net.SocketException; import java.net.SocketTimeoutException; import java.security.GeneralSecurityException; -import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; @@ -320,8 +319,8 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { synchronized (lock) { if (!forced && sockMgr.listSockets().size() != 0) { l.log("There are still active connections!"); - for (Iterator it = sockMgr.listSockets().iterator(); it.hasNext();) { - l.log("->" + it.next()); + for (I2PSocket skt : sockMgr.listSockets()) { + l.log("->" + skt); } return false; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index 9850bd383..9ae98ce99 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -3,7 +3,6 @@ package net.i2p.router.web; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Set; @@ -139,8 +138,7 @@ public class ConfigClientsHelper extends HelperBase { buf.append("" + _("WebApp") + "" + _("Run at Startup?") + "" + _("Control") + "" + _("Description") + "\n"); Properties props = RouterConsoleRunner.webAppProperties(_context); Set keys = new TreeSet(props.keySet()); - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { - String name = iter.next(); + for (String name : keys) { if (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)) { String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED)); String val = props.getProperty(name); @@ -165,8 +163,7 @@ public class ConfigClientsHelper extends HelperBase { buf.append("" + _("Plugin") + "" + _("Run at Startup?") + "" + _("Control") + "" + _("Description") + "\n"); Properties props = PluginStarter.pluginProperties(); Set keys = new TreeSet(props.keySet()); - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { - String name = iter.next(); + for (String name : keys) { if (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED)) { String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED)); String val = props.getProperty(name); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 19cd5ed59..276acd342 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.Writer; import java.text.DecimalFormat; import java.util.Comparator; -import java.util.Iterator; import java.util.Set; import java.util.TreeSet; @@ -45,8 +44,7 @@ class ProfileOrganizerRenderer { Set order = new TreeSet(mode == 2 ? new HashComparator() : new ProfileComparator()); int older = 0; int standard = 0; - for (Iterator iter = peers.iterator(); iter.hasNext();) { - Hash peer = iter.next(); + for (Hash peer : peers) { if (_organizer.getUs().equals(peer)) continue; PeerProfile prof = _organizer.getProfile(peer); if (mode == 2) { @@ -94,8 +92,7 @@ class ProfileOrganizerRenderer { buf.append(" "); buf.append(""); int prevTier = 1; - for (Iterator iter = order.iterator(); iter.hasNext();) { - PeerProfile prof = iter.next(); + for (PeerProfile prof : order) { Hash peer = prof.getPeer(); int tier = 0; @@ -217,8 +214,7 @@ class ProfileOrganizerRenderer { buf.append("").append(_("1d Fail Rate")).append(""); buf.append(""); RateAverages ra = RateAverages.getTemp(); - for (Iterator iter = order.iterator(); iter.hasNext();) { - PeerProfile prof = iter.next(); + for (PeerProfile prof : order) { Hash peer = prof.getPeer(); buf.append(""); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index ac032e497..a548cbe59 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeSet; @@ -417,8 +416,7 @@ public class SummaryHelper extends HelperBase { Collections.sort(clients, new AlphaComparator()); buf.append(""); - for (Iterator iter = clients.iterator(); iter.hasNext(); ) { - Destination client = iter.next(); + for (Destination client : clients) { String name = getName(client); Hash h = client.calculateHash(); diff --git a/apps/sam/java/src/net/i2p/sam/SAMBridge.java b/apps/sam/java/src/net/i2p/sam/SAMBridge.java index 102c27fa0..580f5e88e 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMBridge.java +++ b/apps/sam/java/src/net/i2p/sam/SAMBridge.java @@ -20,7 +20,6 @@ import java.nio.channels.SocketChannel; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -244,9 +243,9 @@ public class SAMBridge implements Runnable, ClientApp { FileOutputStream out = null; try { out = new FileOutputStream(persistFilename); - for (Iterator iter = nameToPrivKeys.keySet().iterator(); iter.hasNext(); ) { - String name = iter.next(); - String privKeys = nameToPrivKeys.get(name); + for (Map.Entry entry : nameToPrivKeys.entrySet()) { + String name = entry.getKey(); + String privKeys = entry.getValue(); out.write(name.getBytes()); out.write('='); out.write(privKeys.getBytes()); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java index b0201a89c..86e6d0e5e 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import java.util.Iterator; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; @@ -94,10 +93,8 @@ class MessageHandler implements I2PSessionMuxedListener { _log.warn("I2PSession disconnected"); _manager.disconnectAllHard(); - for (Iterator iter = _listeners.iterator(); iter.hasNext(); ) { - I2PSocketManager.DisconnectListener lsnr = iter.next(); + for (I2PSocketManager.DisconnectListener lsnr : _listeners) lsnr.sessionDisconnected(); - } _listeners.clear(); } diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java index 56be408b5..4cd3cf729 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java @@ -36,7 +36,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.Locale; /** @@ -143,10 +142,10 @@ public class Mail { } public static void appendRecipients( StringBuilder buf, ArrayList recipients, String prefix ) { - for( Iterator it = recipients.iterator(); it.hasNext(); ) { + for( String recipient : recipients ) { buf.append( prefix ); prefix ="\t"; - buf.append( it.next() ); + buf.append( recipient ); buf.append( "\r\n" ); } } diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java index 8ebfdbf90..bf415f6b5 100644 --- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java +++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java @@ -541,14 +541,10 @@ public class TransientSessionKeyManager extends SessionKeyManager { if (old != null) { // drop both old and tagSet tags synchronized (_inboundTagSets) { - for (Iterator iter = old.getTags().iterator(); iter.hasNext(); ) { - SessionTag tag = iter.next(); + for (SessionTag tag : old.getTags()) _inboundTagSets.remove(tag); - } - for (Iterator iter = sessionTags.iterator(); iter.hasNext(); ) { - SessionTag tag = iter.next(); + for (SessionTag tag : sessionTags) _inboundTagSets.remove(tag); - } } if (_log.shouldLog(Log.WARN)) { @@ -734,8 +730,7 @@ public class TransientSessionKeyManager extends SessionKeyManager { buf.append("" + "" + "
Session key: ").append(skey.toBase64()).append("# Sets: ").append(sets.size()).append("
    "); - for (Iterator siter = sets.iterator(); siter.hasNext();) { - TagSet ts = siter.next(); + for (TagSet ts : sets) { int size = ts.getTags().size(); total += size; buf.append("
  • ID: ").append(ts.getID()); @@ -1050,8 +1045,7 @@ public class TransientSessionKeyManager extends SessionKeyManager { public long getLastExpirationDate() { long last = 0; synchronized (_tagSets) { - for (Iterator iter = _tagSets.iterator(); iter.hasNext();) { - TagSet set = iter.next(); + for (TagSet set : _tagSets) { if ( (set.getDate() > last) && (!set.getTags().isEmpty()) ) last = set.getDate(); } diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java index d148bbe30..0331ac96c 100644 --- a/core/java/src/net/i2p/stat/StatManager.java +++ b/core/java/src/net/i2p/stat/StatManager.java @@ -2,7 +2,6 @@ package net.i2p.stat; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.SortedSet; @@ -63,10 +62,8 @@ public class StatManager { public StatLog getStatLog() { return _statLog; } public void setStatLog(StatLog log) { _statLog = log; - for (Iterator iter = _rateStats.values().iterator(); iter.hasNext(); ) { - RateStat rs = iter.next(); + for (RateStat rs : _rateStats.values()) rs.setStatLog(log); - } } /** @@ -168,8 +165,7 @@ public class StatManager { } } } - for (Iterator iter = _rateStats.values().iterator(); iter.hasNext();) { - RateStat stat = iter.next(); + for (RateStat stat : _rateStats.values()) { if (stat != null) { stat.coalesceStats(); } diff --git a/core/java/src/net/i2p/util/SimpleTimer.java b/core/java/src/net/i2p/util/SimpleTimer.java index d4b537e58..a5ad981f7 100644 --- a/core/java/src/net/i2p/util/SimpleTimer.java +++ b/core/java/src/net/i2p/util/SimpleTimer.java @@ -2,7 +2,6 @@ package net.i2p.util; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -155,8 +154,7 @@ public class SimpleTimer { if ( (_events.size() != _eventTimes.size()) ) { _log.error("Skewed events: " + _events.size() + " for " + _eventTimes.size()); - for (Iterator iter = _eventTimes.keySet().iterator(); iter.hasNext(); ) { - TimedEvent evt = iter.next(); + for (TimedEvent evt : _eventTimes.keySet()) { Long when = _eventTimes.get(evt); TimedEvent cur = _events.get(when); if (cur != evt) { diff --git a/core/java/test/junit/net/i2p/stat/SimpleStatDumper.java b/core/java/test/junit/net/i2p/stat/SimpleStatDumper.java index fd47800f2..889820477 100644 --- a/core/java/test/junit/net/i2p/stat/SimpleStatDumper.java +++ b/core/java/test/junit/net/i2p/stat/SimpleStatDumper.java @@ -1,7 +1,6 @@ package net.i2p.stat; import java.util.Arrays; -import java.util.Iterator; import java.util.Set; import java.util.TreeSet; @@ -22,8 +21,7 @@ public class SimpleStatDumper { private static void dumpFrequencies(I2PAppContext ctx, StringBuilder buf) { Set frequencies = new TreeSet(ctx.statManager().getFrequencyNames()); - for (Iterator iter = frequencies.iterator(); iter.hasNext();) { - String name = iter.next(); + for (String name : frequencies) { FrequencyStat freq = ctx.statManager().getFrequency(name); buf.append('\n'); buf.append(freq.getGroupName()).append('.').append(freq.getName()).append(": ") @@ -42,8 +40,7 @@ public class SimpleStatDumper { private static void dumpRates(I2PAppContext ctx, StringBuilder buf) { Set rates = new TreeSet(ctx.statManager().getRateNames()); - for (Iterator iter = rates.iterator(); iter.hasNext();) { - String name = iter.next(); + for (String name : rates) { RateStat rate = ctx.statManager().getRate(name); buf.append('\n'); buf.append(rate.getGroupName()).append('.').append(rate.getName()).append(": ") diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index 66617507b..9e711016d 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -137,8 +137,7 @@ public class Blocklist { return; } } - for (Iterator iter = _peerBlocklist.keySet().iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : _peerBlocklist.keySet()) { String reason; String comment = _peerBlocklist.get(peer); if (comment != null) diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 5ad452795..4bab3bd06 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -12,7 +12,6 @@ import java.io.IOException; import java.io.Writer; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; @@ -125,21 +124,15 @@ class ClientManager { _listener.stopListening(); Set runners = new HashSet(); synchronized (_runners) { - for (Iterator iter = _runners.values().iterator(); iter.hasNext();) { - ClientConnectionRunner runner = iter.next(); + for (ClientConnectionRunner runner : _runners.values()) runners.add(runner); - } } synchronized (_pendingRunners) { - for (Iterator iter = _pendingRunners.iterator(); iter.hasNext();) { - ClientConnectionRunner runner = iter.next(); + for (ClientConnectionRunner runner : _pendingRunners) runners.add(runner); - } } - for (Iterator iter = runners.iterator(); iter.hasNext(); ) { - ClientConnectionRunner runner = iter.next(); + for (ClientConnectionRunner runner : runners) runner.disconnectClient(msg, Log.WARN); - } _runnersByHash.clear(); } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java index c07f3de9b..9f730d72d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java @@ -3,7 +3,6 @@ package net.i2p.router.networkdb.kademlia; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import net.i2p.data.Hash; @@ -216,8 +215,8 @@ class FloodOnlySearchJob extends FloodSearchJob { _log.info(getJobId() + ": Floodfill search for " + _key + " failed with " + timeRemaining + " remaining after " + time); } synchronized(_unheardFrom) { - for (Iterator iter = _unheardFrom.iterator(); iter.hasNext(); ) - getContext().profileManager().dbLookupFailed(iter.next()); + for (Hash h : _unheardFrom) + getContext().profileManager().dbLookupFailed(h); } _facade.complete(_key); getContext().statManager().addRateData("netDb.failedTime", time, 0); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java index 868f0d0b8..f6cc0b1d5 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java @@ -383,8 +383,8 @@ class IterativeSearchJob extends FloodSearchJob { synchronized(this) { tries = _unheardFrom.size() + _failedPeers.size(); // blame the unheard-from (others already blamed in failed() above) - for (Iterator iter = _unheardFrom.iterator(); iter.hasNext(); ) - getContext().profileManager().dbLookupFailed(iter.next()); + for (Hash h : _unheardFrom) + getContext().profileManager().dbLookupFailed(h); } long time = System.currentTimeMillis() - _created; if (_log.shouldLog(Log.INFO)) { diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index 72f6315ae..e4647b23e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -9,7 +9,6 @@ package net.i2p.router.networkdb.kademlia; */ import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -157,8 +156,7 @@ class StoreJob extends JobImpl { //_state.addPending(closestHashes); if (_log.shouldLog(Log.INFO)) _log.info(getJobId() + ": Continue sending key " + _state.getTarget() + " after " + _state.getAttempted().size() + " tries to " + closestHashes); - for (Iterator iter = closestHashes.iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : closestHashes) { DatabaseEntry ds = _facade.getDataStore().get(peer); if ( (ds == null) || !(ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) ) { if (_log.shouldLog(Log.INFO)) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java index 2b14b80b2..5473f891b 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -124,8 +123,8 @@ class StoreState { public void addPending(Collection pending) { synchronized (_pendingPeers) { _pendingPeers.addAll(pending); - for (Iterator iter = pending.iterator(); iter.hasNext(); ) - _pendingPeerTimes.put(iter.next(), Long.valueOf(_context.clock().now())); + for (Hash peer : pending) + _pendingPeerTimes.put(peer, Long.valueOf(_context.clock().now())); } synchronized (_attemptedPeers) { _attemptedPeers.addAll(pending); @@ -191,34 +190,26 @@ class StoreState { buf.append(" Attempted: "); synchronized (_attemptedPeers) { buf.append(_attemptedPeers.size()).append(' '); - for (Iterator iter = _attemptedPeers.iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : _attemptedPeers) buf.append(peer.toBase64()).append(" "); - } } buf.append(" Pending: "); synchronized (_pendingPeers) { buf.append(_pendingPeers.size()).append(' '); - for (Iterator iter = _pendingPeers.iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : _pendingPeers) buf.append(peer.toBase64()).append(" "); - } } buf.append(" Failed: "); synchronized (_failedPeers) { buf.append(_failedPeers.size()).append(' '); - for (Iterator iter = _failedPeers.iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : _failedPeers) buf.append(peer.toBase64()).append(" "); - } } buf.append(" Successful: "); synchronized (_successfulPeers) { buf.append(_successfulPeers.size()).append(' '); - for (Iterator iter = _successfulPeers.iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : _successfulPeers) buf.append(peer.toBase64()).append(" "); - } } /**** buf.append(" Successful Exploratory: "); diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 4d5a6548c..1edfbe45d 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -236,15 +236,13 @@ public class ProfileOrganizer { getReadLock(); try { - for (Iterator iter = _failingPeers.values().iterator(); iter.hasNext(); ) { - PeerProfile profile = iter.next(); + for (PeerProfile profile : _failingPeers.values()) { if (profile.getLastSendSuccessful() >= hideBefore) activePeers++; else if (profile.getLastHeardFrom() >= hideBefore) activePeers++; } - for (Iterator iter = _notFailingPeers.values().iterator(); iter.hasNext(); ) { - PeerProfile profile = iter.next(); + for (PeerProfile profile : _notFailingPeers.values()) { if (profile.getLastSendSuccessful() >= hideBefore) activePeers++; else if (profile.getLastHeardFrom() >= hideBefore) @@ -539,8 +537,7 @@ public class ProfileOrganizer { if (matches.size() < howMany) { getReadLock(); try { - for (Iterator iter = _notFailingPeers.keySet().iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : _notFailingPeers.keySet()) { if (!_context.commSystem().isEstablished(peer)) exclude.add(peer); } @@ -567,8 +564,7 @@ public class ProfileOrganizer { Map activePeers = new HashMap(); getReadLock(); try { - for (Iterator> iter = _notFailingPeers.entrySet().iterator(); iter.hasNext(); ) { - Map.Entry e = iter.next(); + for (Map.Entry e : _notFailingPeers.entrySet()) { if (_context.commSystem().isEstablished(e.getKey())) activePeers.put(e.getKey(), e.getValue()); } @@ -666,8 +662,7 @@ public class ProfileOrganizer { n = new ArrayList(_notFailingPeers.keySet()); } finally { releaseReadLock(); } List l = new ArrayList(count / 4); - for (Iterator iter = n.iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : n) { if (_context.commSystem().wasUnreachable(peer)) l.add(peer); else { @@ -717,8 +712,7 @@ public class ProfileOrganizer { long cutoff = _context.clock().now() - (20*1000); int count = _notFailingPeers.size(); List l = new ArrayList(count / 128); - for (Iterator iter = _notFailingPeers.values().iterator(); iter.hasNext(); ) { - PeerProfile prof = iter.next(); + for (PeerProfile prof : _notFailingPeers.values()) { if (prof.getTunnelHistory().getLastRejectedBandwidth() > cutoff) l.add(prof.getPeer()); } @@ -779,8 +773,7 @@ public class ProfileOrganizer { if (shouldCoalesce) { getReadLock(); try { - for (Iterator iter = _strictCapacityOrder.iterator(); iter.hasNext(); ) { - PeerProfile prof = iter.next(); + for (PeerProfile prof : _strictCapacityOrder) { if ( (expireOlderThan > 0) && (prof.getLastSendSuccessful() <= expireOlderThan) ) { continue; } @@ -887,8 +880,7 @@ public class ProfileOrganizer { if (numToPromote > 0) { if (_log.shouldLog(Log.INFO)) _log.info("Need to explicitly promote " + numToPromote + " peers to the fast group"); - for (Iterator iter = _strictCapacityOrder.iterator(); iter.hasNext(); ) { - PeerProfile cur = iter.next(); + for (PeerProfile cur : _strictCapacityOrder) { if ( (!_fastPeers.containsKey(cur.getPeer())) && (!cur.getIsFailing()) ) { if (!isSelectable(cur.getPeer())) { // skip peers we dont have in the netDb @@ -990,8 +982,7 @@ public class ProfileOrganizer { int needToUnfail = MIN_NOT_FAILING_ACTIVE - notFailingActive; if (needToUnfail > 0) { int unfailed = 0; - for (Iterator iter = _strictCapacityOrder.iterator(); iter.hasNext(); ) { - PeerProfile best = iter.next(); + for (PeerProfile best : _strictCapacityOrder) { if ( (best.getIsActive()) && (best.getIsFailing()) ) { if (_log.shouldLog(Log.WARN)) _log.warn("All peers were failing, so we have overridden the failing flag for one of the most reliable active peers (" + best.getPeer().toBase64() + ")"); @@ -1022,9 +1013,7 @@ public class ProfileOrganizer { double totalCapacity = 0; double totalIntegration = 0; Set reordered = new TreeSet(_comp); - for (Iterator iter = allPeers.iterator(); iter.hasNext(); ) { - PeerProfile profile = iter.next(); - + for (PeerProfile profile : allPeers) { if (_us.equals(profile.getPeer())) continue; // only take into account active peers that aren't failing @@ -1072,8 +1061,7 @@ public class ProfileOrganizer { double thresholdAtMinHighCap = 0; double thresholdAtLowest = CapacityCalculator.GROWTH_FACTOR; int cur = 0; - for (Iterator iter = reordered.iterator(); iter.hasNext(); ) { - PeerProfile profile = iter.next(); + for (PeerProfile profile : reordered) { double val = profile.getCapacityValue(); if (val > meanCapacity) numExceedingMean++; @@ -1164,8 +1152,7 @@ public class ProfileOrganizer { private void locked_calculateSpeedThresholdMean(Set reordered) { double total = 0; int count = 0; - for (Iterator iter = reordered.iterator(); iter.hasNext(); ) { - PeerProfile profile = iter.next(); + for (PeerProfile profile : reordered) { if (profile.getCapacityValue() >= _thresholdCapacityValue) { // duplicates being clobbered is fine by us total += profile.getSpeedValue(); @@ -1524,8 +1511,7 @@ public class ProfileOrganizer { DecimalFormat fmt = new DecimalFormat("0,000.0"); fmt.setPositivePrefix("+"); - for (Iterator iter = organizer.selectAllPeers().iterator(); iter.hasNext(); ) { - Hash peer = iter.next(); + for (Hash peer : organizer.selectAllPeers()) { PeerProfile profile = organizer.getProfile(peer); if (!profile.getIsActive()) { System.out.println("Peer " + profile.getPeer().toBase64().substring(0,4) diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 88ad248d7..c99535548 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -12,7 +12,6 @@ import java.io.IOException; import java.io.Writer; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Vector; @@ -233,8 +232,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade { */ private class QueueAll implements SimpleTimer.TimedEvent { public void timeReached() { - for (Iterator iter = _context.netDb().getAllRouters().iterator(); iter.hasNext(); ) { - RouterInfo ri = _context.netDb().lookupRouterInfoLocally(iter.next()); + for (Hash h : _context.netDb().getAllRouters()) { + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h); if (ri == null) continue; byte[] ip = getIP(ri); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 062e75686..63e9042dd 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -2114,8 +2114,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public int countActivePeers() { long now = _context.clock().now(); int active = 0; - for (Iterator iter = _peersByIdent.values().iterator(); iter.hasNext(); ) { - PeerState peer = iter.next(); + for (PeerState peer : _peersByIdent.values()) { if (now-peer.getLastReceiveTime() <= 5*60*1000) active++; } @@ -2126,8 +2125,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public int countActiveSendPeers() { long now = _context.clock().now(); int active = 0; - for (Iterator iter = _peersByIdent.values().iterator(); iter.hasNext(); ) { - PeerState peer = iter.next(); + for (PeerState peer : _peersByIdent.values()) { if (now-peer.getLastSendFullyTime() <= 1*60*1000) active++; }