avoid casting to int when comparing longs

This commit is contained in:
Craig Raw
2020-10-27 11:11:35 +02:00
parent d3881f76b9
commit 3a4d385560
5 changed files with 16 additions and 6 deletions
@@ -39,7 +39,7 @@ public class UtxosChart extends BarChart<String, Number> {
public void update(WalletUtxosEntry walletUtxosEntry) {
List<Data<String, Number>> utxoDataList = walletUtxosEntry.getChildren().stream()
.map(entry -> new XYChart.Data<>(getCategoryName(entry), (Number)entry.getValue(), entry))
.sorted((o1, o2) -> (int) (o2.getYValue().longValue() - o1.getYValue().longValue()))
.sorted((o1, o2) -> Long.compare(o2.getYValue().longValue(), o1.getYValue().longValue()))
.collect(Collectors.toList());
totalUtxos = utxoDataList.size();
@@ -101,6 +101,6 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
return o.getHashIndex().getComparisonHeight() - getHashIndex().getComparisonHeight();
}
return (int)o.getHashIndex().getIndex() - (int)getHashIndex().getIndex();
return Long.compare(o.getHashIndex().getIndex(), (int)getHashIndex().getIndex());
}
}
@@ -97,15 +97,15 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
TransactionHashIndexEntry entry1 = (TransactionHashIndexEntry) o1;
TransactionHashIndexEntry entry2 = (TransactionHashIndexEntry) o2;
if (!entry1.getHashIndex().getHash().equals(entry2.getHashIndex().getHash())) {
if(!entry1.getHashIndex().getHash().equals(entry2.getHashIndex().getHash())) {
return entry1.getHashIndex().getHash().compareTo(entry2.getHashIndex().getHash());
}
if (!entry1.getType().equals(entry2.getType())) {
if(!entry1.getType().equals(entry2.getType())) {
return entry1.getType().ordinal() - entry2.getType().ordinal();
}
return (int) entry1.getHashIndex().getIndex() - (int) entry2.getHashIndex().getIndex();
return Long.compare(entry1.getHashIndex().getIndex(), entry2.getHashIndex().getIndex());
});
return childEntries;