From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/utils/ByteFormat.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/ByteFormat.java b/src/main/java/com/gitblit/utils/ByteFormat.java
index cb7da88..d11ce9d 100644
--- a/src/main/java/com/gitblit/utils/ByteFormat.java
+++ b/src/main/java/com/gitblit/utils/ByteFormat.java
@@ -23,9 +23,9 @@
/**
* ByteFormat is a formatter which takes numbers and returns filesizes in bytes,
* kilobytes, megabytes, or gigabytes.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ByteFormat extends Format {
@@ -38,6 +38,7 @@
return format(Long.valueOf(value));
}
+ @Override
public StringBuffer format(Object obj, StringBuffer buf, FieldPosition pos) {
if (obj instanceof Number) {
long numBytes = ((Number) obj).longValue();
@@ -46,19 +47,20 @@
buf.append(formatter.format((double) numBytes)).append(" b");
} else if (numBytes < 1024 * 1024) {
DecimalFormat formatter = new DecimalFormat("#,##0");
- buf.append(formatter.format((double) numBytes / 1024.0)).append(" KB");
+ buf.append(formatter.format(numBytes / 1024.0)).append(" KB");
} else if (numBytes < 1024 * 1024 * 1024) {
DecimalFormat formatter = new DecimalFormat("#,##0.0");
- buf.append(formatter.format((double) numBytes / (1024.0 * 1024.0))).append(" MB");
+ buf.append(formatter.format(numBytes / (1024.0 * 1024.0))).append(" MB");
} else {
DecimalFormat formatter = new DecimalFormat("#,##0.0");
- buf.append(formatter.format((double) numBytes / (1024.0 * 1024.0 * 1024.0)))
+ buf.append(formatter.format(numBytes / (1024.0 * 1024.0 * 1024.0)))
.append(" GB");
}
}
return buf;
}
+ @Override
public Object parseObject(String source, ParsePosition pos) {
return null;
}
--
Gitblit v1.9.1