Author: zothar
Date: 2006-06-23 03:24:18 +0000 (Fri, 23 Jun 2006)
New Revision: 9356
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
Log:
Put simplified peer status summary in /darknet/ page title, closing Mantis bug
429
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-23 02:55:11 UTC (rev 9355)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-23 03:24:18 UTC (rev 9356)
@@ -63,16 +63,35 @@
StringBuffer buf = new StringBuffer(1024);
//HTTPRequest request = new HTTPRequest(uri);
-
- ctx.getPageMaker().makeHead(buf, "Darknet Peers");
+ final boolean advancedEnabled =
node.getToadletContainer().isAdvancedDarknetEnabled();
+
+ /* gather connection statistics */
+ int numberOfConnected =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_CONNECTED);
+ int numberOfRoutingBackedOff =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF);
+ int numberOfTooNew =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_TOO_NEW);
+ int numberOfTooOld =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_TOO_OLD);
+ int numberOfDisconnected =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_DISCONNECTED);
+ int numberOfNeverConnected =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_NEVER_CONNECTED);
+
+ int numberOfSimpleConnected = numberOfConnected +
numberOfRoutingBackedOff;
+ int numberOfNotConnected = numberOfTooNew + numberOfTooOld +
numberOfDisconnected + numberOfNeverConnected;
+ String titleCountString = null;
+ if(advancedEnabled) {
+ titleCountString = "(" + numberOfConnected + "/" +
numberOfRoutingBackedOff + "/" + numberOfNotConnected + ")";
+ } else {
+ titleCountString = new
Integer(numberOfSimpleConnected).toString();
+ }
+
+ String pageTitle = titleCountString + " Darknet Peers";
+
+ ctx.getPageMaker().makeHead(buf, pageTitle);
+
// FIXME! We need some nice images
PeerNode[] peerNodes = node.getDarknetConnections();
long now = System.currentTimeMillis();
- final boolean advancedEnabled =
node.getToadletContainer().isAdvancedDarknetEnabled();
-
node.alerts.toSummaryHtml(buf);
/* node status values */
@@ -81,14 +100,6 @@
int networkSizeEstimate = (int) node.getNetworkSizeEstimate( 0
);
String nodeUptimeString = timeIntervalToString(( now -
node.startupTime ) / 1000);
- /* gather connection statistics */
- int numberOfConnected =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_CONNECTED);
- int numberOfRoutingBackedOff =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF);
- int numberOfTooNew =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_TOO_NEW);
- int numberOfTooOld =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_TOO_OLD);
- int numberOfDisconnected =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_DISCONNECTED);
- int numberOfNeverConnected =
node.getPeerNodeStatusSize(Node.PEER_NODE_STATUS_NEVER_CONNECTED);
-
buf.append("<table class=\"column\"><tr><td class=\"first\">");
/* node status overview box */
