Changeset 9954 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-03-08T01:22:33+01:00 (9 years ago)

Author:

Don-vip

Message:

make MapScaler and SizeButton implement Accessible interface, add unit tests, fix checkstyle violation

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -92 +92 @@
     private static final char[] DEFAULT_STRIP = {'\u200B', '\uFEFF'};
 
+    private static final String[] SIZE_UNITS = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+
     /**
      * Tests whether {@code predicate} applies to at least one element from {@code collection}.
@@ -1042 +1044 @@
             throw new IllegalArgumentException("bytes must be >= 0");
         }
-        final String[] units = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
         int unitIndex = 0;
         double value = bytes;
-        while (value >= 1024 && unitIndex < units.length) {
+        while (value >= 1024 && unitIndex < SIZE_UNITS.length) {
             value /= 1024;
             unitIndex++;
         }
         if (value > 100 || unitIndex == 0) {
-            return String.format(locale, "%.0f %s", value, units[unitIndex]);
+            return String.format(locale, "%.0f %s", value, SIZE_UNITS[unitIndex]);
         } else if (value > 10) {
-            return String.format(locale, "%.1f %s", value, units[unitIndex]);
+            return String.format(locale, "%.1f %s", value, SIZE_UNITS[unitIndex]);
         } else {
-            return String.format(locale, "%.2f %s", value, units[unitIndex]);
+            return String.format(locale, "%.2f %s", value, SIZE_UNITS[unitIndex]);
         }
     }