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

propagate from branch 'i2p.i2p' (head 600cd73c4b46b7ba8c421149785f6245afa47487)

Browse Source 
to branch 'i2p.i2p.str4d.ui' (head d5b54214bfe1bf5203f614600b916346a10f26dd)
This commit is contained in:
str4d
2017-03-06 04:59:59 +00:00
parent 5f96067c22 de7a4ba55c
commit 74151b06ef
769 changed files with 48044 additions and 9997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1560,17 +1560,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 + " ";
}
}

8
core/java/src/net/i2p/kademlia/KBucketSet.java
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();