mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-22 06:21:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

DownloadProgressTracker: migrate progress() method to java.time API

Browse source
This commit is contained in:
Andreas Schildbach 2023-03-05 23:55:19 +01:00
parent 310b93be4e
commit 558f6df127
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java
View file

@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.time.Instant;
import java.util.Date;
import java.util.Locale;
import java.util.concurrent.CompletableFuture;
@ -68,7 +69,7 @@ public class DownloadProgressTracker implements BlockchainDownloadEventListener
caughtUp = true;
if (lastPercent != 100) {
lastPercent = 100;
progress(lastPercent, blocksLeft, new Date(block.getTimeSeconds() * 1000));
progress(lastPercent, blocksLeft, block.getTimeInstant());
}
doneDownload();
future.complete(peer.getBestHeight());
@ -80,7 +81,7 @@ public class DownloadProgressTracker implements BlockchainDownloadEventListener
double pct = 100.0 - (100.0 * (blocksLeft / (double) originalBlocksLeft));
if ((int) pct != lastPercent) {
progress(pct, blocksLeft, new Date(block.getTimeSeconds() * 1000));
progress(pct, blocksLeft, block.getTimeInstant());
lastPercent = (int) pct;
}
}
@ -89,11 +90,11 @@ public class DownloadProgressTracker implements BlockchainDownloadEventListener
* Called when download progress is made.
*
* @param pct the percentage of chain downloaded, estimated
* @param date the date of the last block downloaded
* @param time the time of the last block downloaded
*/
protected void progress(double pct, int blocksSoFar, Date date) {
protected void progress(double pct, int blocksSoFar, Instant time) {
log.info(String.format(Locale.US, "Chain download %d%% done with %d blocks to go, block date %s", (int) pct, blocksSoFar,
TimeUtils.dateTimeFormat(date)));
TimeUtils.dateTimeFormat(time.toEpochMilli())));
}
/**

5
wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/BitcoinUIModel.java
View file

@ -26,6 +26,7 @@ import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleObjectProperty;
import java.time.Instant;
import java.util.Date;
/**
@ -61,8 +62,8 @@ public class BitcoinUIModel {
private class ProgressBarUpdater extends DownloadProgressTracker {
@Override
protected void progress(double pct, int blocksLeft, Date date) {
super.progress(pct, blocksLeft, date);
protected void progress(double pct, int blocksLeft, Instant time) {
super.progress(pct, blocksLeft, time);
Platform.runLater(() -> syncProgress.set(pct / 100.0));
}