[freenet-cvs] r9370 - in trunk/freenet/src/freenet/node: updater useralerts

[t...@freenetproject.org]

Author: toad
Date: 2006-06-23 18:07:47 +0000 (Fri, 23 Jun 2006)
New Revision: 9370

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
   
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
Log:
Tell the user if the node is doing the final check before deploying an update.

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-06-23 
17:45:42 UTC (rev 9369)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-06-23 
18:07:47 UTC (rev 9370)
@@ -76,7 +76,7 @@
                this.cg = null;
                this.isFetching = false;

-               this.alert= new 
UpdatedVersionAvailableUserAlert(currentVersion);
+               this.alert= new 
UpdatedVersionAvailableUserAlert(currentVersion, this);
                alert.isValid(false);
                node.alerts.register(alert);

@@ -548,4 +548,8 @@
                return null;
         }
        }
+
+       public boolean inFinalCheck() {
+               return finalCheck;
+       }
 }

Modified: 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
--- 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java 
    2006-06-23 17:45:42 UTC (rev 9369)
+++ 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java 
    2006-06-23 18:07:47 UTC (rev 9370)
@@ -1,13 +1,17 @@
 package freenet.node.useralerts;

+import freenet.node.updater.NodeUpdater;
+
 public class UpdatedVersionAvailableUserAlert implements UserAlert {
        private boolean isValid, isReady;
+       private NodeUpdater updater;
        private int version;

-       public UpdatedVersionAvailableUserAlert(int version){
+       public UpdatedVersionAvailableUserAlert(int version, NodeUpdater 
updater){
                this.version=version;
                isValid=false;
                isReady=false;
+               this.updater = updater;
        }

        public synchronized void set(int v, boolean ready){
@@ -27,10 +31,14 @@
                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.";
+               if(updater.inFinalCheck()) {
+                       return s + "Your node is currently doing a final check 
to verify the security of the update.";
+               } else {
+                       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() {