Author: toad
Date: 2007-12-19 17:29:48 +0000 (Wed, 19 Dec 2007)
New Revision: 16726
Modified:
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
Don't show the 0/1/2 connections warnings if opennet is enabled.
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2007-12-19 17:27:36 UTC
(rev 16725)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2007-12-19 17:29:48 UTC
(rev 16726)
@@ -943,6 +943,7 @@
opennetPeers = this.getOpennetPeers().length;
peers = darknetPeers + opennetPeers; // Seednodes don't
count.
}
+ boolean opennetEnabled = node.isOpennetEnabled();
synchronized(ua) {
ua.darknetConns =
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, true) +
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, true);
@@ -954,6 +955,7 @@
ua.neverConn =
getPeerNodeStatusSize(PEER_NODE_STATUS_NEVER_CONNECTED, true);
ua.clockProblem =
getPeerNodeStatusSize(PEER_NODE_STATUS_CLOCK_PROBLEM, false);
ua.connError =
getPeerNodeStatusSize(PEER_NODE_STATUS_CONN_ERROR, true);
+ ua.isOpennetEnabled = opennetEnabled;
}
if(anyConnectedPeers())
node.onConnectedPeer();
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2007-12-19 17:27:36 UTC (rev 16725)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2007-12-19 17:29:48 UTC (rev 16726)
@@ -21,6 +21,7 @@
long oldestNeverConnectedPeerAge = 0;
public int darknetConns = 0;
public int darknetPeers = 0;
+ public boolean isOpennetEnabled;
/** How many connected peers we need to not get alert about not enough
*/
public static final int MIN_CONN_ALERT_THRESHOLD = 3;
@@ -52,12 +53,14 @@
}
public String getTitle() {
- if(peers == 0)
- return l10n("noPeersTitle");
- if(conns == 0)
- return l10n("noConnsTitle");
- if(conns < MIN_CONN_ALERT_THRESHOLD)
- return l10n("onlyFewConnsTitle", "count",
Integer.toString(conns));
+ if(!isOpennetEnabled) {
+ if(peers == 0)
+ return l10n("noPeersTitle");
+ if(conns == 0)
+ return l10n("noConnsTitle");
+ if(conns < MIN_CONN_ALERT_THRESHOLD)
+ return l10n("onlyFewConnsTitle", "count",
Integer.toString(conns));
+ }
if(neverConn > MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD)
return l10n("tooManyNeverConnectedTitle");
if(clockProblem > MIN_CLOCK_PROBLEM_PEER_ALERT_THRESHOLD)
@@ -93,20 +96,20 @@
public String getText() {
String s;
- if(peers == 0) {
+ if(peers == 0 && !isOpennetEnabled) {
if(n.isTestnetEnabled())
return l10n("noPeersTestnet");
else
return l10n("noPeersDarknet");
} else if(conns < 3 && clockProblem >
MIN_CLOCK_PROBLEM_PEER_ALERT_THRESHOLD) {
s = l10n("clockProblem", "count",
Integer.toString(clockProblem));
- } else if(conns < 3 && connError >
MIN_CONN_ERROR_ALERT_THRESHOLD) {
+ } else if(conns < 3 && connError >
MIN_CONN_ERROR_ALERT_THRESHOLD && !isOpennetEnabled) {
s = l10n("connError", "count",
Integer.toString(connError));
- } else if(conns == 0) {
+ } else if(conns == 0 && !isOpennetEnabled) {
return l10n("noConns");
- } else if(conns == 1) {
+ } else if(conns == 1 && !isOpennetEnabled) {
return l10n("oneConn");
- } else if(conns == 2) {
+ } else if(conns == 2 && !isOpennetEnabled) {
return l10n("twoConns");
} else if(neverConn > MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD)
{
s = l10n("tooManyNeverConnected", "count",
Integer.toString(neverConn));
@@ -162,7 +165,7 @@
public HTMLNode getHTMLText() {
HTMLNode alertNode = new HTMLNode("div");
- if (peers == 0) {
+ if (peers == 0 && !isOpennetEnabled) {
if(n.isTestnetEnabled())
alertNode.addChild("#", l10n("noPeersTestnet"));
else
@@ -171,11 +174,11 @@
alertNode.addChild("#", l10n("clockProblem", "count",
Integer.toString(clockProblem)));
} else if(conns < 3 && connError >
MIN_CONN_ERROR_ALERT_THRESHOLD) {
alertNode.addChild("#", l10n("connError", "count",
Integer.toString(connError)));
- } else if (conns == 0) {
+ } else if (conns == 0 && !isOpennetEnabled) {
alertNode.addChild("#", l10n("noConns"));
- } else if (conns == 1) {
+ } else if (conns == 1 && !isOpennetEnabled) {
alertNode.addChild("#", l10n("oneConn"));
- } else if (conns == 2) {
+ } else if (conns == 2 && !isOpennetEnabled) {
alertNode.addChild("#", l10n("twoConns"));
} else if (neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) {
L10n.addL10nSubstitution(alertNode,
"PeerManagerUserAlert.tooManyNeverConnectedWithLink",
