echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Fix log file size config bug on /configlogging bug (ticket #1996)

Browse Source
This commit is contained in:
str4d
2017-07-07 17:25:25 +00:00
parent 87d6c302e6
commit d8831151fe
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/src/net/i2p/data/DataHelper.java
View File

@ -1549,14 +1549,25 @@ public class DataHelper {
default: return bytes + "";
}
}
/**
* Like formatSize but with a non-breaking space after the number
* This seems consistent with most style guides out there.
* Use only in HTML
* @since 0.7.14
* Use only in HTML, and not inside form values (use
* formatSize2(bytes, false) there instead).
* @since 0.7.14, uses thin non-breaking space since 0.9.31
*/
public static String formatSize2(long bytes) {
return formatSize2(bytes, true);
}
/**
* Like formatSize but with a space after the number
* This seems consistent with most style guides out there.
* @param nonBreaking use an HTML thin non-breaking space ( )
* @since 0.9.31
*/
public static String formatSize2(long bytes, boolean nonBreaking) {
double val = bytes;
int scale = 0;
while (val >= 1024) {
@ -1568,17 +1579,18 @@ public class DataHelper {
// Replace   with thin non-breaking space   (more consistent/predictable width between fonts & point sizes)
String str = fmt.format(val);
String space = nonBreaking ? " " : " ";
String str = fmt.format(val) + space;
switch (scale) {
case 1: return str + " K";
case 2: return str + " M";
case 3: return str + " G";
case 4: return str + " T";
case 5: return str + " P";
case 6: return str + " E";
case 7: return str + " Z";
case 8: return str + " Y";
default: return bytes + " ";
case 1: return str + "K";
case 2: return str + "M";
case 3: return str + "G";
case 4: return str + "T";
case 5: return str + "P";
case 6: return str + "E";
case 7: return str + "Z";
case 8: return str + "Y";
default: return bytes + space;
}
}