[freenet-cvs] r13319 - in trunk/freenet/src/freenet: clients/http node support

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-05-22 21:25:49 +0000 (Tue, 22 May 2007)
New Revision: 13319

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/node/NodeStats.java
   trunk/freenet/src/freenet/support/StringCounter.java
Log:
Fix #1417 (Layout of /stats/ changes when there is no Preemptive Rejection 
Reasons)

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-05-22 21:24:15 UTC (rev 13318)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-05-22 21:25:49 UTC (rev 13319)
@@ -292,10 +292,12 @@
        }

        private void drawRejectReasonsBox(HTMLNode nextTableCell) {
+               HTMLNode rejectReasonsTable = new HTMLNode("table");
+               if(!node.nodeStats.getRejectReasonsTable(rejectReasonsTable))
+                       return;
                HTMLNode rejectReasonsInfobox = nextTableCell.addChild("div", 
"class", "infobox");
                rejectReasonsInfobox.addChild("div", "class", "infobox-header", 
"Preemptive Rejection Reasons");
-               HTMLNode table = rejectReasonsInfobox.addChild("table");
-               node.nodeStats.getRejectReasonsTable(table);
+               rejectReasonsInfobox.addChild(rejectReasonsTable);
        }

        private void drawNodeVersionBox(HTMLNode versionInfobox) {

Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java       2007-05-22 21:24:15 UTC 
(rev 13318)
+++ trunk/freenet/src/freenet/node/NodeStats.java       2007-05-22 21:25:49 UTC 
(rev 13319)
@@ -890,8 +890,9 @@
                return node.isTestnetEnabled();
        }

-       public void getRejectReasonsTable(HTMLNode table) {
+       public boolean getRejectReasonsTable(HTMLNode table) {
                preemptiveRejectReasons.toTableRows(table);
+               return preemptiveRejectReasons.getSize() > 0;
        }

 }

Modified: trunk/freenet/src/freenet/support/StringCounter.java
===================================================================
--- trunk/freenet/src/freenet/support/StringCounter.java        2007-05-22 
21:24:15 UTC (rev 13318)
+++ trunk/freenet/src/freenet/support/StringCounter.java        2007-05-22 
21:25:49 UTC (rev 13319)
@@ -13,7 +13,7 @@
  */
 public class StringCounter {

-       private HashMap map;
+       private final HashMap map;

        private class Item {
                public Item(String string2) {
@@ -86,5 +86,8 @@
                        row.addChild("td", it.string);
                }
        }
-
+       
+       public int getSize() {
+               return map.size();
+       }
 }