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

propagate from branch 'i2p.i2p' (head cbfe85d22c4d0b05c901db3fa751b57889d9b2d6)

Browse Source 
to branch 'i2p.i2p.str4d.cleanup' (head 94fe1764f50b459da18222434034ad46d604c7a1)
This commit is contained in:
str4d
2013-11-28 11:12:41 +00:00
parent ed2feb3ff7 707f616498
commit f112baac48
22 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
View File

@ -1,7 +1,6 @@
package net.i2p.router.web;
import java.io.File;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@ -58,8 +57,7 @@ public class ConfigUIHelper extends HelperBase {
}
// user themes
Set<String> props = _context.getPropertyNames();
for (Iterator<String> iter = props.iterator(); iter.hasNext(); ) {
String prop = iter.next();
for (String prop : props) {
if (prop.startsWith(PROP_THEME_PFX) && prop.length() > PROP_THEME_PFX.length())
rv.add(prop.substring(PROP_THEME_PFX.length()));
}

7
apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
View File

@ -4,7 +4,6 @@ import java.io.IOException;
import java.io.Writer;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -144,8 +143,7 @@ public class GraphHelper extends FormHandler {
// go to some trouble to see if we have the data for the combined bw graph
boolean hasTx = false;
boolean hasRx = false;
for (Iterator<SummaryListener> iter = ordered.iterator(); iter.hasNext(); ) {
SummaryListener lsnr = iter.next();
for (SummaryListener lsnr : ordered) {
String title = lsnr.getRate().getRateStat().getName();
if (title.equals("bw.sendRate")) hasTx = true;
else if (title.equals("bw.recvRate")) hasRx = true;
@ -166,8 +164,7 @@ public class GraphHelper extends FormHandler {
+ "\" alt=\"" + title + "\" title=\"" + title + "\"></a>\n");
}
for (Iterator<SummaryListener> iter = ordered.iterator(); iter.hasNext(); ) {
SummaryListener lsnr = iter.next();
for (SummaryListener lsnr : ordered) {
Rate r = lsnr.getRate();
// e.g. "statname for 60m"
String title = _("{0} for {1}", r.getRateStat().getName(), DataHelper.formatDuration2(_periodCount * r.getPeriod()));