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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-04 22:10:15 +0000 (Fri, 04 Apr 2008)
New Revision: 18993

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/TextModeClientInterface.java
Log:
Undo some of r18793: in several places we do in fact want java.vm.vendor, not 
java.vendor.
Also show java.vm.vendor as well as java.vendor on the stats page (JVM vendor 
and Java vendor).

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2008-04-04 22:02:10 UTC (rev 18992)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2008-04-04 22:10:15 UTC (rev 18993)
@@ -379,8 +379,9 @@
                jvmStatsList.addChild("li", l10n("threads", new String[] { 
"running", "max" },
                                new String[] { 
thousendPoint.format(threadCount), Integer.toString(stats.getThreadLimit()) }));
                jvmStatsList.addChild("li", l10n("cpus", "count", 
Integer.toString(availableCpus)));
+               jvmStatsList.addChild("li", l10n("javaVersion", "version", 
System.getProperty("java.version")));
                jvmStatsList.addChild("li", l10n("jvmVendor", "vendor", 
System.getProperty("java.vendor")));
-               jvmStatsList.addChild("li", l10n("jvmVersion", "version", 
System.getProperty("java.version")));
+               jvmStatsList.addChild("li", l10n("jvmVersion", "version", 
System.getProperty("java.vm.version")));
                jvmStatsList.addChild("li", l10n("osName", "name", 
System.getProperty("os.name")));
                jvmStatsList.addChild("li", l10n("osVersion", "version", 
System.getProperty("os.version")));
                jvmStatsList.addChild("li", l10n("osArch", "arch", 
System.getProperty("os.arch")));

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-04-04 
22:02:10 UTC (rev 18992)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-04-04 
22:10:15 UTC (rev 18993)
@@ -990,6 +990,7 @@
 StatisticsToadlet.jeDumpButton=Generate a JE Dump
 StatisticsToadlet.jvmInfoTitle=JVM Info
 StatisticsToadlet.jvmVendor=JVM Vendor: ${vendor}
+StatisticsToadlet.javaVersion=Java Version: ${version}
 StatisticsToadlet.jvmVersion=JVM Version: ${version}
 StatisticsToadlet.maxMemory=Maximum Java memory: ${memory}
 StatisticsToadlet.nodeToNodeBytes=Node to node messages: ${total}

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-04-04 22:02:10 UTC (rev 
18992)
+++ trunk/freenet/src/freenet/node/Node.java    2008-04-04 22:10:15 UTC (rev 
18993)
@@ -1760,7 +1760,7 @@
                // Now check whether we are likely to get the EvilJVMBug.
                // If we are running a Sun or Blackdown JVM, on Linux, and 
LD_ASSUME_KERNEL is not set, then we are.

-               String jvmVendor = System.getProperty("java.vendor");
+               String jvmVendor = System.getProperty("java.vm.vendor");
                String jvmVersion = System.getProperty("java.version");
                String osName = System.getProperty("os.name");
                String osVersion = System.getProperty("os.version");

Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-04-04 
22:02:10 UTC (rev 18992)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-04-04 
22:10:15 UTC (rev 18993)
@@ -425,6 +425,7 @@
                sb.append("Maximum Java memory:\u00a0" + 
SizeUtil.formatSize(maxJavaMem, true)+"\r\n");
                sb.append("Running threads:\u00a0" + 
thousendPoint.format(threadCount)+"\r\n");
                sb.append("Available CPUs:\u00a0" + availableCpus+"\r\n");
+               sb.append("Java Version:\u00a0" + 
System.getProperty("java.version")+"\r\n");
                sb.append("JVM Vendor:\u00a0" + 
System.getProperty("java.vendor")+"\r\n");
                sb.append("JVM Version:\u00a0" + 
System.getProperty("java.version")+"\r\n");
                sb.append("OS Name:\u00a0" + 
System.getProperty("os.name")+"\r\n");