From 856c8a2ad521064d69b2b50003c1df382d375013 Mon Sep 17 00:00:00 2001
From: Marcin Floryan <marcin.floryan@gmail.com>
Date: Sat, 03 Nov 2012 15:15:22 -0400
Subject: [PATCH] Download progress - CR character behaves as expected on Windows but not on other platforms.
---
src/com/gitblit/utils/ByteFormat.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/utils/ByteFormat.java b/src/com/gitblit/utils/ByteFormat.java
index 97b77bd..cb7da88 100644
--- a/src/com/gitblit/utils/ByteFormat.java
+++ b/src/com/gitblit/utils/ByteFormat.java
@@ -20,6 +20,13 @@
import java.text.Format;
import java.text.ParsePosition;
+/**
+ * ByteFormat is a formatter which takes numbers and returns filesizes in bytes,
+ * kilobytes, megabytes, or gigabytes.
+ *
+ * @author James Moger
+ *
+ */
public class ByteFormat extends Format {
private static final long serialVersionUID = 1L;
@@ -28,7 +35,7 @@
}
public String format(long value) {
- return format(new Long(value));
+ return format(Long.valueOf(value));
}
public StringBuffer format(Object obj, StringBuffer buf, FieldPosition pos) {
@@ -38,7 +45,7 @@
DecimalFormat formatter = new DecimalFormat("#,##0");
buf.append(formatter.format((double) numBytes)).append(" b");
} else if (numBytes < 1024 * 1024) {
- DecimalFormat formatter = new DecimalFormat("#,##0.0");
+ DecimalFormat formatter = new DecimalFormat("#,##0");
buf.append(formatter.format((double) numBytes / 1024.0)).append(" KB");
} else if (numBytes < 1024 * 1024 * 1024) {
DecimalFormat formatter = new DecimalFormat("#,##0.0");
--
Gitblit v1.9.1