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

[t...@freenetproject.org]

Author: toad
Date: 2006-11-01 21:14:56 +0000 (Wed, 01 Nov 2006)
New Revision: 10789

Modified:
   trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
"You need to escape the curly brackets."
Fixes RegexPatternException.

Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2006-11-01 20:35:02 UTC (rev 10788)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2006-11-01 21:14:56 UTC (rev 10789)
@@ -146,19 +146,19 @@
                } else if(conns == 2) {
                        return TWO_CONNS;
                } else if(neverConn > MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) 
{
-                       s = replace(NEVER_CONN_TEXT, "{NEVER_CONN}", 
Integer.toString(neverConn));
+                       s = replace(NEVER_CONN_TEXT, "\\{NEVER_CONN\\}", 
Integer.toString(neverConn));
                } else if((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD){
-                       s = replace(DISCONNECTED, "{DISCONNECTED}", 
Integer.toString(disconnected));
+                       s = replace(DISCONNECTED, "\\{DISCONNECTED\\}", 
Integer.toString(disconnected));
                } else if(conns > MAX_CONN_ALERT_THRESHOLD) {
-                       s = replace(TOO_MANY_CONNECTIONS, "{CONNS}", 
Integer.toString(conns));
+                       s = replace(TOO_MANY_CONNECTIONS, "\\{CONNS\\}", 
Integer.toString(conns));
                } else if(peers > MAX_PEER_ALERT_THRESHOLD) {
-                       s = replace(TOO_MANY_PEERS, "{PEERS}", 
Integer.toString(peers));
+                       s = replace(TOO_MANY_PEERS, "\\{PEERS\\}", 
Integer.toString(peers));
                } else if(n.bwlimitDelayAlertRelevant && (bwlimitDelayTime > 
Node.MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD)) {
-                       s = replace(TOO_HIGH_BWLIMITDELAYTIME, 
"{BWLIMIT_DELAY_TIME}", Integer.toString(bwlimitDelayTime));
+                       s = replace(TOO_HIGH_BWLIMITDELAYTIME, 
"\\{BWLIMIT_DELAY_TIME\\}", Integer.toString(bwlimitDelayTime));

                        // FIXME I'm not convinced about the next one!
                } else if(n.nodeAveragePingAlertRelevant && 
(nodeAveragePingTime > Node.MAX_NODE_AVERAGE_PING_TIME_ALERT_THRESHOLD)) {
-                       s = replace(TOO_HIGH_PING, "{PING_TIME}", 
Integer.toString(bwlimitDelayTime));
+                       s = replace(TOO_HIGH_PING, "\\{PING_TIME\\}", 
Integer.toString(bwlimitDelayTime));
                } else if(oldestNeverConnectedPeerAge > 
MAX_OLDEST_NEVER_CONNECTED_PEER_AGE_ALERT_THRESHOLD) {
                        s = NEVER_CONNECTED_TWO_WEEKS;
                } else throw new IllegalArgumentException("Not valid");
@@ -204,19 +204,19 @@
                } else if (conns == 2) {
                        alertNode.addChild("#", TWO_CONNS);
                } else if (neverConn > 
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) {
-                       alertNode.addChild("#", replace(NEVER_CONN_START, 
"{NEVER_CONN}", Integer.toString(neverConn)));
+                       alertNode.addChild("#", replace(NEVER_CONN_START, 
"\\{NEVER_CONN\\}", Integer.toString(neverConn)));
                        alertNode.addChild(NEVER_CONN_MIDDLE_NODE());
-                       alertNode.addChild("#", replace(NEVER_CONN_END, 
"{NEVER_CONN}", Integer.toString(neverConn)));
+                       alertNode.addChild("#", replace(NEVER_CONN_END, 
"\\{NEVER_CONN\\}", Integer.toString(neverConn)));
                } else if ((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD) {
-                       alertNode.addChild("#", replace(DISCONNECTED, 
"{DISCONNECTED}", Integer.toString(disconnected)));
+                       alertNode.addChild("#", replace(DISCONNECTED, 
"\\{DISCONNECTED\\}", Integer.toString(disconnected)));
                } else if (conns > MAX_CONN_ALERT_THRESHOLD) {
-                       alertNode.addChild("#", replace(TOO_MANY_CONNECTIONS, 
"{CONNS}", Integer.toString(conns)));
+                       alertNode.addChild("#", replace(TOO_MANY_CONNECTIONS, 
"\\{CONNS\\}", Integer.toString(conns)));
                } else if (peers > MAX_PEER_ALERT_THRESHOLD) {
-                       alertNode.addChild("#", replace(TOO_MANY_PEERS, 
"{PEERS}", Integer.toString(peers)));
+                       alertNode.addChild("#", replace(TOO_MANY_PEERS, 
"\\{PEERS\\}", Integer.toString(peers)));
                } else if (n.bwlimitDelayAlertRelevant && (bwlimitDelayTime > 
Node.MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD)) {
-                       alertNode.addChild("#", 
replace(TOO_HIGH_BWLIMITDELAYTIME, "{BWLIMIT_DELAY_TIME}", 
Integer.toString(bwlimitDelayTime)));
+                       alertNode.addChild("#", 
replace(TOO_HIGH_BWLIMITDELAYTIME, "\\{BWLIMIT_DELAY_TIME\\}", 
Integer.toString(bwlimitDelayTime)));
                } else if (n.nodeAveragePingAlertRelevant && 
(nodeAveragePingTime > Node.MAX_NODE_AVERAGE_PING_TIME_ALERT_THRESHOLD)) {
-                       alertNode.addChild("#", replace(TOO_HIGH_PING, 
"{PING_TIME}", Integer.toString(bwlimitDelayTime)));
+                       alertNode.addChild("#", replace(TOO_HIGH_PING, 
"\\{PING_TIME\\}", Integer.toString(bwlimitDelayTime)));
                } else if (oldestNeverConnectedPeerAge > 
MAX_OLDEST_NEVER_CONNECTED_PEER_AGE_ALERT_THRESHOLD) {
                        alertNode.addChild("#", NEVER_CONNECTED_TWO_WEEKS);
                } else throw new IllegalArgumentException("not valid");