From df1b954b7bf6f0e523cb067cec8559897e19af87 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Sun, 11 Mar 2018 15:56:30 +0100
Subject: [PATCH] JavaDoc: Remove unnecessary {@inheritDoc}.

---
 core/src/main/java/org/bitcoinj/core/SegwitAddress.java     | 6 ------
 .../src/main/java/org/bitcoinj/crypto/DeterministicKey.java | 1 -
 .../bitcoinj/protocols/channels/PaymentChannelClient.java   | 3 ---
 .../main/java/org/bitcoinj/utils/BaseTaggableObject.java    | 4 ----
 core/src/main/java/org/bitcoinj/wallet/Wallet.java          | 5 -----
 5 files changed, 19 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/SegwitAddress.java b/core/src/main/java/org/bitcoinj/core/SegwitAddress.java
index cdacb3d8..5f72d45d 100644
--- a/core/src/main/java/org/bitcoinj/core/SegwitAddress.java
+++ b/core/src/main/java/org/bitcoinj/core/SegwitAddress.java
@@ -124,9 +124,6 @@ public class SegwitAddress extends Address {
         return convertBits(bytes, 1, bytes.length - 1, 5, 8, false);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public byte[] getHash() {
         return getWitnessProgram();
@@ -150,9 +147,6 @@ public class SegwitAddress extends Address {
         throw new IllegalStateException("Cannot happen.");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return toBech32();
diff --git a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java b/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
index a4599d17..53d05a8e 100644
--- a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
+++ b/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
@@ -316,7 +316,6 @@ public class DeterministicKey extends ECKey {
         return super.isPubKeyOnly() && (parent == null || parent.isPubKeyOnly());
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasPrivKey() {
         return findParentWithPrivKey() != null;
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
index 1bd47e41..0a78726b 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
@@ -407,9 +407,6 @@ public class PaymentChannelClient implements IPaymentChannelClient {
         conn.channelOpen(wasInitiated);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void receiveMessage(Protos.TwoWayChannelMessage msg) throws InsufficientMoneyException {
         lock.lock();
diff --git a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java b/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java
index a87b106d..1aea2854 100644
--- a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java
+++ b/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java
@@ -32,7 +32,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class BaseTaggableObject implements TaggableObject {
     @Nullable protected Map<String, ByteString> tags;
 
-    /** {@inheritDoc} */
     @Override
     @Nullable
     public synchronized ByteString maybeGetTag(String tag) {
@@ -42,7 +41,6 @@ public class BaseTaggableObject implements TaggableObject {
             return tags.get(tag);
     }
 
-    /** {@inheritDoc} */
     @Override
     public ByteString getTag(String tag) {
         ByteString b = maybeGetTag(tag);
@@ -51,7 +49,6 @@ public class BaseTaggableObject implements TaggableObject {
         return b;
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized void setTag(String tag, ByteString value) {
         checkNotNull(tag);
@@ -61,7 +58,6 @@ public class BaseTaggableObject implements TaggableObject {
         tags.put(tag, value);
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized Map<String, ByteString> getTags() {
         if (tags != null)
diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
index e0a1eadd..0c41873d 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -1015,13 +1015,11 @@ public class Wallet extends BaseTaggableObject
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isPubKeyHashMine(byte[] pubkeyHash) {
         return findKeyFromPubHash(pubkeyHash) != null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isWatchedScript(Script script) {
         keyChainGroupLock.lock();
@@ -1047,7 +1045,6 @@ public class Wallet extends BaseTaggableObject
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isPubKeyMine(byte[] pubkey) {
         return findKeyFromPubKey(pubkey) != null;
@@ -1068,7 +1065,6 @@ public class Wallet extends BaseTaggableObject
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isPayToScriptHashMine(byte[] payToScriptHash) {
         return findRedeemDataFromScriptHash(payToScriptHash) != null;
@@ -2940,7 +2936,6 @@ public class Wallet extends BaseTaggableObject
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Map<Sha256Hash, Transaction> getTransactionPool(Pool pool) {
         lock.lock();