Author: nextgens
Date: 2007-03-09 19:39:26 +0000 (Fri, 09 Mar 2007)
New Revision: 12068
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/config/BooleanOption.java
trunk/freenet/src/freenet/config/IntOption.java
trunk/freenet/src/freenet/config/LongOption.java
trunk/freenet/src/freenet/config/Option.java
trunk/freenet/src/freenet/config/ShortOption.java
trunk/freenet/src/freenet/config/StringArrOption.java
trunk/freenet/src/freenet/node/Node.java
Log:
Implement #1212 : show default settings on /config/
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-03-09
18:23:49 UTC (rev 12067)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-03-09
19:39:26 UTC (rev 12068)
@@ -133,11 +133,13 @@
String configName = o[j].getName();
HTMLNode configItemNode =
configGroupUlNode.addChild("li");
- configItemNode.addChild("span",
"class", "configshortdesc", o[j].getShortDesc());
+ configItemNode.addChild("span", new
String[]{ "class", "title", "style" },
+ new String[]{
"configshortdesc", "The default for that configuration option is : '" +
+ o[j].getDefault(),
"cursor: help;" }, o[j].getShortDesc() + '\'');
HTMLNode configItemValueNode =
configItemNode.addChild("span", "class", "config");
if(o[j].getValueString() == null){
Logger.error(this,
sc[i].getPrefix() + configName + "has returned null from config!);");
- continue;
+ continue;
}
if(o[j].getValueString().equals("true")
|| o[j].getValueString().equals("false")){
HTMLNode selectNode =
configItemValueNode.addChild("select", "name", sc[i].getPrefix() + '.' +
configName);
Modified: trunk/freenet/src/freenet/config/BooleanOption.java
===================================================================
--- trunk/freenet/src/freenet/config/BooleanOption.java 2007-03-09 18:23:49 UTC
(rev 12067)
+++ trunk/freenet/src/freenet/config/BooleanOption.java 2007-03-09 19:39:26 UTC
(rev 12068)
@@ -59,8 +59,8 @@
return currentValue == defaultValue;
}
- public boolean getDefault() {
- return defaultValue;
+ public String getDefault() {
+ return (defaultValue ? "true" : "false");
}
public void setDefault() {
Modified: trunk/freenet/src/freenet/config/IntOption.java
===================================================================
--- trunk/freenet/src/freenet/config/IntOption.java 2007-03-09 18:23:49 UTC
(rev 12067)
+++ trunk/freenet/src/freenet/config/IntOption.java 2007-03-09 19:39:26 UTC
(rev 12068)
@@ -75,8 +75,8 @@
return Integer.toString(val);
}
- public int getDefault(){
- return defaultValue;
+ public String getDefault(){
+ return new Integer(defaultValue).toString();
}
public boolean isDefault() {
Modified: trunk/freenet/src/freenet/config/LongOption.java
===================================================================
--- trunk/freenet/src/freenet/config/LongOption.java 2007-03-09 18:23:49 UTC
(rev 12067)
+++ trunk/freenet/src/freenet/config/LongOption.java 2007-03-09 19:39:26 UTC
(rev 12068)
@@ -82,8 +82,8 @@
return currentValue == defaultValue;
}
- public long getDefault() {
- return defaultValue;
+ public String getDefault() {
+ return new Long(defaultValue).toString();
}
public void setDefault() {
Modified: trunk/freenet/src/freenet/config/Option.java
===================================================================
--- trunk/freenet/src/freenet/config/Option.java 2007-03-09 18:23:49 UTC
(rev 12067)
+++ trunk/freenet/src/freenet/config/Option.java 2007-03-09 19:39:26 UTC
(rev 12068)
@@ -81,4 +81,6 @@
/** Set to the default. Don't use after completed initialization, as
this does not call the callback. FIXME fix this? */
public abstract void setDefault();
+
+ public abstract String getDefault();
}
Modified: trunk/freenet/src/freenet/config/ShortOption.java
===================================================================
--- trunk/freenet/src/freenet/config/ShortOption.java 2007-03-09 18:23:49 UTC
(rev 12067)
+++ trunk/freenet/src/freenet/config/ShortOption.java 2007-03-09 19:39:26 UTC
(rev 12068)
@@ -55,8 +55,8 @@
return currentValue == defaultValue;
}
- public short getDefault() {
- return defaultValue;
+ public String getDefault() {
+ return new Short(defaultValue).toString();
}
public void setDefault() {
Modified: trunk/freenet/src/freenet/config/StringArrOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringArrOption.java 2007-03-09
18:23:49 UTC (rev 12067)
+++ trunk/freenet/src/freenet/config/StringArrOption.java 2007-03-09
19:39:26 UTC (rev 12068)
@@ -96,8 +96,8 @@
}
}
- public String[] getDefault() {
- return defaultValue;
+ public String getDefault() {
+ return arrayToString(defaultValue);
}
public boolean isDefault() {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-03-09 18:23:49 UTC (rev
12067)
+++ trunk/freenet/src/freenet/node/Node.java 2007-03-09 19:39:26 UTC (rev
12068)
@@ -1323,7 +1323,7 @@
if(databaseMaxMemory > (80 * Runtime.getRuntime().maxMemory() /
100)){
Logger.error(this, "The databaseMemory setting is set
too high " + databaseMaxMemory +
" ... let's assume it's not what the
user wants to do and restore the default.");
- databaseMaxMemory = ((LongOption)
nodeConfig.getOption("databaseMaxMemory")).getDefault();
+ databaseMaxMemory = Long.valueOf(((LongOption)
nodeConfig.getOption("databaseMaxMemory")).getDefault()).longValue();
}
envMutableConfig.setCacheSize(databaseMaxMemory);
//
http://www.oracle.com/technology/products/berkeley-db/faq/je_faq.html#35
