zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use for each when Iterator not needed

Browse Source
This commit is contained in:
str4d
2013-11-28 11:56:54 +00:00
parent f112baac48
commit efe3bd2c05
21 changed files with 56 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
View File

@@ -541,14 +541,10 @@ public class TransientSessionKeyManager extends SessionKeyManager {
if (old != null) {
// drop both old and tagSet tags
synchronized (_inboundTagSets) {
for (Iterator<SessionTag> iter = old.getTags().iterator(); iter.hasNext(); ) {
SessionTag tag = iter.next();
for (SessionTag tag : old.getTags())
_inboundTagSets.remove(tag);
}
for (Iterator<SessionTag> 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("<tr><td><b>Session key</b>: ").append(skey.toBase64()).append("</td>" +
"<td><b># Sets:</b> ").append(sets.size()).append("</td></tr>" +
"<tr><td colspan=\"2\"><ul>");
for (Iterator<TagSet> siter = sets.iterator(); siter.hasNext();) {
TagSet ts = siter.next();
for (TagSet ts : sets) {
int size = ts.getTags().size();
total += size;
buf.append("<li><b>ID: ").append(ts.getID());
@@ -1050,8 +1045,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
public long getLastExpirationDate() {
long last = 0;
synchronized (_tagSets) {
for (Iterator<TagSet> iter = _tagSets.iterator(); iter.hasNext();) {
TagSet set = iter.next();
for (TagSet set : _tagSets) {
if ( (set.getDate() > last) && (!set.getTags().isEmpty()) )
last = set.getDate();
}

8
core/java/src/net/i2p/stat/StatManager.java
View File

@@ -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<RateStat> 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<RateStat> iter = _rateStats.values().iterator(); iter.hasNext();) {
RateStat stat = iter.next();
for (RateStat stat : _rateStats.values()) {
if (stat != null) {
stat.coalesceStats();
}

4
core/java/src/net/i2p/util/SimpleTimer.java
View File

@@ -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<TimedEvent> 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) {

7
core/java/test/junit/net/i2p/stat/SimpleStatDumper.java
View File

@@ -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<String> frequencies = new TreeSet<String>(ctx.statManager().getFrequencyNames());
for (Iterator<String> 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<String> rates = new TreeSet<String>(ctx.statManager().getRateNames());
for (Iterator<String> 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(": ")