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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-21 17:53:44 +0000 (Thu, 21 Aug 2008)
New Revision: 22079

Modified:
   trunk/freenet/src/freenet/support/Fields.java
Log:
factor a constant

Modified: trunk/freenet/src/freenet/support/Fields.java
===================================================================
--- trunk/freenet/src/freenet/support/Fields.java       2008-08-21 17:41:10 UTC 
(rev 22078)
+++ trunk/freenet/src/freenet/support/Fields.java       2008-08-21 17:53:44 UTC 
(rev 22079)
@@ -69,6 +69,10 @@
                1000l * 1000l * 1000l * 1000l * 1000l * 1000l,  1l << 60
        };

+       private static final String[] MULTIPLES_2 = {
+               "k", "K", "m", "M", "g", "G", "t", "T", "p", "P", "e", "E"
+       };
+       
        /**
         * Converts a hex string into a long. Long.parseLong(hex, 16) assumes 
the
         * input is nonnegative unless there is a preceding minus sign. This 
method
@@ -685,7 +689,6 @@
        }

        public static String longToString(long val) {
-               String[] u = { "k", "K", "m", "M", "g", "G", "t", "T", "p", 
"P", "e", "E" };
                String ret = Long.toString(val);

                if (val <= 0)
@@ -693,8 +696,8 @@

                for (int i = MULTIPLES.length - 1; i >= 0; i--) {
                        if (val > MULTIPLES[i] && val % MULTIPLES[i] == 0) {
-                               ret = (val / MULTIPLES[i]) + u[i];
-                               if (!u[i].toLowerCase().equals(u[i]))
+                               ret = (val / MULTIPLES[i]) + MULTIPLES_2[i];
+                               if 
(!MULTIPLES_2[i].toLowerCase().equals(MULTIPLES_2[i]))
                                        ret += "iB";
                                break;
                        }
@@ -703,7 +706,6 @@
        }

        public static String intToString(int val) {
-               String[] u = { "k", "K", "m", "M", "g", "G", "t", "T", "p", 
"P", "e", "E" };
                String ret = Integer.toString(val);

                if (val <= 0)
@@ -711,8 +713,8 @@

                for (int i = MULTIPLES.length - 1; i >= 0; i--) {
                        if (val > MULTIPLES[i] && val % MULTIPLES[i] == 0) {
-                               ret = (val / MULTIPLES[i]) + u[i];
-                               if (!u[i].toLowerCase().equals(u[i]))
+                               ret = (val / MULTIPLES[i]) + MULTIPLES_2[i];
+                               if 
(!MULTIPLES_2[i].toLowerCase().equals(MULTIPLES_2[i]))
                                        ret += "iB";
                                break;
                        }
@@ -721,7 +723,6 @@
        }

        public static String shortToString(short val) {
-               String[] u = { "k", "K", "m", "M", "g", "G", "t", "T", "p", 
"P", "e", "E" };
                String ret = Short.toString(val);

                if (val <= 0)
@@ -729,8 +730,8 @@

                for (int i = MULTIPLES.length - 1; i >= 0; i--) {
                        if (val > MULTIPLES[i] && val % MULTIPLES[i] == 0) {
-                               ret = (val / MULTIPLES[i]) + u[i];
-                               if (!u[i].toLowerCase().equals(u[i]))
+                               ret = (val / MULTIPLES[i]) + MULTIPLES_2[i];
+                               if 
(!MULTIPLES_2[i].toLowerCase().equals(MULTIPLES_2[i]))
                                        ret += "iB";
                                break;
                        }