[freenet-cvs] r10921 - trunk/freenet/src/freenet/support

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-11-14 14:50:10 +0000 (Tue, 14 Nov 2006)
New Revision: 10921

Modified:
   trunk/freenet/src/freenet/support/SizeUtil.java
Log:
Fix a stupid bug in SizeUtil... we are handling longs ;) thanks to stpeter for 
reporting it : second edition with only the real meat

Modified: trunk/freenet/src/freenet/support/SizeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/SizeUtil.java     2006-11-14 14:44:45 UTC 
(rev 10920)
+++ trunk/freenet/src/freenet/support/SizeUtil.java     2006-11-14 14:50:10 UTC 
(rev 10921)
@@ -4,14 +4,12 @@
  * Size formatting utility.
  */
 public class SizeUtil {
+       public static String[] suffixes = {"B", 
"KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"};

        public static String formatSize(long sz) {
-               // First determine suffix
-               
-               String[] suffixes = {"B", 
"KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"};
                long s = 1;
                int i;
-               for(i=0;i<suffixes.length;i++) {
+               for(i=0;i<SizeUtil.suffixes.length;i++) {
                        s *= 1024;
                        if(s > sz) {
                                break;
@@ -22,7 +20,7 @@
                s /= 1024; // we use the previous unit
                if (s == 1)  // Bytes? Then we don't need real numbers with a 
comma
                {
-                       return sz + " " + suffixes[0];
+                       return sz + " " + SizeUtil.suffixes[0];
                }
                else
                {
@@ -32,7 +30,8 @@
                                o = o.substring(0, 3);
                        else if((o.indexOf('.') > -1) && (o.indexOf('E') == -1) 
&& (o.length() > 4))
                                o = o.substring(0, 4);
-                       o += " " + suffixes[i];
+                       if(i < SizeUtil.suffixes.length) // handle the case 
where the mantissa is Infinity
+                               o += " " + SizeUtil.suffixes[i];
                        return o;
                }
        }