Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-07 23:03:04 +00:00
Code Issues Projects Releases Wiki Activity

Use Guavas primitive compare methods, where appropriate. Makes the code easier to read. Passes all unit tests.

Browse Source
This commit is contained in:
Andreas Schildbach 2014-02-06 12:22:53 +01:00
parent 5f9df48aaa
commit 417c81f54d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/google/bitcoin/core/PeerGroup.java
View File

@ -28,6 +28,8 @@ import com.google.bitcoin.utils.Threading;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
import com.google.common.util.concurrent.*; import com.google.common.util.concurrent.*;
import net.jcip.annotations.GuardedBy; import net.jcip.annotations.GuardedBy;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -297,7 +299,7 @@ public class PeerGroup extends AbstractExecutionThreadService implements Transac
int result = backoffMap.get(a).compareTo(backoffMap.get(b)); int result = backoffMap.get(a).compareTo(backoffMap.get(b));
// Sort by port if otherwise equals - for testing // Sort by port if otherwise equals - for testing
if (result == 0) if (result == 0)
result = Integer.valueOf(a.getPort()).compareTo(b.getPort()); result = Ints.compare(a.getPort(), b.getPort());
return result; return result;
} }
}); });
@ -1488,13 +1490,7 @@ public class PeerGroup extends AbstractExecutionThreadService implements Transac
// Sort by ping time. // Sort by ping time.
Collections.sort(candidates2, new Comparator<PeerAndPing>() { Collections.sort(candidates2, new Comparator<PeerAndPing>() {
public int compare(PeerAndPing peerAndPing, PeerAndPing peerAndPing2) { public int compare(PeerAndPing peerAndPing, PeerAndPing peerAndPing2) {
if (peerAndPing.pingTime < peerAndPing2.pingTime) return Longs.compare(peerAndPing.pingTime, peerAndPing2.pingTime);
return -1;
else if (peerAndPing.pingTime == peerAndPing2.pingTime)
return 0;
else
return 1;
} }
}); });
return candidates2.get(0).peer; return candidates2.get(0).peer;