Author: nextgens
Date: 2006-06-03 15:32:03 +0000 (Sat, 03 Jun 2006)
New Revision: 9028
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
Log:
We propose to update only when the update is ready.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-06-03
15:25:00 UTC (rev 9027)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-06-03
15:32:03 UTC (rev 9028)
@@ -146,7 +146,9 @@
isRunning=false;
}
- //TODO maybe a UpdateInProgress alert ?
+
+ alert.set(availableVersion,false);
+ alert.isValid(true);
Logger.normal(this,"Starting the update process");
System.err.println("Starting the update process: found the
update, now fetching it.");
// We fetch it
@@ -357,7 +359,7 @@
if(!state.getURI().equals(revocationURI)){
System.out.println("Found "+availableVersion);
Logger.normal(this, "Found a new version! (" +
availableVersion + ", setting up a new UpdatedVersionAviableUserAlert");
- alert.set(availableVersion);
+ alert.set(availableVersion,true);
alert.isValid(true);
synchronized(this){
this.cg = state;
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-06-03 15:25:00 UTC (rev 9027)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-06-03 15:32:03 UTC (rev 9028)
@@ -1,16 +1,18 @@
package freenet.node.useralerts;
public class UpdatedVersionAvailableUserAlert implements UserAlert {
- private boolean isValid;
+ private boolean isValid, isReady;
private int version;
public UpdatedVersionAvailableUserAlert(int version){
this.version=version;
isValid=false;
+ isReady=false;
}
- public synchronized void set(int v){
+ public synchronized void set(int v, boolean ready){
version = v;
+ isReady = ready;
}
public boolean userCanDismiss() {
@@ -22,9 +24,13 @@
}
public String getText() {
- return "It seems that your node isn't running the latest
version of the software. "+
- "Updating to "+version+" is advised. <form action=\"/\"
method=\"post\">"+
- "<input type=\"submit\" name=\"update\" value=\"Update Now\"
/></form>";
+ String s ="It seems that your node isn't running the latest
version of the software. "+
+ "Updating to "+version+" is advised. ";
+
+ if(isReady) return s+
+ " <form action=\"/\" method=\"post\"><input
type=\"submit\" name=\"update\" value=\"Update Now\" /></form>";
+ else return s+
+ "Your node is currently fetching the update and will
ask you whatever you want to update or not when it's ready.";
}
public short getPriorityClass() {
