Changeset 9274 in josm for trunk

Timestamp:

2016-01-03T12:13:44+01:00 (9 years ago)

Author:

simon04

Message:

Uniform display of sizes (B, kB, MB, ...)

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/StreamProgressUpdater.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/HttpClient.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/StreamProgressUpdater.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import java.util.Locale;
+
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
 
 final class StreamProgressUpdater {
@@ -45 +48 @@
                 progressMonitor.setTicks(soFar);
             }
-            progressMonitor.setExtraText(soFar / 1024 + " KB");
+            progressMonitor.setExtraText(Utils.getSizeString(soFar, Locale.getDefault()));
         }
     }

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

@@ -13 +13 @@
 import java.net.URL;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Scanner;
@@ -99 +100 @@
 
         if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
-            Main.info("{0} {1} ({2} kB) ...", requestMethod, url, requestBody.length / 1024);
+            Main.info("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
             headers.put("Content-Length", String.valueOf(requestBody.length));
             connection.setDoOutput(true);
@@ -116 +117 @@
                         requestMethod, url, hasReason ? " (" + reasonForRequest + ")" : "",
                         connection.getResponseCode(),
-                        connection.getContentLengthLong() > 0 ? " (" + connection.getContentLengthLong() / 1024 + "KB)" : ""
+                        connection.getContentLengthLong() > 0
+                                ? " (" + Utils.getSizeString(connection.getContentLengthLong(), Locale.getDefault()) + ")"
+                                : ""
                 );
                 if (Main.isDebugEnabled()) {

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

@@ -1146 +1146 @@
 
     /**
+     * Returns a human readable representation (B, kB, MB, ...) for the given number of byes.
+     * @param bytes the number of bytes
+     * @param locale the locale used for formatting
+     * @return a human readable representation
+     * @since 9274
+     */
+    public static String getSizeString(long bytes, Locale locale) {
+        if (bytes < 0) {
+            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) {
+            value /= 1024;
+            unitIndex++;
+        }
+        if (value > 100 || unitIndex == 0) {
+            return String.format(locale, "%.0f %s", value, units[unitIndex]);
+        } else if (value > 10) {
+            return String.format(locale, "%.1f %s", value, units[unitIndex]);
+        } else {
+            return String.format(locale, "%.2f %s", value, units[unitIndex]);
+        }
+    }
+
+    /**
      * Returns a human readable representation of a list of positions.
      * <p>

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -8 +8 @@
 import java.net.URL;
 import java.util.Arrays;
+import java.util.Locale;
 
 import org.junit.Assert;
@@ -163 +164 @@
         assertEquals("1\n2\n3", Utils.restrictStringLines("1\n2\n3", 4));
     }
+
+    /**
+     * Test of {@link Utils#getSizeString} method.
+     */
+    @Test
+    public void testSizeString() throws Exception {
+        assertEquals("0 B", Utils.getSizeString(0, Locale.ENGLISH));
+        assertEquals("123 B", Utils.getSizeString(123, Locale.ENGLISH));
+        assertEquals("1023 B", Utils.getSizeString(1023, Locale.ENGLISH));
+        assertEquals("1.00 kB", Utils.getSizeString(1024, Locale.ENGLISH));
+        assertEquals("11.7 kB", Utils.getSizeString(12024, Locale.ENGLISH));
+        assertEquals("8.00 EB", Utils.getSizeString(Long.MAX_VALUE, Locale.ENGLISH));
+    }
+
+    /**
+     * Test of {@link Utils#getSizeString} method.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSizeStringNegative() throws Exception {
+        Utils.getSizeString(-1, Locale.ENGLISH);
+    }
+
 }