Author: nextgens
Date: 2008-04-23 05:39:28 +0000 (Wed, 23 Apr 2008)
New Revision: 19516
Modified:
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
factor some code out
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-04-23 04:56:11 UTC (rev 19515)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-04-23 05:39:28 UTC (rev 19516)
@@ -262,80 +262,7 @@
// Peer statistics box
HTMLNode peerStatsInfobox =
nextTableCell.addChild("div", "class", "infobox");
- peerStatsInfobox.addChild("div", "class",
"infobox-header", l10nStats("peerStatsTitle"));
- HTMLNode peerStatsContent =
peerStatsInfobox.addChild("div", "class", "infobox-content");
- HTMLNode peerStatsList =
peerStatsContent.addChild("ul");
- if (numberOfConnected > 0) {
- HTMLNode peerStatsConnectedListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsConnectedListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_connected",
l10n("connected"), "border-bottom: 1px dotted; cursor: help;" },
l10n("connectedShort"));
- peerStatsConnectedListItem.addChild("span",
":\u00a0" + numberOfConnected);
- }
- if (numberOfRoutingBackedOff > 0) {
- HTMLNode peerStatsRoutingBackedOffListItem =
peerStatsList.addChild("li").addChild("span");
-
peerStatsRoutingBackedOffListItem.addChild("span", new String[] { "class",
"title", "style" }, new String[] { "peer_backed_off", (advancedModeEnabled ?
l10n("backedOff") : l10n("busy")), "border-bottom: 1px dotted; cursor: help;"
}, advancedModeEnabled ? l10n("backedOffShort") : l10n("busyShort"));
-
peerStatsRoutingBackedOffListItem.addChild("span", ":\u00a0" +
numberOfRoutingBackedOff);
- }
- if (numberOfTooNew > 0) {
- HTMLNode peerStatsTooNewListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsTooNewListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_too_new",
l10n("tooNew"), "border-bottom: 1px dotted; cursor: help;" },
l10n("tooNewShort"));
- peerStatsTooNewListItem.addChild("span",
":\u00a0" + numberOfTooNew);
- }
- if (numberOfTooOld > 0) {
- HTMLNode peerStatsTooOldListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsTooOldListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_too_old",
l10n("tooOld"), "border-bottom: 1px dotted; cursor: help;" },
l10n("tooOldShort"));
- peerStatsTooOldListItem.addChild("span",
":\u00a0" + numberOfTooOld);
- }
- if (numberOfDisconnected > 0) {
- HTMLNode peerStatsDisconnectedListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsDisconnectedListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] { "peer_disconnected",
l10n("notConnected"), "border-bottom: 1px dotted; cursor: help;" },
l10n("notConnectedShort"));
- peerStatsDisconnectedListItem.addChild("span",
":\u00a0" + numberOfDisconnected);
- }
- if (numberOfNeverConnected > 0) {
- HTMLNode peerStatsNeverConnectedListItem =
peerStatsList.addChild("li").addChild("span");
-
peerStatsNeverConnectedListItem.addChild("span", new String[] { "class",
"title", "style" }, new String[] { "peer_never_connected",
l10n("neverConnected"), "border-bottom: 1px dotted; cursor: help;" },
l10n("neverConnectedShort"));
-
peerStatsNeverConnectedListItem.addChild("span", ":\u00a0" +
numberOfNeverConnected);
- }
- if (numberOfDisabled > 0) {
- HTMLNode peerStatsDisabledListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsDisabledListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_disabled",
l10n("disabled"), "border-bottom: 1px dotted; cursor: help;" },
l10n("disabledShort"));
- peerStatsDisabledListItem.addChild("span",
":\u00a0" + numberOfDisabled);
- }
- if (numberOfBursting > 0) {
- HTMLNode peerStatsBurstingListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsBurstingListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_bursting",
l10n("bursting"), "border-bottom: 1px dotted; cursor: help;" },
l10n("burstingShort"));
- peerStatsBurstingListItem.addChild("span",
":\u00a0" + numberOfBursting);
- }
- if (numberOfListening > 0) {
- HTMLNode peerStatsListeningListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsListeningListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_listening",
l10n("listening"), "border-bottom: 1px dotted; cursor: help;" },
l10n("listeningShort"));
- peerStatsListeningListItem.addChild("span",
":\u00a0" + numberOfListening);
- }
- if (numberOfListenOnly > 0) {
- HTMLNode peerStatsListenOnlyListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsListenOnlyListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] { "peer_listen_only",
l10n("listenOnly"), "border-bottom: 1px dotted; cursor: help;" },
l10n("listenOnlyShort"));
- peerStatsListenOnlyListItem.addChild("span",
":\u00a0" + numberOfListenOnly);
- }
- if (numberOfClockProblem > 0) {
- HTMLNode peerStatsListenOnlyListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsListenOnlyListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] {
"peer_clock_problem", l10n("clockProblem"), "border-bottom: 1px dotted; cursor:
help;" }, l10n("clockProblemShort"));
- peerStatsListenOnlyListItem.addChild("span",
":\u00a0" + numberOfClockProblem);
- }
- if (numberOfConnError > 0) {
- HTMLNode peerStatsListenOnlyListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsListenOnlyListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] { "peer_conn_error",
l10n("connError"), "border-bottom: 1px dotted; cursor: help;" },
l10n("connErrorShort"));
- peerStatsListenOnlyListItem.addChild("span",
":\u00a0" + numberOfConnError);
- }
- if (numberOfDisconnecting > 0) {
- HTMLNode peerStatsListenOnlyListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsListenOnlyListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] {
"peer_disconnecting", l10n("disconnecting"), "border-bottom: 1px dotted;
cursor: help;" }, l10n("disconnectingShort"));
- peerStatsListenOnlyListItem.addChild("span",
":\u00a0" + numberOfDisconnecting);
- }
-
- if (numberOfRoutingDisabled > 0) {
- HTMLNode peerStatsListenOnlyListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsListenOnlyListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] {
"peer_routing_disabled", l10n("routingDisabled"), "border-bottom: 1px dotted;
cursor: help;" }, l10n("routingDisabledShort"));
- peerStatsListenOnlyListItem.addChild("span",
":\u00a0" + numberOfRoutingDisabled);
- }
+ StatisticsToadlet.drawPeerStatsBox(peerStatsInfobox,
advancedModeEnabled, numberOfConnected, numberOfRoutingBackedOff,
numberOfTooNew, numberOfTooOld, numberOfDisconnected, numberOfNeverConnected,
numberOfDisabled, numberOfBursting, numberOfListening, numberOfListenOnly, 0,
0, numberOfRoutingDisabled, numberOfClockProblem, numberOfConnError,
numberOfDisconnecting);
// Peer routing backoff reason box
if(advancedModeEnabled) {
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-04-23 04:56:11 UTC (rev 19515)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-04-23 05:39:28 UTC (rev 19516)
@@ -158,6 +158,7 @@
int numberOfRoutingDisabled =
getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_ROUTING_DISABLED);
int numberOfClockProblem = getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_CLOCK_PROBLEM);
int numberOfConnError = getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_CONN_ERROR);
+ int numberOfDisconnecting =
PeerNodeStatus.getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_DISCONNECTING);
HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("fullTitle", new String[] { "name" }, new
String[] { node.getMyName() }), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
@@ -256,7 +257,7 @@
drawPeerStatsBox(peerStatsInfobox, advancedModeEnabled,
numberOfConnected, numberOfRoutingBackedOff,
numberOfTooNew, numberOfTooOld,
numberOfDisconnected, numberOfNeverConnected, numberOfDisabled,
numberOfBursting, numberOfListening,
numberOfListenOnly, numberOfSeedServers, numberOfSeedClients,
- numberOfRoutingDisabled,
numberOfClockProblem, numberOfConnError);
+ numberOfRoutingDisabled,
numberOfClockProblem, numberOfConnError, numberOfDisconnecting);
// Bandwidth box
HTMLNode bandwidthInfobox =
nextTableCell.addChild("div", "class", "infobox");
@@ -666,11 +667,11 @@
locationSwapList.addChild("li", "sendSwapInterval:\u00a0" +
TimeUtil.formatTime(sendSwapInterval, 2, true));
}
- private void drawPeerStatsBox(HTMLNode peerStatsInfobox, boolean
advancedModeEnabled, int numberOfConnected,
+ protected static void drawPeerStatsBox(HTMLNode peerStatsInfobox,
boolean advancedModeEnabled, int numberOfConnected,
int numberOfRoutingBackedOff, int numberOfTooNew, int
numberOfTooOld, int numberOfDisconnected,
int numberOfNeverConnected, int numberOfDisabled, int
numberOfBursting, int numberOfListening,
int numberOfListenOnly, int numberOfSeedServers, int
numberOfSeedClients, int numberOfRoutingDisabled,
- int numberOfClockProblem, int numberOfConnError) {
+ int numberOfClockProblem, int numberOfConnError, int
numberOfDisconnecting) {
peerStatsInfobox.addChild("div", "class", "infobox-header",
l10n("peerStatsTitle"));
HTMLNode peerStatsContent = peerStatsInfobox.addChild("div",
"class", "infobox-content");
@@ -736,11 +737,6 @@
new String[] { "peer_listen_only",
l10nDark("listenOnly"), "border-bottom: 1px dotted; cursor: help;" },
l10nDark("listenOnlyShort"));
peerStatsListenOnlyListItem.addChild("span", ":\u00a0"
+ numberOfListenOnly);
}
- if (numberOfRoutingDisabled > 0) {
- HTMLNode peerStatsRoutingDisabledListItem =
peerStatsList.addChild("li").addChild("span");
- peerStatsRoutingDisabledListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_routing_disabled",
l10n("routingDisabled"), "border-bottom: 1px dotted; cursor: help;" },
l10n("routingDisabledShort"));
- peerStatsRoutingDisabledListItem.addChild("span",
":\u00a0" + numberOfRoutingDisabled);
- }
if (numberOfClockProblem > 0) {
HTMLNode peerStatsRoutingDisabledListItem =
peerStatsList.addChild("li").addChild("span");
peerStatsRoutingDisabledListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_routing_disabled",
l10nDark("clockProblem"), "border-bottom: 1px dotted; cursor: help;" },
l10nDark("clockProblemShort"));
@@ -751,6 +747,11 @@
peerStatsRoutingDisabledListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_routing_disabled",
l10nDark("connError"), "border-bottom: 1px dotted; cursor: help;" },
l10nDark("connErrorShort"));
peerStatsRoutingDisabledListItem.addChild("span",
":\u00a0" + numberOfClockProblem);
}
+ if (numberOfDisconnecting > 0) {
+ HTMLNode peerStatsListenOnlyListItem =
peerStatsList.addChild("li").addChild("span");
+ peerStatsListenOnlyListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_disconnecting",
l10n("disconnecting"), "border-bottom: 1px dotted; cursor: help;" },
l10nDark("disconnectingShort"));
+ peerStatsListenOnlyListItem.addChild("span", ":\u00a0"
+ numberOfDisconnecting);
+ }
if (numberOfSeedServers > 0) {
HTMLNode peerStatsSeedServersListItem =
peerStatsList.addChild("li").addChild("span");
peerStatsSeedServersListItem.addChild("span", new
String[] { "class", "title", "style" },
@@ -763,6 +764,11 @@
new String[] { "peer_listening" /*
FIXME */, l10nDark("seedClients"), "border-bottom: 1px dotted; cursor: help;"
}, l10nDark("seedClientsShort"));
peerStatsSeedClientsListItem.addChild("span", ":\u00a0"
+ numberOfSeedClients);
}
+ if (numberOfRoutingDisabled > 0) {
+ HTMLNode peerStatsRoutingDisabledListItem =
peerStatsList.addChild("li").addChild("span");
+ peerStatsRoutingDisabledListItem.addChild("span", new
String[] { "class", "title", "style" }, new String[] { "peer_routing_disabled",
l10n("routingDisabled"), "border-bottom: 1px dotted; cursor: help;" },
l10n("routingDisabledShort"));
+ peerStatsRoutingDisabledListItem.addChild("span",
":\u00a0" + numberOfRoutingDisabled);
+ }
}
private static String l10n(String key) {
