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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-19 16:32:47 +0000 (Sat, 19 Apr 2008)
New Revision: 19426

Modified:
   trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
   trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
   trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Move the connection type alert to the Connectivity page.

Modified: trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java     
2008-04-19 16:21:23 UTC (rev 19425)
+++ trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java     
2008-04-19 16:32:47 UTC (rev 19426)
@@ -64,6 +64,10 @@
                if(ctx.isAllowedFullAccess())
                        contentNode.addChild(core.alerts.createSummary());

+               // Add connection type box.
+               
+               node.ipDetector.addConnectionTypeBox(contentNode);
+               
                UdpSocketHandler[] handlers = node.getPacketSocketHandlers();

                HTMLNode summaryBox = 
pageMaker.getInfobox(L10n.getString("ConnectivityToadlet.summaryTitle"));

Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19 
16:21:23 UTC (rev 19425)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19 
16:32:47 UTC (rev 19426)
@@ -873,5 +873,12 @@
        public synchronized boolean hasDetectors() {
                return plugins.length > 0;
        }
+
+       public void addConnectionTypeBox(HTMLNode contentNode) {
+               if(node.clientCore == null) return;
+               if(node.clientCore.alerts == null) return;
+               if(proxyAlert.isValid())
+                       
contentNode.addChild(node.clientCore.alerts.renderAlert(proxyAlert));
+       }

 }

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2008-04-19 16:21:23 UTC 
(rev 19425)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2008-04-19 16:32:47 UTC 
(rev 19426)
@@ -20,6 +20,7 @@
 import freenet.pluginmanager.DetectedIP;
 import freenet.pluginmanager.FredPluginIPDetector;
 import freenet.pluginmanager.FredPluginPortForward;
+import freenet.support.HTMLNode;
 import freenet.support.Logger;
 import freenet.support.api.BooleanCallback;
 import freenet.support.api.StringCallback;
@@ -537,4 +538,8 @@
        private void onNotGetValidAddressOverride() {
                node.clientCore.alerts.register(invalidAddressOverrideAlert);
        }
+
+       public void addConnectionTypeBox(HTMLNode contentNode) {
+               ipDetectorManager.addConnectionTypeBox(contentNode);
+       }
 }