From 66421858e7723031300c8daaffb1c76cc5cb51a2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 29 Jun 2010 02:32:08 +0000
Subject: [PATCH] formatSize cleanups
---
.../src/net/i2p/router/web/PluginUpdateHandler.java | 2 +-
.../java/src/net/i2p/router/web/TunnelRenderer.java | 11 ++++++-----
.../java/src/net/i2p/router/web/UpdateHandler.java | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java
index 8ba4708405..26d026a169 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java
@@ -142,7 +142,7 @@ public class PluginUpdateHandler extends UpdateHandler {
buf.append(_pct.format(pct));
}
buf.append(": ");
- buf.append(_("{0}B transferred", DataHelper.formatSize(currentWrite + alreadyTransferred)));
+ buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred)));
updateStatus(buf.toString());
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
index da5305ef0d..9206340cab 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
@@ -105,7 +105,7 @@ public class TunnelRenderer {
out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatDuration(timeLeft) + "</td>");
else
out.write("<td class=\"cells\" align=\"center\">(" + _("grace period") + ")</td>");
- out.write("<td class=\"cells\" align=\"center\">" + cfg.getProcessedMessagesCount() + "KB</td>");
+ out.write("<td class=\"cells\" align=\"center\">" + cfg.getProcessedMessagesCount() + " KB</td>");
int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000);
if (lifetime <= 0)
lifetime = 1;
@@ -124,7 +124,7 @@ public class TunnelRenderer {
}
out.write("</table>\n");
out.write("<div class=\"statusnotes\"><b>" + _("Inactive participating tunnels") + ": " + inactive + "</b></div>\n");
- out.write("<div class=\"statusnotes\"><b>" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize(processed*1024) + "B</b></div>\n");
+ out.write("<div class=\"statusnotes\"><b>" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B</b></div>\n");
renderPeers(out);
}
@@ -176,7 +176,7 @@ public class TunnelRenderer {
else
out.write("<tr> <td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"></td>");
out.write(" <td class=\"cells\" align=\"center\">" + DataHelper.formatDuration(timeLeft) + "</td>\n");
- out.write(" <td class=\"cells\" align=\"center\">" + info.getProcessedMessagesCount() + "KB</td>\n");
+ out.write(" <td class=\"cells\" align=\"center\">" + info.getProcessedMessagesCount() + " KB</td>\n");
for (int j = 0; j < info.getLength(); j++) {
Hash peer = info.getPeer(j);
TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j));
@@ -215,8 +215,9 @@ public class TunnelRenderer {
}
if (live <= 0)
out.write("<div class=\"statusnotes\"><center><b>" + _("No tunnels; waiting for the grace period to end.") + "</center></b></div>\n");
- out.write("<div class=\"statusnotes\"><center><b>" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize(processedIn*1024) + "B " + _("in") + ", " +
- DataHelper.formatSize(processedOut*1024) + "B " + _("out") + "</b></center></div>");
+ out.write("<div class=\"statusnotes\"><center><b>" + _("Lifetime bandwidth usage") + ": " +
+ DataHelper.formatSize2(processedIn*1024) + "B " + _("in") + ", " +
+ DataHelper.formatSize2(processedOut*1024) + "B " + _("out") + "</b></center></div>");
}
private void renderPeers(Writer out) throws IOException {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
index f411538a32..9506400cf2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
@@ -176,7 +176,7 @@ public class UpdateHandler {
buf.append(_pct.format(pct));
}
buf.append(":<br>\n");
- buf.append(_("{0}B transferred", DataHelper.formatSize(currentWrite + alreadyTransferred)));
+ buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred)));
updateStatus(buf.toString());
}
public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {
--
GitLab