Author: zothar
Date: 2006-05-29 13:31:38 +0000 (Mon, 29 May 2006)
New Revision: 8916
Modified:
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UserAlert.java
Log:
N2NTMs now unregister rather than invalidate on delete.
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-29
12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-29
13:31:38 UTC (rev 8916)
@@ -162,9 +162,15 @@
UserAlert[] alerts=node.alerts.getAlerts();
for(int i=0;i<alerts.length;i++){
if(request.getIntParam("disable")==alerts[i].hashCode()){
+ UserAlert alert = alerts[i];
// Won't be dismissed if it's not
allowed anyway
- Logger.normal(this,"Disabling the
userAlert "+alerts[i].hashCode());
- alerts[i].isValid(false);
+ if(alert.userCanDismiss() &&
alert.shouldUnregisterOnDismiss()) {
+
Logger.normal(this,"Unregistering the userAlert "+alert.hashCode());
+ node.alerts.unregister(alert);
+ } else {
+ Logger.normal(this,"Disabling
the userAlert "+alert.hashCode());
+ alert.isValid(false);
+ }
writePermanentRedirect(ctx,
"Configuration applied", "/");
}
Modified: trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -40,4 +40,8 @@
public String dismissButtonText(){
return "Hide";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return false;
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -34,4 +34,8 @@
public String dismissButtonText(){
return "Hide";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return false;
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -35,4 +35,8 @@
public String dismissButtonText(){
return "Hide";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return false;
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -59,4 +59,8 @@
public String dismissButtonText(){
return "Delete";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return true;
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -73,4 +73,8 @@
public String dismissButtonText(){
return "Hide";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return false;
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -40,4 +40,8 @@
public String dismissButtonText(){
return "Hide";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return false;
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-05-29 12:49:08 UTC (rev 8915)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-05-29 13:31:38 UTC (rev 8916)
@@ -43,4 +43,8 @@
public String dismissButtonText(){
return "Hide";
}
+
+ public boolean shouldUnregisterOnDismiss() {
+ return false;
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlert.java 2006-05-29
12:49:08 UTC (rev 8915)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlert.java 2006-05-29
13:31:38 UTC (rev 8916)
@@ -33,6 +33,8 @@
public String dismissButtonText();
+ public boolean shouldUnregisterOnDismiss();
+
/** An error which prevents normal operation */
public final static short CRITICAL_ERROR = 0;
/** An error which prevents normal operation but might be temporary */
