propagate from branch 'i2p.i2p' (head 247ff5f9bcb20e4aa3ad4aa8702425c315d1d77b)

to branch 'i2p.i2p.str4d.ui' (head d4b5b96ff60f7d8b746c8fc5f0f9c533778a9eda)
This commit is contained in:
str4d
2017-05-18 12:54:13 +00:00
800 changed files with 54764 additions and 10819 deletions

View File

@@ -1566,17 +1566,19 @@ public class DataHelper {
DecimalFormat fmt = new DecimalFormat("##0.00");
// Replace   with thin non-breaking space   (more consistent/predictable width between fonts & point sizes)
String str = fmt.format(val);
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 + " ";
}
}

View File

@@ -765,18 +765,18 @@ public class KBucketSet<T extends SimpleDataStructure> {
@Override
public String toString() {
StringBuilder buf = new StringBuilder(1024);
buf.append("Bucket set rooted on: ").append(_us.toString())
buf.append("<hr><b>Bucket set rooted on:</b> ").append(_us.toString())
.append(" K=").append(BUCKET_SIZE)
.append(" B=").append(B_VALUE)
.append(" with ").append(size())
.append(" keys in ").append(_buckets.size()).append(" buckets:\n");
.append(" keys in ").append(_buckets.size()).append(" buckets:<br>\n");
getReadLock();
try {
int len = _buckets.size();
for (int i = 0; i < len; i++) {
KBucket<T> b = _buckets.get(i);
buf.append("* Bucket ").append(i).append("/").append(len).append(": ");
buf.append(b.toString()).append("\n");
buf.append("<b>Bucket ").append(i).append("/").append(len).append(":</b> ");
buf.append(b.toString()).append("<br>\n");
}
} finally { releaseReadLock(); }
return buf.toString();