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

Console: Sort tunnels within pools by expiration (ticket #2232)

Browse Source
This commit is contained in:
zzz
2018-06-02 12:28:50 +00:00
parent 7713284e64
commit 363aaadb1a
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,19 @@ class TunnelRenderer {
}
}
/** @since 0.9.35 */
private static class TunnelInfoComparator implements Comparator<TunnelInfo>, Serializable {
public int compare(TunnelInfo l, TunnelInfo r) {
long le = l.getExpiration();
long re = r.getExpiration();
if (le < re)
return -1;
if (le > re)
return 1;
return 0;
}
}
/** @since 0.9.35 */
private void writeGraphLinks(Writer out, TunnelPool in, TunnelPool outPool) throws IOException {
if (in == null || outPool == null)
@ -247,13 +260,19 @@ class TunnelRenderer {
}
private void renderPool(Writer out, TunnelPool in, TunnelPool outPool) throws IOException {
List<TunnelInfo> tunnels = null;
if (in == null)
Comparator<TunnelInfo> comp = new TunnelInfoComparator();
List<TunnelInfo> tunnels;
if (in == null) {
tunnels = new ArrayList<TunnelInfo>();
else
} else {
tunnels = in.listTunnels();
if (outPool != null)
tunnels.addAll(outPool.listTunnels());
Collections.sort(tunnels, comp);
}
if (outPool != null) {
List<TunnelInfo> otunnels = outPool.listTunnels();
Collections.sort(otunnels, comp);
tunnels.addAll(otunnels);
}
long processedIn = (in != null ? in.getLifetimeProcessed() : 0);
long processedOut = (outPool != null ? outPool.getLifetimeProcessed() : 0);