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

[zot...@freenetproject.org]

Author: zothar
Date: 2007-05-20 17:19:18 +0000 (Sun, 20 May 2007)
New Revision: 13282

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Fix a couple of NPEs and use a couple of available l10n keys.

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2007-05-20 14:38:36 UTC (rev 13281)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2007-05-20 17:19:18 UTC (rev 13282)
@@ -211,7 +211,7 @@
                        activityInfobox.addChild("div", "class", 
"infobox-header", l10n("activityTitle"));
                        HTMLNode activityInfoboxContent = 
activityInfobox.addChild("div", "class", "infobox-content");
                        HTMLNode activityList = 
StatisticsToadlet.drawActivity(activityInfoboxContent, node);
-                       if (advancedModeEnabled) {
+                       if (advancedModeEnabled && activityList != null) {
                                if (numARKFetchers > 0) {
                                        activityList.addChild("li", 
"ARK\u00a0Fetch\u00a0Requests:\u00a0" + numARKFetchers);
                                }
@@ -222,7 +222,7 @@

                        // Peer statistics box
                        HTMLNode peerStatsInfobox = 
nextTableCell.addChild("div", "class", "infobox");
-                       peerStatsInfobox.addChild("div", "class", 
"infobox-header", "Peer statistics");
+                       peerStatsInfobox.addChild("div", "class", 
"infobox-header", l10nStats("peerStatsTitle"));
                        HTMLNode peerStatsContent = 
peerStatsInfobox.addChild("div", "class", "infobox-content");
                        HTMLNode peerStatsList = 
peerStatsContent.addChild("ul");
                        if (numberOfConnected > 0) {
@@ -598,6 +598,10 @@
        private static String l10n(String string) {
                return L10n.getString("DarknetConnectionsToadlet."+string);
        }
+       
+       private static String l10nStats(String string) {
+               return L10n.getString("StatisticsToadlet."+string);
+       }

        private String sortString(boolean isReversed, String type) {
                return (isReversed ? ("?sortBy="+type) : 
("?sortBy="+type+"&reversed"));

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-05-20 14:38:36 UTC (rev 13281)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-05-20 17:19:18 UTC (rev 13282)
@@ -588,14 +588,14 @@

        private void drawActivityBox(HTMLNode activityInfobox, boolean 
advancedModeEnabled) {

-               activityInfobox.addChild("div", "class", "infobox-header", 
"Current activity");
+               activityInfobox.addChild("div", "class", "infobox-header", 
l10nDark("activityTitle"));
                HTMLNode activityInfoboxContent = 
activityInfobox.addChild("div", "class", "infobox-content");

                HTMLNode activityList = drawActivity(activityInfoboxContent, 
node);

                int numARKFetchers = node.getNumARKFetchers();

-               if (advancedModeEnabled) {
+               if (advancedModeEnabled && activityList != null) {
                        if (numARKFetchers > 0)
                                activityList.addChild("li", 
"ARK\u00a0Fetch\u00a0Requests:\u00a0" + numARKFetchers);
                        activityList.addChild("li", "FetcherByUSKSize:\u00a0" + 
node.clientCore.uskManager.getFetcherByUSKSize());