From 0ba3f4c2d2e18111395a2ca9d046100f62defb78 Mon Sep 17 00:00:00 2001 From: Kirill Vlasov Date: Tue, 8 Dec 2015 10:27:29 +0100 Subject: [PATCH] "@Override" annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one. --- core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java | 2 ++ core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java | 1 + core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java | 1 + examples/src/main/java/org/bitcoinj/examples/SendRequest.java | 2 ++ 4 files changed, 6 insertions(+) diff --git a/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java index fb6a6514..e17100a6 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java @@ -148,9 +148,11 @@ public class TorDiscovery implements PeerDiscovery { } }); Futures.addCallback(openCircuit, new FutureCallback() { + @Override public void onSuccess(Circuit circuit) { doneSignal.countDown(); } + @Override public void onFailure(Throwable thrown) { doneSignal.countDown(); } diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java index e94bd3f6..bd9a2011 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java @@ -345,6 +345,7 @@ public class KeyChainGroup implements KeyBag { return importKeys(encryptedKeys); } + @Override @Nullable public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) { // Iterate in reverse order, since the active keychain is the one most likely to have the hit diff --git a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java index 471b21ac..e3d9562a 100644 --- a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java @@ -90,6 +90,7 @@ public class MarriedKeyChain extends DeterministicKeyChain { return self(); } + @Override public MarriedKeyChain build() { checkState(random != null || entropy != null || seed != null || watchingKey!= null, "Must provide either entropy or random or seed or watchingKey"); checkNotNull(followingKeys, "followingKeys must be provided"); diff --git a/examples/src/main/java/org/bitcoinj/examples/SendRequest.java b/examples/src/main/java/org/bitcoinj/examples/SendRequest.java index 0b6c0e4b..282cd77a 100644 --- a/examples/src/main/java/org/bitcoinj/examples/SendRequest.java +++ b/examples/src/main/java/org/bitcoinj/examples/SendRequest.java @@ -67,10 +67,12 @@ public class SendRequest { // Bitcoinj is using the ListenableFutures of the Guava library. Have a look here for more information: https://code.google.com/p/guava-libraries/wiki/ListenableFutureExplained ListenableFuture balanceFuture = kit.wallet().getBalanceFuture(value, BalanceType.AVAILABLE); FutureCallback callback = new FutureCallback() { + @Override public void onSuccess(Coin balance) { System.out.println("coins arrived and the wallet now has enough balance"); } + @Override public void onFailure(Throwable t) { System.out.println("something went wrong"); }