[freenet-cvs] r17201 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2008-01-22 22:58:18 +0000 (Tue, 22 Jan 2008)
New Revision: 17201

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Show the total requests if there are any request senders *or handlers*.
Same for inserts.
Same for the whole box.

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2008-01-22 22:45:54 UTC (rev 17200)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2008-01-22 22:58:18 UTC (rev 17201)
@@ -788,17 +788,20 @@
                int numSSKRequests = node.getNumSSKRequests();
                int numTransferringRequests = 
node.getNumTransferringRequestSenders();
                int numTransferringRequestHandlers = 
node.getNumTransferringRequestHandlers();
-               if ((numInserts == 0) && (numRequests == 0) && 
(numTransferringRequests == 0)) {
+               if ((numInserts == 0) && (numRequests == 0) && 
(numTransferringRequests == 0) &&
+                               (numCHKRequests == 0) && (numSSKRequests == 0) 
&&
+                               (numCHKInserts == 0) && (numSSKInserts == 0) &&
+                               (numTransferringRequestHandlers == 0)) {
                        activityInfoboxContent.addChild("#", 
l10n("noRequests"));
                        return null;
                } else {
                        HTMLNode activityList = 
activityInfoboxContent.addChild("ul");
-                       if (numInserts > 0) {
+                       if (numInserts > 0 || numCHKInserts > 0 || 
numSSKInserts > 0) {
                                activityList.addChild("li", 
L10n.getString("StatisticsToadlet.activityInserts", 
                                                new String[] { "totalSenders", 
"CHKhandlers", "SSKhandlers" } , 
                                                new String[] { 
Integer.toString(numInserts), Integer.toString(numCHKInserts), 
Integer.toString(numSSKInserts)}));
                        }
-                       if (numRequests > 0) {
+                       if (numRequests > 0 || numCHKRequests > 0 || 
numSSKRequests > 0) {
                                activityList.addChild("li", 
L10n.getString("StatisticsToadlet.activityRequests", 
                                                new String[] { "totalSenders", 
"CHKhandlers", "SSKhandlers" } , 
                                                new String[] { 
Integer.toString(numRequests), Integer.toString(numCHKRequests), 
Integer.toString(numSSKRequests)}));