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 | 65 ++++++++++++--------------------
1 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/src/com/gitblit/utils/ByteFormat.java b/src/com/gitblit/utils/ByteFormat.java
index a726368..cb7da88 100644
--- a/src/com/gitblit/utils/ByteFormat.java
+++ b/src/com/gitblit/utils/ByteFormat.java
@@ -1,7 +1,17 @@
/*
- * Copyright 2011 Squeal Group. Licensed under the Eclipse Public License,
- * Version 1.0 (http://www.eclipse.org/legal/epl-v10.html).
- * Initial Developer: Squeal Group
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.gitblit.utils;
@@ -11,8 +21,10 @@
import java.text.ParsePosition;
/**
- * A formatter for formatting byte sizes. For example, formatting 12345 byes
- * results in "12.1 K" and 1234567 results in "1.18 MB".
+ * ByteFormat is a formatter which takes numbers and returns filesizes in bytes,
+ * kilobytes, megabytes, or gigabytes.
+ *
+ * @author James Moger
*
*/
public class ByteFormat extends Format {
@@ -22,60 +34,31 @@
public ByteFormat() {
}
- // Implemented from the Format class
-
- /**
- * Formats a long which represent a number of bytes.
- */
- public String format(long bytes) {
- return format(Long.valueOf(bytes));
+ public String format(long value) {
+ return format(Long.valueOf(value));
}
- /**
- * Formats a long which represent a number of kilobytes.
- */
- public String formatKB(long kilobytes) {
- return format(Long.valueOf(kilobytes * 1024));
- }
-
- /**
- * Format the given object (must be a Long).
- *
- * @param obj
- * assumed to be the number of bytes as a Long.
- * @param buf
- * the StringBuffer to append to.
- * @param pos
- * @return A formatted string representing the given bytes in more
- * human-readable form.
- */
public StringBuffer format(Object obj, StringBuffer buf, FieldPosition pos) {
- if (obj instanceof Long) {
- long numBytes = ((Long) obj).longValue();
+ if (obj instanceof Number) {
+ long numBytes = ((Number) obj).longValue();
if (numBytes < 1024) {
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");
buf.append(formatter.format((double) 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))).append(" GB");
+ buf.append(formatter.format((double) numBytes / (1024.0 * 1024.0 * 1024.0)))
+ .append(" GB");
}
}
return buf;
}
- /**
- * In this implementation, returns null always.
- *
- * @param source
- * @param pos
- * @return returns null in this implementation.
- */
public Object parseObject(String source, ParsePosition pos) {
return null;
}
--
Gitblit v1.9.1