Author: toad
Date: 2008-04-19 16:20:33 +0000 (Sat, 19 Apr 2008)
New Revision: 19424
Modified:
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
Log:
Make auto-register optional for ProxyUserAlert.
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:16:39 UTC (rev 19423)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:20:33 UTC (rev 19424)
@@ -291,7 +291,7 @@
* is one, and if it is necessary to do so. */
void start() {
// Cannot be initialized until UserAlertManager has been
created.
- proxyAlert = new ProxyUserAlert(node.clientCore.alerts);
+ proxyAlert = new ProxyUserAlert(node.clientCore.alerts, true);
node.clientCore.alerts.register(portForwardAlert);
started = true;
tryMaybeRun();
Modified: trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
2008-04-19 16:16:39 UTC (rev 19423)
+++ trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
2008-04-19 16:20:33 UTC (rev 19424)
@@ -12,17 +12,23 @@
private UserAlert alert;
private final UserAlertManager uam;
+ private final boolean autoRegister;
- public ProxyUserAlert(UserAlertManager uam) {
+ public ProxyUserAlert(UserAlertManager uam, boolean autoRegister) {
this.uam = uam;
+ this.autoRegister = autoRegister;
}
public void setAlert(UserAlert a) {
- if(alert == null && a != null)
- uam.register(this);
+ if(autoRegister) {
+ if(alert == null && a != null)
+ uam.register(this);
+ }
alert = a;
- if(a == null)
- uam.unregister(this);
+ if(autoRegister) {
+ if(a == null)
+ uam.unregister(this);
+ }
}
public boolean userCanDismiss() {
