Changeset f13f4fc for core/java

Timestamp:

Feb 11, 2018 8:59:58 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

012fb4ca

Parents:

31719d3

Message:

Util: Number formatting tweaks (ticket #1913)

File:

• core/java/src/net/i2p/data/DataHelper.java (modified) (5 diffs)

core/java/src/net/i2p/data/DataHelper.java

@@ -1556 +1556 @@
             case 7: return str + "Zi";
             case 8: return str + "Yi";
-            default: return bytes + "";
+            default: return Long.toString(bytes);
         }
     }
@@ -1590 +1590 @@
      */
     public static String formatSize2(long bytes, boolean nonBreaking) {
+        String space = nonBreaking ? " " : " ";
+        if (bytes < 1024)
+            return bytes + space;
         double val = bytes;
         int scale = 0;
@@ -1598 +1601 @@
         
         DecimalFormat fmt = new DecimalFormat("##0.00");
+        if (val >= 200) {
+            fmt.setMaximumFractionDigits(0);
+        } else if (val >= 20) {
+            fmt.setMaximumFractionDigits(1);
+        }
 
         // Replace &nbsp; with thin non-breaking space &#8239; (more consistent/predictable width between fonts & point sizes)
 
-        String space = nonBreaking ? "&#8239;" : " ";
         String str = fmt.format(val) + space;
         switch (scale) {
@@ -1644 +1651 @@
      */
     public static String formatSize2Decimal(long bytes, boolean nonBreaking) {
+        String space = nonBreaking ? "&#8239;" : " ";
+        if (bytes < 1000)
+            return bytes + space;
         double val = bytes;
         int scale = 0;
@@ -1651 +1661 @@
         }
         DecimalFormat fmt = new DecimalFormat("##0.00");
-        String space = nonBreaking ? "&#8239;" : " ";
+        if (val >= 200) {
+            fmt.setMaximumFractionDigits(0);
+        } else if (val >= 20) {
+            fmt.setMaximumFractionDigits(1);
+        }
         String str = fmt.format(val) + space;
         switch (scale) {