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

cleanups

Browse Source
This commit is contained in:
zzz
2010-01-24 15:34:40 +00:00
parent 0ba6482da5
commit 2c7725a8e4
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
View File

@@ -33,17 +33,17 @@ class ProfileOrganizerRenderer {
_comparator = new ProfileComparator(); _comparator = new ProfileComparator();
} }
public void renderStatusHTML(Writer out, boolean full) throws IOException { public void renderStatusHTML(Writer out, boolean full) throws IOException {
Set peers = _organizer.selectAllPeers(); Set<Hash> peers = _organizer.selectAllPeers();
long now = _context.clock().now(); long now = _context.clock().now();
long hideBefore = now - 90*60*1000; long hideBefore = now - 90*60*1000;
TreeSet order = new TreeSet(_comparator); TreeSet<PeerProfile> order = new TreeSet(_comparator);
TreeSet integratedPeers = new TreeSet(_comparator); TreeSet<PeerProfile> integratedPeers = new TreeSet(_comparator);
int older = 0; int older = 0;
int standard = 0; int standard = 0;
for (Iterator iter = peers.iterator(); iter.hasNext();) { for (Iterator<Hash> iter = peers.iterator(); iter.hasNext();) {
Hash peer = (Hash)iter.next(); Hash peer = iter.next();
if (_organizer.getUs().equals(peer)) continue; if (_organizer.getUs().equals(peer)) continue;
PeerProfile prof = _organizer.getProfile(peer); PeerProfile prof = _organizer.getProfile(peer);
//if (_organizer.isWellIntegrated(peer)) { //if (_organizer.isWellIntegrated(peer)) {
@@ -87,8 +87,8 @@ class ProfileOrganizerRenderer {
buf.append("<th>&nbsp;</th>"); buf.append("<th>&nbsp;</th>");
buf.append("</tr>"); buf.append("</tr>");
int prevTier = 1; int prevTier = 1;
for (Iterator iter = order.iterator(); iter.hasNext();) { for (Iterator<PeerProfile> iter = order.iterator(); iter.hasNext();) {
PeerProfile prof = (PeerProfile)iter.next(); PeerProfile prof = iter.next();
Hash peer = prof.getPeer(); Hash peer = prof.getPeer();
int tier = 0; int tier = 0;
@@ -201,8 +201,8 @@ class ProfileOrganizerRenderer {
buf.append("<th class=\"smallhead\">").append(_("1h Fail Rate")).append("</th>"); buf.append("<th class=\"smallhead\">").append(_("1h Fail Rate")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("1d Fail Rate")).append("</th>"); buf.append("<th class=\"smallhead\">").append(_("1d Fail Rate")).append("</th>");
buf.append("</tr>"); buf.append("</tr>");
for (Iterator iter = integratedPeers.iterator(); iter.hasNext();) { for (Iterator<PeerProfile> iter = integratedPeers.iterator(); iter.hasNext();) {
PeerProfile prof = (PeerProfile)iter.next(); PeerProfile prof = iter.next();
Hash peer = prof.getPeer(); Hash peer = prof.getPeer();
buf.append("<tr><td align=\"center\" nowrap>"); buf.append("<tr><td align=\"center\" nowrap>");
@@ -266,16 +266,8 @@ class ProfileOrganizerRenderer {
out.flush(); out.flush();
} }
private class ProfileComparator implements Comparator { private class ProfileComparator implements Comparator<PeerProfile> {
public int compare(Object lhs, Object rhs) { public int compare(PeerProfile left, PeerProfile right) {
if ( (lhs == null) || (rhs == null) )
throw new NullPointerException("lhs=" + lhs + " rhs=" + rhs);
if ( !(lhs instanceof PeerProfile) || !(rhs instanceof PeerProfile) )
throw new ClassCastException("lhs=" + lhs.getClass().getName() + " rhs=" + rhs.getClass().getName());
PeerProfile left = (PeerProfile)lhs;
PeerProfile right = (PeerProfile)rhs;
if (_context.profileOrganizer().isFast(left.getPeer())) { if (_context.profileOrganizer().isFast(left.getPeer())) {
if (_context.profileOrganizer().isFast(right.getPeer())) { if (_context.profileOrganizer().isFast(right.getPeer())) {
return compareHashes(left, right); return compareHashes(left, right);