Author: toad
Date: 2006-11-18 18:41:02 +0000 (Sat, 18 Nov 2006)
New Revision: 10994
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
Log:
Some more moving methods around.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
2006-11-18 18:39:21 UTC (rev 10993)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
2006-11-18 18:41:02 UTC (rev 10994)
@@ -600,7 +600,67 @@
public boolean isBlown() {
return hasBeenBlown;
}
+
+ public synchronized boolean hasNewMainJar() {
+ return hasNewMainJar;
+ }
+ public synchronized boolean hasNewExtJar() {
+ return hasNewExtJar;
+ }
+
+ public int newMainJarVersion() {
+ return mainUpdater.getFetchedVersion();
+ }
+
+ public int newExtJarVersion() {
+ return extUpdater.getFetchedVersion();
+ }
+
+ public boolean fetchingNewMainJar() {
+ return mainUpdater != null && mainUpdater.isFetching();
+ }
+
+ public boolean fetchingNewExtJar() {
+ return extUpdater != null && extUpdater.isFetching();
+ }
+
+ public int fetchingNewMainJarVersion() {
+ return mainUpdater.fetchingVersion();
+ }
+
+ public int fetchingNewExtJarVersion() {
+ return extUpdater.fetchingVersion();
+ }
+
+ public boolean inFinalCheck() {
+ return isReadyToDeployUpdate(true) &&
!isReadyToDeployUpdate(false);
+ }
+
+ public int getRevocationDNFCounter() {
+ return revocationChecker.getRevocationDNFCounter();
+ }
+
+ public int getMainVersion() {
+ return Version.buildNumber();
+ }
+
+ public int getExtVersion() {
+ return NodeStarter.extBuildNumber;
+ }
+
+ public boolean isArmed() {
+ return armed || isAutoUpdateAllowed;
+ }
+
+ public boolean canUpdateNow() {
+ return isReadyToDeployUpdate(true);
+ }
+
+ public boolean canUpdateImmediately() {
+ return isReadyToDeployUpdate(false);
+ }
+
// Config callbacks
class UpdaterEnabledCallback implements BooleanCallback {
@@ -667,64 +727,4 @@
}
- public synchronized boolean hasNewMainJar() {
- return hasNewMainJar;
- }
-
- public synchronized boolean hasNewExtJar() {
- return hasNewExtJar;
- }
-
- public int newMainJarVersion() {
- return mainUpdater.getFetchedVersion();
- }
-
- public int newExtJarVersion() {
- return extUpdater.getFetchedVersion();
- }
-
- public boolean fetchingNewMainJar() {
- return mainUpdater != null && mainUpdater.isFetching();
- }
-
- public boolean fetchingNewExtJar() {
- return extUpdater != null && extUpdater.isFetching();
- }
-
- public int fetchingNewMainJarVersion() {
- return mainUpdater.fetchingVersion();
- }
-
- public int fetchingNewExtJarVersion() {
- return extUpdater.fetchingVersion();
- }
-
- public boolean inFinalCheck() {
- return isReadyToDeployUpdate(true) &&
!isReadyToDeployUpdate(false);
- }
-
- public int getRevocationDNFCounter() {
- return revocationChecker.getRevocationDNFCounter();
- }
-
- public int getMainVersion() {
- return Version.buildNumber();
- }
-
- public int getExtVersion() {
- return NodeStarter.extBuildNumber;
- }
-
- public boolean isArmed() {
- return armed || isAutoUpdateAllowed;
- }
-
- public boolean canUpdateNow() {
- return isReadyToDeployUpdate(true);
- }
-
- public boolean canUpdateImmediately() {
- return isReadyToDeployUpdate(false);
- }
-
}
