jai removed from license part 1

[mir.git] / source / mir / misc / NumberUtils.java

diff --git a/source/mir/misc/NumberUtils.java b/source/mir/misc/NumberUtils.java
index 89a11e4..e435496 100755 (executable)
--- a/source/mir/misc/NumberUtils.java
+++ b/source/mir/misc/NumberUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2005 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,33 +18,27 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License.
+ * You must obey the GNU General Public License in all respects for all of the code used
+ * other than the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package  mir.misc;
 
-import freemarker.template.*;
-
 import java.text.NumberFormat;
-import java.util.List; 
 
 /**
  * Help methods for number handling.
  *
- * @version $Id: NumberUtils.java,v 1.3 2002/11/28 19:12:08 mh Exp $
+ * @version $Id: NumberUtils.java,v 1.5.2.2 2005/12/24 11:43:36 zapata Exp $
  * @author mh, Mir-coders group
  *
  */
 
 public final class NumberUtils {
+  private NumberUtils() {
+  }
 
   /* 
    * Uses a suffix indicating multiples of 1024 (K), 
@@ -57,36 +51,33 @@ public final class NumberUtils {
    * @return A text representation of the number of bytes,
    *     abbreviated for larger quantities.
    */
-  public static String humanReadableSize(double bytes)
-  {
+  public static String humanReadableSize(double aBytes) {
+    double bytes = aBytes;
     String suffix;
-      
-    if( bytes >= 1024 * 1024 * 1024 )
-    {
-      bytes /= (1024 * 1024 * 1024);
+
+    if ( bytes >= (double) (1024 * 1024 * 1024) ) {
+      bytes /= (double) (1024 * 1024 * 1024);
       suffix = "G";
     }
-    else if( bytes >= 1024 * 1024 )
-    {
-      bytes /= (1024 * 1024);
+    else if( bytes >= (double) (1024 * 1024) ) {
+      bytes /= (double) (1024 * 1024);
       suffix = "M";
     }
-    else if( bytes >= 1024 )
-    {
-      bytes /= 1024;
+    else if( bytes >= 1024.0 ) {
+      bytes /= 1024.0;
       suffix = "K";
     }
-    else
-    {
+    else {
       suffix = "";
     }
-    int frac = (bytes >= 10  ||  bytes == 0)  ?  0  :  1;
+    int frac = bytes > 9.5 || bytes < 0.05  ?  0  :  1;
+
     NumberFormat nf = NumberFormat.getInstance();
     nf.setMinimumFractionDigits(frac);
     nf.setMaximumFractionDigits(frac);
     nf.setGroupingUsed(false);
+
     return nf.format(bytes) + suffix;
   }
-
 }