[freenet-cvs] r22336 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-09-01 23:30:25 +0000 (Mon, 01 Sep 2008)
New Revision: 22336

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
No, don't change the default according to time, check it here instead, so we 
enable it by default, but block it until 1160 is mandatory.


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-09-01 23:24:14 UTC (rev 
22335)
+++ trunk/freenet/src/freenet/node/Node.java    2008-09-01 23:30:25 UTC (rev 
22336)
@@ -931,7 +931,7 @@
                });
                publishOurPeersLocation = 
nodeConfig.getBoolean("publishOurPeersLocation");

-               nodeConfig.register("routeAccordingToOurPeersLocation", 
Version.lastGoodBuild() >= 1160, sortOrder++, true, false, 
"Node.routeAccordingToOurPeersLocation", 
"Node.routeAccordingToOurPeersLocationLong", new BooleanCallback() {
+               nodeConfig.register("routeAccordingToOurPeersLocation", true, 
sortOrder++, true, false, "Node.routeAccordingToOurPeersLocation", 
"Node.routeAccordingToOurPeersLocationLong", new BooleanCallback() {

                        public Boolean get() {
                                return routeAccordingToOurPeersLocation;
@@ -3372,6 +3372,6 @@
        }

        public boolean shallWeRouteAccordingToOurPeersLocation() {
-               return routeAccordingToOurPeersLocation;
+               return routeAccordingToOurPeersLocation && 
Version.lastGoodBuild() >= 1160;
        }
 }