[freenet-cvs] r16568 - trunk/freenet/src/freenet/node/useralerts

[t...@freenetproject.org]

Author: toad
Date: 2007-12-15 12:32:02 +0000 (Sat, 15 Dec 2007)
New Revision: 16568

Modified:
   trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
Show the number of disconnected darknet peers not the total disconnected peers 
in the alert.

Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2007-12-15 12:24:42 UTC (rev 16567)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2007-12-15 12:32:02 UTC (rev 16568)
@@ -93,7 +93,6 @@

        public String getText() {
                String s;
-               int disconnected = peers - conns;
                if(peers == 0) {
                        if(n.isTestnetEnabled())
                                return l10n("noPeersTestnet");
@@ -117,7 +116,7 @@
                        s = l10n("connError", "count", 
Integer.toString(connError));
                } else if(disconnDarknetPeers > 
MAX_DISCONN_PEER_ALERT_THRESHOLD){
                        s = l10n("tooManyDisconnected", new String[] { "count", 
"max" }, 
-                                       new String[] { 
Integer.toString(disconnected), 
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)});
+                                       new String[] { 
Integer.toString(disconnDarknetPeers), 
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)});
                } else if(conns > MAX_CONN_ALERT_THRESHOLD) {
                        s = l10n("tooManyConns", new String[] { "count", "max" 
}, 
                                        new String[] { Integer.toString(conns), 
Integer.toString(MAX_CONN_ALERT_THRESHOLD)});
@@ -163,7 +162,6 @@
        public HTMLNode getHTMLText() {
                HTMLNode alertNode = new HTMLNode("div");

-               int disconnected = peers - conns;
                if (peers == 0) {
                        if(n.isTestnetEnabled())
                                alertNode.addChild("#", l10n("noPeersTestnet"));
@@ -188,7 +186,7 @@
                } else if(connError > MIN_CONN_ERROR_ALERT_THRESHOLD) {
                        alertNode.addChild("#", l10n("connError", "count", 
Integer.toString(connError)));
                } else if (disconnDarknetPeers > 
MAX_DISCONN_PEER_ALERT_THRESHOLD) {
-                       alertNode.addChild("#", l10n("tooManyDisconnected", new 
String[] { "count", "max" }, new String[] { Integer.toString(disconnected), 
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)}));
+                       alertNode.addChild("#", l10n("tooManyDisconnected", new 
String[] { "count", "max" }, new String[] { 
Integer.toString(disconnDarknetPeers), 
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)}));
                } else if (conns > MAX_CONN_ALERT_THRESHOLD) {
                        alertNode.addChild("#", l10n("tooManyConns", new 
String[] { "count", "max" }, 
                                        new String[] { Integer.toString(conns), 
Integer.toString(MAX_CONN_ALERT_THRESHOLD)}));