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

* Console: Remove % chart at bottom of tunnels.jsp

Browse Source
This commit is contained in:
zzz
2011-11-14 15:02:57 +00:00
parent fcbee9d9c5
commit 66f25e845a
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
View File

@ -28,7 +28,7 @@ import net.i2p.stat.RateStat;
import net.i2p.util.ObjectCounter; import net.i2p.util.ObjectCounter;
/** /**
* * tunnels.jsp
*/ */
public class TunnelRenderer { public class TunnelRenderer {
private RouterContext _context; private RouterContext _context;
@ -133,12 +133,12 @@ public class TunnelRenderer {
out.write("<div class=\"statusnotes\"><b>" + _("Limited display to the {0} tunnels with the highest usage", DISPLAY_LIMIT) + "</b></div>\n"); out.write("<div class=\"statusnotes\"><b>" + _("Limited display to the {0} tunnels with the highest usage", DISPLAY_LIMIT) + "</b></div>\n");
out.write("<div class=\"statusnotes\"><b>" + _("Inactive participating tunnels") + ": " + inactive + "</b></div>\n"); out.write("<div class=\"statusnotes\"><b>" + _("Inactive participating tunnels") + ": " + inactive + "</b></div>\n");
out.write("<div class=\"statusnotes\"><b>" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B</b></div>\n"); out.write("<div class=\"statusnotes\"><b>" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B</b></div>\n");
renderPeers(out); //renderPeers(out);
} }
private static class TunnelComparator implements Comparator { private static class TunnelComparator implements Comparator<HopConfig> {
public int compare(Object l, Object r) { public int compare(HopConfig l, HopConfig r) {
return (int) (((HopConfig)r).getProcessedMessagesCount() - ((HopConfig)l).getProcessedMessagesCount()); return (int) (r.getProcessedMessagesCount() - l.getProcessedMessagesCount());
} }
} }
@ -228,6 +228,7 @@ public class TunnelRenderer {
DataHelper.formatSize2(processedOut*1024) + "B " + _("out") + "</b></center></div>"); DataHelper.formatSize2(processedOut*1024) + "B " + _("out") + "</b></center></div>");
} }
/****
private void renderPeers(Writer out) throws IOException { private void renderPeers(Writer out) throws IOException {
// count up the peers in the local pools // count up the peers in the local pools
ObjectCounter<Hash> lc = new ObjectCounter(); ObjectCounter<Hash> lc = new ObjectCounter();
@ -265,9 +266,11 @@ public class TunnelRenderer {
out.write("</b> <td>&nbsp;</td> <td align=\"center\"><b>" + partCount); out.write("</b> <td>&nbsp;</td> <td align=\"center\"><b>" + partCount);
out.write("</b> <td>&nbsp;</td></tr></table></div>\n"); out.write("</b> <td>&nbsp;</td></tr></table></div>\n");
} }
****/
/* duplicate of that in tunnelPoolManager for now */ /* duplicate of that in tunnelPoolManager for now */
/** @return total number of non-fallback expl. + client tunnels */ /** @return total number of non-fallback expl. + client tunnels */
/****
private int countTunnelsPerPeer(ObjectCounter<Hash> lc) { private int countTunnelsPerPeer(ObjectCounter<Hash> lc) {
List<TunnelPool> pools = new ArrayList(); List<TunnelPool> pools = new ArrayList();
_context.tunnelManager().listPools(pools); _context.tunnelManager().listPools(pools);
@ -286,8 +289,10 @@ public class TunnelRenderer {
} }
return tunnelCount; return tunnelCount;
} }
****/
/** @return total number of part. tunnels */ /** @return total number of part. tunnels */
/****
private int countParticipatingPerPeer(ObjectCounter<Hash> pc) { private int countParticipatingPerPeer(ObjectCounter<Hash> pc) {
List<HopConfig> participating = _context.tunnelDispatcher().listParticipatingTunnels(); List<HopConfig> participating = _context.tunnelDispatcher().listParticipatingTunnels();
for (HopConfig cfg : participating) { for (HopConfig cfg : participating) {
@ -301,12 +306,6 @@ public class TunnelRenderer {
return participating.size(); return participating.size();
} }
private static class HashComparator implements Comparator {
public int compare(Object l, Object r) {
return ((Hash)l).toBase64().compareTo(((Hash)r).toBase64());
}
}
private static class CountryComparator implements Comparator<Hash> { private static class CountryComparator implements Comparator<Hash> {
public CountryComparator(CommSystemFacade comm) { public CountryComparator(CommSystemFacade comm) {
this.comm = comm; this.comm = comm;
@ -326,7 +325,9 @@ public class TunnelRenderer {
private CommSystemFacade comm; private CommSystemFacade comm;
} }
****/
/** cap string */
private String getCapacity(Hash peer) { private String getCapacity(Hash peer) {
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
if (info != null) { if (info != null) {