[freenet-cvs] r15426 - trunk/freenet/src/freenet/clients/http

[juiceman at freenetproject.org]

Author: juiceman
Date: 2007-10-02 00:13:01 +0000 (Tue, 02 Oct 2007)
New Revision: 15426

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Better like that.

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java	2007-10-01 21:32:33 UTC (rev 15425)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java	2007-10-02 00:13:01 UTC (rev 15426)
@@ -620,9 +620,6 @@
 		long totalPayload = node.getTotalPayloadSent();
 		long total_payload_rate = totalPayload / nodeUptimeSeconds;
 		int percent = (int) (100 * totalPayload / total[0]);
-		activityList.addChild("li", l10n("totalOutput", new String[] { "total", "rate" }, new String[] { SizeUtil.formatSize(total[0], true), SizeUtil.formatSize(total_output_rate, true) } ));
-		activityList.addChild("li", l10n("payloadOutput", new String[] { "total", "rate", "percent" }, new String[] { SizeUtil.formatSize(totalPayload, true), SizeUtil.formatSize(total_payload_rate, true), Integer.toString(percent) } ));
-		activityList.addChild("li", l10n("totalInput", new String[] { "total", "rate" }, new String[] { SizeUtil.formatSize(total[1], true), SizeUtil.formatSize(total_input_rate, true) }));
 		long[] rate = node.nodeStats.getNodeIOStats();
 		long delta = (rate[5] - rate[2]) / 1000;
 		if(delta > 0) {
@@ -634,9 +631,12 @@
 			if(inputBandwidthLimit == -1) {
 				inputBandwidthLimit = outputBandwidthLimit * 4;
 			}
+			activityList.addChild("li", l10n("inputRate", new String[] { "rate", "max" }, new String[] { SizeUtil.formatSize(input_rate, true), SizeUtil.formatSize(inputBandwidthLimit, true) }));
 			activityList.addChild("li", l10n("outputRate", new String[] { "rate", "max" }, new String[] { SizeUtil.formatSize(output_rate, true), SizeUtil.formatSize(outputBandwidthLimit, true) }));
-			activityList.addChild("li", l10n("inputRate", new String[] { "rate", "max" }, new String[] { SizeUtil.formatSize(input_rate, true), SizeUtil.formatSize(inputBandwidthLimit, true) }));
 		}
+		activityList.addChild("li", l10n("totalInput", new String[] { "total", "rate" }, new String[] { SizeUtil.formatSize(total[1], true), SizeUtil.formatSize(total_input_rate, true) }));
+		activityList.addChild("li", l10n("totalOutput", new String[] { "total", "rate" }, new String[] { SizeUtil.formatSize(total[0], true), SizeUtil.formatSize(total_output_rate, true) } ));
+		activityList.addChild("li", l10n("payloadOutput", new String[] { "total", "rate", "percent" }, new String[] { SizeUtil.formatSize(totalPayload, true), SizeUtil.formatSize(total_payload_rate, true), Integer.toString(percent) } ));
 	}
 
 	static HTMLNode drawActivity(HTMLNode activityInfoboxContent, Node node) {