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 da40262a8b7685de3877c1d7d6d16a155caa9e7c)

Browse Source 
to branch 'i2p.i2p.zzz.test2' (head 6263bb149b8301059d0471bcc1d47caeca660f4e)
This commit is contained in:
zzz
2013-11-22 17:29:45 +00:00
parent 9b8d3eb688 0454639db8
commit 9e4d5c0e61
522 changed files with 64777 additions and 44219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
View File

@ -108,11 +108,11 @@ public class NetDbRenderer {
DecimalFormat fmt;
if (debug) {
ourRKey = _context.routerHash();
leases = new TreeSet(new LeaseSetRoutingKeyComparator(ourRKey));
leases = new TreeSet<LeaseSet>(new LeaseSetRoutingKeyComparator(ourRKey));
fmt = new DecimalFormat("#0.00");
} else {
ourRKey = null;
leases = new TreeSet(new LeaseSetComparator());
leases = new TreeSet<LeaseSet>(new LeaseSetComparator());
fmt = null;
}
leases.addAll(_context.netDb().getLeases());
@ -257,11 +257,11 @@ public class NetDbRenderer {
buf.setLength(0);
}
ObjectCounter<String> versions = new ObjectCounter();
ObjectCounter<String> countries = new ObjectCounter();
ObjectCounter<String> versions = new ObjectCounter<String>();
ObjectCounter<String> countries = new ObjectCounter<String>();
int[] transportCount = new int[TNAMES.length];
Set<RouterInfo> routers = new TreeSet(new RouterInfoComparator());
Set<RouterInfo> routers = new TreeSet<RouterInfo>(new RouterInfoComparator());
routers.addAll(_context.netDb().getRouters());
for (RouterInfo ri : routers) {
Hash key = ri.getIdentity().getHash();
@ -292,7 +292,7 @@ public class NetDbRenderer {
.append(_("Network Database Router Statistics"))
.append("</th></tr><tr><td style=\"vertical-align: top;\">");
// versions table
List<String> versionList = new ArrayList(versions.objects());
List<String> versionList = new ArrayList<String>(versions.objects());
if (!versionList.isEmpty()) {
Collections.sort(versionList, Collections.reverseOrder(new VersionComparator()));
buf.append("<table>\n");
@ -324,7 +324,7 @@ public class NetDbRenderer {
buf.setLength(0);
// country table
List<String> countryList = new ArrayList(countries.objects());
List<String> countryList = new ArrayList<String>(countries.objects());
if (!countryList.isEmpty()) {
Collections.sort(countryList, new CountryComparator());
buf.append("<table>\n");