From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
src/com/gitblit/utils/ByteFormat.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/utils/ByteFormat.java b/src/com/gitblit/utils/ByteFormat.java
index ea198de..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;
@@ -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