[freenet-cvs] r10980 - in trunk/freenet/src/freenet: clients/http node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-11-18 08:35:33 +0000 (Sat, 18 Nov 2006)
New Revision: 10980

Modified:
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
   trunk/freenet/src/freenet/node/NodeStarter.java
   trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
Log:

* increase the NodeStarter.RECOMMENDED_EXT_BUILD_NUMBER value to 7
* display the NodeStarter.RECOMMENDED_EXT_BUILD_NUMBER value on the 
WelcomeToadlet
* remove a useless null string


Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-11-18 
02:04:03 UTC (rev 10979)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-11-18 
08:35:33 UTC (rev 10980)
@@ -555,7 +555,7 @@
                HTMLNode versionContent = 
ctx.getPageMaker().getContentNode(versionBox);
                versionContent.addChild("#", "Freenet " + Version.nodeVersion + 
" Build #" + Version.buildNumber() + " r" + Version.cvsRevision);
                versionContent.addChild("br");
-               versionContent.addChild("#", "Freenet-ext Build #" + 
NodeStarter.extBuildNumber + " r" + NodeStarter.extRevisionNumber);
+               versionContent.addChild("#", "Freenet-ext Build #" + 
NodeStarter.extBuildNumber + '(' + NodeStarter.RECOMMENDED_EXT_BUILD_NUMBER + 
") r" + NodeStarter.extRevisionNumber);
                versionContent.addChild("br");
                HTMLNode shutdownForm = versionContent.addChild("form", new 
String[] { "action", "method" }, new String[] { ".", "GET" });
                shutdownForm.addChild("input", new String[] { "type", "name" }, 
new String[] { "hidden", "exit" });

Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java     2006-11-18 02:04:03 UTC 
(rev 10979)
+++ trunk/freenet/src/freenet/node/NodeStarter.java     2006-11-18 08:35:33 UTC 
(rev 10980)
@@ -32,9 +32,11 @@
     private Node node;
        static LoggingConfigHandler logConfigHandler;
        //TODO: cleanup
-       public static int RECOMMENDED_EXT_BUILD_NUMBER = 
+       public static int RECOMMENDED_EXT_BUILD_NUMBER = 7;
+       /*
                (File.separatorChar == '\\') &&
                
(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)")) 
? 6 : 2;
+       */
        public static int extBuildNumber;
        public static String extRevisionNumber;
        private FreenetFilePersistentConfig cfg;
@@ -226,4 +228,4 @@
         //  will be called immediately.
         WrapperManager.start( new NodeStarter(), args );
     }
-}
\ No newline at end of file
+}

Modified: trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java       
2006-11-18 02:04:03 UTC (rev 10979)
+++ trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java       
2006-11-18 08:35:33 UTC (rev 10980)
@@ -158,7 +158,7 @@
         System.out.println();
         int requestNumber = 0;
         RunningAverage requestsAvg = new SimpleRunningAverage(100, 0.0);
-        String baseString = "" + System.currentTimeMillis() + ' ';
+        String baseString = System.currentTimeMillis() + ' ';
         while(true) {
             try {
                 requestNumber++;