From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
src/com/gitblit/utils/ByteFormat.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/utils/ByteFormat.java b/src/com/gitblit/utils/ByteFormat.java
index fee645c..cb7da88 100644
--- a/src/com/gitblit/utils/ByteFormat.java
+++ b/src/com/gitblit/utils/ByteFormat.java
@@ -20,15 +20,22 @@
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;
public ByteFormat() {
}
-
+
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");
@@ -51,7 +58,7 @@
}
return buf;
}
-
+
public Object parseObject(String source, ParsePosition pos) {
return null;
}
--
Gitblit v1.9.1