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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-15 19:01:20 +0000 (Fri, 15 Jun 2007)
New Revision: 13612

Modified:
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
   trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
   
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
Log:
Tell the user how much time is left.

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2007-06-15 
18:46:36 UTC (rev 13611)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2007-06-15 
19:01:20 UTC (rev 13612)
@@ -877,7 +877,7 @@
 UpdatedVersionAvailableUserAlert.fetchingNewBoth=Your node is currently 
downloading a new version of Freenet (node version ${nodeVersion} and extra jar 
version ${extVersion}).
 UpdatedVersionAvailableUserAlert.fetchingNewExt=Your node is currently 
downloading a new version of Freenet (extra jar version ${extVersion}).
 UpdatedVersionAvailableUserAlert.fetchingNewNode=Your node is currently 
downloading a new version of Freenet (node version ${nodeVersion}).
-UpdatedVersionAvailableUserAlert.finalCheck=Your node is currently doing a 
final check to verify the security of the update (${count} of ${max}).
+UpdatedVersionAvailableUserAlert.finalCheck=Your node is currently doing a 
final check to verify the security of the update (${count} of ${max}, maximum 
time remaining ${time}).
 UpdatedVersionAvailableUserAlert.notLatest=It seems that your node isn't 
running the latest version of the software.
 UpdatedVersionAvailableUserAlert.title=A new stable version of Freenet is 
available
 UpdatedVersionAvailableUserAlert.updateASAPButton=Update ASAP

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java       
2007-06-15 18:46:36 UTC (rev 13611)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java       
2007-06-15 19:01:20 UTC (rev 13612)
@@ -866,4 +866,9 @@
                return updater.getBlobFile(version);
        }

+       public synchronized long timeRemainingOnCheck() {
+               long now = System.currentTimeMillis();
+               return Math.max(0, REVOCATION_FETCH_TIMEOUT - (now - 
gotJarTime));
+       }
+
 }

Modified: 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
--- 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java 
    2007-06-15 18:46:36 UTC (rev 13611)
+++ 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java 
    2007-06-15 19:01:20 UTC (rev 13612)
@@ -7,6 +7,7 @@
 import freenet.node.updater.NodeUpdateManager;
 import freenet.node.updater.RevocationChecker;
 import freenet.support.HTMLNode;
+import freenet.support.TimeUtil;

 public class UpdatedVersionAvailableUserAlert implements UserAlert {
        private final NodeUpdateManager updater;
@@ -82,9 +83,9 @@
                sb.append(' ');

                if(updater.isArmed() && updater.inFinalCheck()) {
-                       sb.append(l10n("finalCheck", new String[] { "count", 
"max" }, 
+                       sb.append(l10n("finalCheck", new String[] { "count", 
"max", "time" }, 
                                        new String[] { 
Integer.toString(updater.getRevocationDNFCounter()), 
-                                               
Integer.toString(RevocationChecker.REVOCATION_DNF_MIN) }));
+                                               
Integer.toString(RevocationChecker.REVOCATION_DNF_MIN), 
TimeUtil.formatTime(updater.timeRemainingOnCheck()) }));
                        sb.append(' ');
                } else if(updater.isArmed()) {
                        sb.append(l10n("armed"));