Author: toad
Date: 2008-04-28 14:36:27 +0000 (Mon, 28 Apr 2008)
New Revision: 19585
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Make some options advanced-mode-only
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-04-28 14:31:18 UTC (rev 19584)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-04-28 14:36:27 UTC (rev 19585)
@@ -336,7 +336,7 @@
new FProxyCSSOverrideCallback());
fproxyConfig.register("advancedModeEnabled", false,
configItemOrder++, false, false, "SimpleToadletServer.advancedMode",
"SimpleToadletServer.advancedModeLong",
new FProxyAdvancedModeEnabledCallback(this));
- fproxyConfig.register("javascriptEnabled", false,
configItemOrder++, false, false, "SimpleToadletServer.enableJS",
"SimpleToadletServer.enableJSLong",
+ fproxyConfig.register("javascriptEnabled", false,
configItemOrder++, true, false, "SimpleToadletServer.enableJS",
"SimpleToadletServer.enableJSLong",
new FProxyJavascriptEnabledCallback(this));
fproxyConfig.register("showPanicButton", false,
configItemOrder++, true, true, "SimpleToadletServer.panicButton",
"SimpleToadletServer.panicButtonLong",
new BooleanCallback(){
@@ -355,7 +355,7 @@
// more than we need the efficiency gain of reusing connections
- especially on first
// install.
- fproxyConfig.register("enablePersistentConnections", false,
configItemOrder++, false, false,
"SimpleToadletServer.enablePersistentConnections",
"SimpleToadletServer.enablePersistentConnectionsLong",
+ fproxyConfig.register("enablePersistentConnections", false,
configItemOrder++, true, false,
"SimpleToadletServer.enablePersistentConnections",
"SimpleToadletServer.enablePersistentConnectionsLong",
new BooleanCallback() {
public boolean get() {
@@ -378,7 +378,7 @@
// appears to be that the node does very few local requests
compared to external requests
// (for anonymity's sake).
- fproxyConfig.register("enableInlinePrefetch", false,
configItemOrder++, false, false, "SimpleToadletServer.enableInlinePrefetch",
"SimpleToadletServer.enableInlinePrefetchLong",
+ fproxyConfig.register("enableInlinePrefetch", false,
configItemOrder++, true, false, "SimpleToadletServer.enableInlinePrefetch",
"SimpleToadletServer.enableInlinePrefetchLong",
new BooleanCallback() {
public boolean get() {
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2008-04-28 14:31:18 UTC
(rev 19584)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2008-04-28 14:36:27 UTC
(rev 19585)
@@ -330,7 +330,7 @@
public int registerConfigs(SubConfig nodeConfig, int sortOrder) {
// IP address override
- nodeConfig.register("ipAddressOverride", "", sortOrder++,
false, false, "NodeIPDectector.ipOverride",
+ nodeConfig.register("ipAddressOverride", "", sortOrder++, true,
false, "NodeIPDectector.ipOverride",
"NodeIPDectector.ipOverrideLong",
new StringCallback() {
@@ -400,7 +400,7 @@
// Temporary IP address hint
- nodeConfig.register("tempIPAddressHint", "", sortOrder++,
false, false, "NodeIPDectector.tempAddressHint",
"NodeIPDectector.tempAddressHintLong", new StringCallback() {
+ nodeConfig.register("tempIPAddressHint", "", sortOrder++, true,
false, "NodeIPDectector.tempAddressHint",
"NodeIPDectector.tempAddressHintLong", new StringCallback() {
public String get() {
return "";
