Author: nextgens
Date: 2006-07-29 16:30:40 +0000 (Sat, 29 Jul 2006)
New Revision: 9810
Removed:
trunk/freenet/src/freenet/client/async/PrioritySchedulerCallback.java
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
* Hide node.updater.enabled from the non-advanced view
* PrioritySchedulerCallback doesn't need to be in its own file
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-07-29 15:06:24 UTC (rev 9809)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-07-29 16:30:40 UTC (rev 9810)
@@ -4,6 +4,8 @@
import java.util.HashSet;
import java.util.Iterator;
+import freenet.config.InvalidConfigValueException;
+import freenet.config.StringCallback;
import freenet.config.SubConfig;
import freenet.crypt.RandomSource;
import freenet.keys.ClientKeyBlock;
@@ -23,6 +25,31 @@
*/
public class ClientRequestScheduler implements RequestScheduler {
+ public class PrioritySchedulerCallback implements StringCallback{
+ final ClientRequestScheduler cs;
+
+ PrioritySchedulerCallback(ClientRequestScheduler cs){
+ this.cs = cs;
+ }
+
+ public String get(){
+ return cs.getChoosenPriorityScheduler();
+ }
+
+ public void set(String val) throws InvalidConfigValueException{
+ String value;
+ if(val.equalsIgnoreCase(get())) return;
+
if(val.equalsIgnoreCase(ClientRequestScheduler.PRIORITY_HARD)){
+ value = ClientRequestScheduler.PRIORITY_HARD;
+ }else
if(val.equalsIgnoreCase(ClientRequestScheduler.PRIORITY_SOFT)){
+ value = ClientRequestScheduler.PRIORITY_SOFT;
+ }else{
+ throw new InvalidConfigValueException("Invalid
priority scheme");
+ }
+ cs.setPriorityScheduler(value);
+ }
+ }
+
/**
* Structure:
* array (by priority) -> // one element per possible priority
@@ -102,7 +129,7 @@
allRequestsByClientRequest = new HashMap();
this.name = name;
- sc.register(name+"_priority_policy", PRIORITY_HARD,
name.hashCode(), true, "Priority policy of the "+name+"scheduler", "Set the
priority policy scheme used by the scheduler. Could be one of
["+PRIORITY_HARD+"|"+PRIORITY_SOFT+"]",
+ sc.register(name+"_priority_policy", PRIORITY_HARD,
name.hashCode(), true, "Priority policy of the "+name+"scheduler", "Set the
priority policy scheme used by the scheduler. Could be one of
["+PRIORITY_HARD+", "+PRIORITY_SOFT+"]",
new PrioritySchedulerCallback(this));
this.choosenPriorityScheduler =
sc.getString(name+"_priority_policy");
}
Deleted: trunk/freenet/src/freenet/client/async/PrioritySchedulerCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PrioritySchedulerCallback.java
2006-07-29 15:06:24 UTC (rev 9809)
+++ trunk/freenet/src/freenet/client/async/PrioritySchedulerCallback.java
2006-07-29 16:30:40 UTC (rev 9810)
@@ -1,29 +0,0 @@
-package freenet.client.async;
-
-import freenet.config.InvalidConfigValueException;
-import freenet.config.StringCallback;
-
-public class PrioritySchedulerCallback implements StringCallback{
- ClientRequestScheduler cs;
-
- PrioritySchedulerCallback(ClientRequestScheduler cs){
- this.cs = cs;
- }
-
- public String get(){
- return cs.getChoosenPriorityScheduler();
- }
-
- public void set(String val) throws InvalidConfigValueException{
- String value;
- if(val.equalsIgnoreCase(get())) return;
- if(val.equalsIgnoreCase(ClientRequestScheduler.PRIORITY_HARD)){
- value = ClientRequestScheduler.PRIORITY_HARD;
- }else
if(val.equalsIgnoreCase(ClientRequestScheduler.PRIORITY_SOFT)){
- value = ClientRequestScheduler.PRIORITY_SOFT;
- }else{
- throw new InvalidConfigValueException("Invalid priority
scheme");
- }
- cs.setPriorityScheduler(value);
- }
-}
\ No newline at end of file
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-07-29
15:06:24 UTC (rev 9809)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-07-29
16:30:40 UTC (rev 9810)
@@ -518,7 +518,7 @@
public static NodeUpdater maybeCreate(Node node, Config config) throws
Exception {
SubConfig updaterConfig = new SubConfig("node.updater", config);
- updaterConfig.register("enabled", true, 1, false, "Check for, and
download new versions",
+ updaterConfig.register("enabled", true, 1, true, "Check for, and
download new versions",
"Should your node automatically check for new versions
of Freenet. If yes, new versions will be automatically detected and downloaded,
but not necessarily installed.",
new UpdaterEnabledCallback(node, config));
