[freenet-cvs] r10320 - in trunk/freenet/src/freenet: config node

[t...@freenetproject.org]

Author: toad
Date: 2006-09-01 16:25:27 +0000 (Fri, 01 Sep 2006)
New Revision: 10320

Modified:
   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/config/StringOption.java
   trunk/freenet/src/freenet/config/SubConfig.java
   trunk/freenet/src/freenet/node/Node.java
Log:
Fix old default for aggressiveGC; if it is set to the old default it will be 
upgraded to the new default.

Modified: trunk/freenet/src/freenet/config/BooleanOption.java
===================================================================
--- trunk/freenet/src/freenet/config/BooleanOption.java 2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/BooleanOption.java 2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -52,5 +52,9 @@
        public boolean isDefault() {
                return currentValue == defaultValue;
        }
+
+       public void setDefault() {
+               currentValue = defaultValue;
+       }

 }

Modified: trunk/freenet/src/freenet/config/IntOption.java
===================================================================
--- trunk/freenet/src/freenet/config/IntOption.java     2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/IntOption.java     2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -64,4 +64,8 @@
                return currentValue == defaultValue;
        }

+       public void setDefault() {
+               currentValue = defaultValue;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/config/LongOption.java
===================================================================
--- trunk/freenet/src/freenet/config/LongOption.java    2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/LongOption.java    2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -64,4 +64,8 @@
                return currentValue == defaultValue;
        }

+       public void setDefault() {
+               currentValue = defaultValue;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/config/Option.java
===================================================================
--- trunk/freenet/src/freenet/config/Option.java        2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/Option.java        2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -75,4 +75,7 @@
         * Is this option set to the default?
         */
        public abstract boolean isDefault();
+
+       /** Set to the default */
+       public abstract void setDefault();
 }

Modified: trunk/freenet/src/freenet/config/ShortOption.java
===================================================================
--- trunk/freenet/src/freenet/config/ShortOption.java   2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/ShortOption.java   2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -43,4 +43,8 @@
                return currentValue == defaultValue;
        }

+       public void setDefault() {
+               currentValue = defaultValue;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/config/StringArrOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringArrOption.java       2006-09-01 
15:51:17 UTC (rev 10319)
+++ trunk/freenet/src/freenet/config/StringArrOption.java       2006-09-01 
16:25:27 UTC (rev 10320)
@@ -76,4 +76,8 @@
                return currentValue.equals(defaultValue);
        }

+       public void setDefault() {
+               currentValue = defaultValue;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/config/StringOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringOption.java  2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/StringOption.java  2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -39,4 +39,8 @@
                return currentValue.equals(defaultValue);
        }

+       public void setDefault() {
+               currentValue = defaultValue;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/config/SubConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/SubConfig.java     2006-09-01 15:51:17 UTC 
(rev 10319)
+++ trunk/freenet/src/freenet/config/SubConfig.java     2006-09-01 16:25:27 UTC 
(rev 10320)
@@ -204,6 +204,12 @@
                Option o = (Option) map.get(name);
                o.setValue(value);
        }
+
+       public void fixOldDefault(String name, String value) {
+               Option o = (Option) map.get(name);
+               if(o.getValueString().equals(value))
+                       o.setDefault();
+       }

        public String getPrefix(){
                return prefix;

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-09-01 15:51:17 UTC (rev 
10319)
+++ trunk/freenet/src/freenet/node/Node.java    2006-09-01 16:25:27 UTC (rev 
10320)
@@ -740,6 +740,8 @@
                                                aggressiveGCModificator = val;
                                        }
                });
+               if(lastVersion <= 954)
+                       nodeConfig.fixOldDefault("aggressiveGC", "250");

                //Memory Checking thread
                // TODO: proper config. callbacks : maybe we shoudln't start 
the thread at all if it's not worthy