From c1938fec7576a91283d58b2fa08176238bf96f23 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 26 Mar 2016 19:34:10 +0100 Subject: [PATCH] Harmonize license headers. --- .../java/org/bitcoin/NativeSecp256k1.java | 2 +- .../main/java/org/bitcoinj/core/Address.java | 2 +- .../main/java/org/bitcoinj/core/Base58.java | 2 +- .../org/bitcoinj/core/BitcoinSerializer.java | 2 +- .../java/org/bitcoinj/core/BlockChain.java | 2 +- .../org/bitcoinj/core/CheckpointManager.java | 2 +- .../java/org/bitcoinj/core/ChildMessage.java | 1 + .../src/main/java/org/bitcoinj/core/Coin.java | 2 +- .../main/java/org/bitcoinj/core/Context.java | 14 +++++++++++ .../org/bitcoinj/core/DumpedPrivateKey.java | 2 +- .../java/org/bitcoinj/core/FilteredBlock.java | 2 +- .../java/org/bitcoinj/core/InventoryItem.java | 2 +- .../main/java/org/bitcoinj/core/Monetary.java | 2 +- .../org/bitcoinj/core/PartialMerkleTree.java | 2 +- .../src/main/java/org/bitcoinj/core/Peer.java | 2 +- .../java/org/bitcoinj/core/PeerException.java | 2 +- .../java/org/bitcoinj/core/PeerGroup.java | 2 +- .../src/main/java/org/bitcoinj/core/Ping.java | 2 +- .../src/main/java/org/bitcoinj/core/Pong.java | 2 +- .../org/bitcoinj/core/ProtocolException.java | 2 +- .../org/bitcoinj/core/ScriptException.java | 2 +- .../java/org/bitcoinj/core/Sha256Hash.java | 2 +- .../java/org/bitcoinj/core/Transaction.java | 1 - .../org/bitcoinj/core/TransactionBag.java | 2 +- .../bitcoinj/core/TransactionBroadcast.java | 2 +- .../core/TransactionOutputChanges.java | 2 +- .../src/main/java/org/bitcoinj/core/UTXO.java | 10 ++++---- .../java/org/bitcoinj/core/UTXOProvider.java | 3 ++- .../bitcoinj/core/UTXOProviderException.java | 3 ++- .../core/UnsafeByteArrayOutputStream.java | 3 ++- .../main/java/org/bitcoinj/core/Utils.java | 2 +- .../main/java/org/bitcoinj/core/VarInt.java | 2 +- .../bitcoinj/core/VerificationException.java | 2 +- .../java/org/bitcoinj/core/VersionAck.java | 2 +- .../core/VersionedChecksummedBytes.java | 2 +- .../listeners/AbstractBlockChainListener.java | 14 +++++++++++ .../AbstractPeerConnectionEventListener.java | 2 +- .../AbstractPeerDataEventListener.java | 2 +- .../listeners/AbstractPeerEventListener.java | 2 +- .../AbstractWalletEventListener.java | 2 +- .../core/listeners/BlockChainListener.java | 14 +++++++++++ .../BlocksDownloadedEventListener.java | 2 +- .../ChainDownloadStartedEventListener.java | 2 +- .../listeners/DownloadProgressTracker.java | 2 +- .../core/listeners/GetDataEventListener.java | 2 +- .../core/listeners/NewBestBlockListener.java | 1 + .../OnTransactionBroadcastListener.java | 14 +++++++++++ .../listeners/PeerConnectedEventListener.java | 2 +- .../PeerConnectionEventListener.java | 2 +- .../core/listeners/PeerDataEventListener.java | 2 +- .../PeerDisconnectedEventListener.java | 2 +- .../PeerDiscoveredEventListener.java | 2 +- .../PreMessageReceivedEventListener.java | 2 +- .../core/listeners/ReorganizeListener.java | 1 + .../listeners/ScriptsChangeEventListener.java | 2 +- .../TransactionConfidenceEventListener.java | 2 +- .../TransactionReceivedInBlockListener.java | 2 +- .../listeners/WalletChangeEventListener.java | 2 +- .../WalletCoinsReceivedEventListener.java | 2 +- .../WalletCoinsSentEventListener.java | 2 +- .../core/listeners/WalletEventListener.java | 2 +- .../WalletReorganizeEventListener.java | 3 +-- .../java/org/bitcoinj/core/package-info.java | 14 +++++++++++ .../java/org/bitcoinj/crypto/ChildNumber.java | 2 +- .../org/bitcoinj/crypto/DRMWorkaround.java | 14 +++++++++++ .../org/bitcoinj/crypto/EncryptableItem.java | 2 +- .../org/bitcoinj/crypto/EncryptedData.java | 3 ++- .../crypto/HDDerivationException.java | 2 +- .../org/bitcoinj/crypto/HDKeyDerivation.java | 2 +- .../java/org/bitcoinj/crypto/HDUtils.java | 2 +- .../java/org/bitcoinj/crypto/KeyCrypter.java | 3 ++- .../bitcoinj/crypto/KeyCrypterException.java | 14 +++++++++++ .../java/org/bitcoinj/crypto/LazyECPoint.java | 14 +++++++++++ .../org/bitcoinj/crypto/TrustStoreLoader.java | 2 +- .../java/org/bitcoinj/crypto/X509Utils.java | 2 +- .../org/bitcoinj/crypto/package-info.java | 14 +++++++++++ .../jni/NativeBlockChainListener.java | 2 +- .../bitcoinj/jni/NativeFutureCallback.java | 2 +- .../jni/NativeKeyChainEventListener.java | 2 +- .../NativePaymentChannelHandlerFactory.java | 14 +++++++++++ ...ntChannelServerConnectionEventHandler.java | 14 +++++++++++ .../bitcoinj/jni/NativePeerEventListener.java | 2 +- .../jni/NativeScriptsChangeEventListener.java | 2 +- ...iveTransactionConfidenceEventListener.java | 2 +- .../NativeTransactionConfidenceListener.java | 2 +- .../jni/NativeWalletChangeEventListener.java | 2 +- ...ativeWalletCoinsReceivedEventListener.java | 2 +- .../NativeWalletCoinsSentEventListener.java | 2 +- .../jni/NativeWalletEventListener.java | 2 +- .../NativeWalletReorganizeEventListener.java | 2 +- .../java/org/bitcoinj/kits/package-info.java | 14 +++++++++++ .../java/org/bitcoinj/net/FilterMerger.java | 14 +++++++++++ .../net/discovery/PeerDiscoveryException.java | 2 +- .../org/bitcoinj/net/discovery/SeedPeers.java | 3 ++- .../bitcoinj/net/discovery/package-info.java | 14 +++++++++++ .../java/org/bitcoinj/net/package-info.java | 14 +++++++++++ .../org/bitcoinj/params/package-info.java | 14 +++++++++++ .../channels/PaymentChannelClientState.java | 1 - .../channels/PaymentChannelServerState.java | 2 -- .../channels/PaymentChannelV1ServerState.java | 1 - .../channels/PaymentChannelV2ClientState.java | 3 --- .../channels/PaymentChannelV2ServerState.java | 4 ---- .../channels/PaymentIncrementAck.java | 14 +++++++++++ .../StoredPaymentChannelClientStates.java | 2 -- .../protocols/channels/package-info.java | 14 +++++++++++ .../org/bitcoinj/protocols/package-info.java | 14 +++++++++++ .../protocols/payments/PaymentProtocol.java | 2 +- .../payments/PaymentProtocolException.java | 2 +- .../protocols/payments/PaymentSession.java | 2 +- .../protocols/payments/package-info.java | 14 +++++++++++ .../main/java/org/bitcoinj/script/Script.java | 2 +- .../org/bitcoinj/script/package-info.java | 14 +++++++++++ .../signers/CustomTransactionSigner.java | 3 ++- .../signers/LocalTransactionSigner.java | 3 ++- .../signers/MissingSigResolutionSigner.java | 3 ++- .../signers/StatelessTransactionSigner.java | 3 ++- .../bitcoinj/signers/TransactionSigner.java | 3 ++- .../org/bitcoinj/signers/package-info.java | 14 +++++++++++ .../java/org/bitcoinj/store/BlockStore.java | 2 +- .../bitcoinj/store/BlockStoreException.java | 2 +- .../store/ChainFileLockedException.java | 14 +++++++++++ .../store/DatabaseFullPrunedBlockStore.java | 1 + .../org/bitcoinj/store/LevelDBBlockStore.java | 14 +++++++++++ .../org/bitcoinj/store/MemoryBlockStore.java | 2 +- .../store/MySQLFullPrunedBlockStore.java | 1 + .../store/PostgresFullPrunedBlockStore.java | 1 + .../org/bitcoinj/store/SPVBlockStore.java | 2 +- .../store/UnreadableWalletException.java | 14 +++++++++++ .../store/WalletProtobufSerializer.java | 2 +- .../org/bitcoinj/store/WindowsMMapHack.java | 14 +++++++++++ .../java/org/bitcoinj/store/package-info.java | 14 +++++++++++ .../uri/OptionalFieldValidationException.java | 14 +++++++++++ .../uri/RequiredFieldValidationException.java | 14 +++++++++++ .../java/org/bitcoinj/uri/package-info.java | 14 +++++++++++ .../bitcoinj/utils/BaseTaggableObject.java | 14 +++++++++++ .../ContextPropagatingThreadFactory.java | 14 +++++++++++ .../bitcoinj/utils/DaemonThreadFactory.java | 14 +++++++++++ .../bitcoinj/utils/ExponentialBackoff.java | 2 +- .../main/java/org/bitcoinj/utils/Fiat.java | 2 +- .../bitcoinj/utils/ListenerRegistration.java | 2 +- .../org/bitcoinj/utils/TaggableObject.java | 14 +++++++++++ .../java/org/bitcoinj/utils/Threading.java | 2 +- .../java/org/bitcoinj/utils/package-info.java | 14 +++++++++++ .../wallet/AbstractKeyChainEventListener.java | 14 +++++++++++ .../wallet/AllRandomKeysRotating.java | 14 +++++++++++ .../wallet/AllowUnconfirmedCoinSelector.java | 14 +++++++++++ .../org/bitcoinj/wallet/BasicKeyChain.java | 2 +- .../org/bitcoinj/wallet/CoinSelection.java | 14 +++++++++++ .../org/bitcoinj/wallet/CoinSelector.java | 14 +++++++++++ .../org/bitcoinj/wallet/DecryptingKeyBag.java | 2 +- .../bitcoinj/wallet/DefaultCoinSelector.java | 15 +++++++++++- .../wallet/DefaultKeyChainFactory.java | 2 +- .../wallet/DeterministicKeyChain.java | 2 +- .../bitcoinj/wallet/DeterministicSeed.java | 2 +- ...DeterministicUpgradeRequiredException.java | 14 +++++++++++ .../DeterministicUpgradeRequiresPassword.java | 14 +++++++++++ .../bitcoinj/wallet/EncryptableKeyChain.java | 2 +- .../wallet/FilteringCoinSelector.java | 3 +-- .../main/java/org/bitcoinj/wallet/KeyBag.java | 2 +- .../java/org/bitcoinj/wallet/KeyChain.java | 2 +- .../wallet/KeyChainEventListener.java | 3 ++- .../org/bitcoinj/wallet/KeyChainFactory.java | 2 +- .../org/bitcoinj/wallet/KeyChainGroup.java | 3 +-- .../bitcoinj/wallet/KeyTimeCoinSelector.java | 2 +- .../org/bitcoinj/wallet/MarriedKeyChain.java | 3 +-- .../java/org/bitcoinj/wallet/RedeemData.java | 3 ++- .../java/org/bitcoinj/wallet/WalletFiles.java | 2 +- .../bitcoinj/wallet/WalletTransaction.java | 2 +- .../org/bitcoinj/wallet/package-info.java | 14 +++++++++++ .../java/org/bitcoinj/core/AddressTest.java | 2 +- .../bitcoinj/core/BitcoinSerializerTest.java | 2 +- .../org/bitcoinj/core/BlockChainTest.java | 4 +--- .../test/java/org/bitcoinj/core/CoinTest.java | 2 +- .../java/org/bitcoinj/core/ECKeyTest.java | 2 +- ...ilteredBlockAndPartialMerkleTreeTests.java | 2 +- .../bitcoinj/core/FullBlockTestGenerator.java | 14 +++++++++++ .../core/H2FullPrunedBlockChainTest.java | 14 +++++++++++ .../core/LevelDBFullPrunedBlockChainTest.java | 1 + .../core/MemoryFullPrunedBlockChainTest.java | 14 +++++++++++ .../core/MySQLFullPrunedBlockChainTest.java | 1 + .../org/bitcoinj/core/ParseByteCacheTest.java | 2 +- .../PostgresFullPrunedBlockChainTest.java | 14 +++++++++++ .../core/TransactionBroadcastTest.java | 2 +- .../bitcoinj/core/TransactionOutputTest.java | 14 +++++++++++ .../java/org/bitcoinj/core/UtilsTest.java | 2 +- .../java/org/bitcoinj/core/VarIntTest.java | 2 +- .../core/VersionedChecksummedBytesTest.java | 4 ++-- .../bitcoinj/core/WalletExtensionsTest.java | 14 +++++++++++ .../java/org/bitcoinj/core/WalletTest.java | 2 +- .../crypto/ChildKeyDerivationTest.java | 2 +- .../bitcoinj/crypto/KeyCrypterScryptTest.java | 3 ++- .../org/bitcoinj/crypto/X509UtilsTest.java | 2 +- .../bitcoinj/net/discovery/SeedPeersTest.java | 1 + .../channels/ChannelConnectionTest.java | 1 - .../protocols/channels/ChannelTestUtils.java | 14 +++++++++++ .../channels/PaymentChannelClientTest.java | 14 +++++++++++ .../channels/PaymentChannelServerTest.java | 14 +++++++++++ .../payments/PaymentProtocolTest.java | 2 +- .../payments/PaymentSessionTest.java | 2 +- .../org/bitcoinj/script/ScriptChunkTest.java | 2 +- .../bitcoinj/store/LevelDBBlockStoreTest.java | 14 +++++++++++ .../org/bitcoinj/store/SPVBlockStoreTest.java | 2 +- .../store/WalletProtobufSerializerTest.java | 2 +- .../org/bitcoinj/testing/FakeTxBuilder.java | 2 +- .../bitcoinj/testing/FooWalletExtension.java | 14 +++++++++++ .../testing/InboundMessageQueuer.java | 14 +++++++++++ .../testing/KeyChainTransactionSigner.java | 3 ++- .../testing/MockTransactionBroadcaster.java | 2 +- .../testing/NopTransactionSigner.java | 3 ++- .../java/org/bitcoinj/uri/BitcoinURITest.java | 1 - .../utils/BaseTaggableObjectTest.java | 14 +++++++++++ .../utils/ExponentialBackoffTest.java | 4 +--- .../java/org/bitcoinj/utils/FiatTest.java | 2 +- .../bitcoinj/wallet/BasicKeyChainTest.java | 2 +- .../wallet/DefaultCoinSelectorTest.java | 2 +- .../wallet/DeterministicKeyChainTest.java | 2 +- .../bitcoinj/wallet/KeyChainGroupTest.java | 2 +- .../examples/ExamplePaymentChannelServer.java | 2 -- .../bitcoinj/examples/GenerateLowSTests.java | 1 + .../java/org/bitcoinj/examples/LevelDB.java | 1 + .../org/bitcoinj/examples/LevelDbSizes.java | 1 + .../java/org/bitcoinj/tools/TestFeeLevel.java | 1 - .../src/main/java/wallettemplate/Main.java | 14 +++++++++++ .../java/wallettemplate/MainController.java | 14 +++++++++++ .../wallettemplate/SendMoneyController.java | 14 +++++++++++ .../WalletPasswordController.java | 14 +++++++++++ .../WalletSetPasswordController.java | 14 +++++++++++ .../WalletSettingsController.java | 14 +++++++++++ .../controls/BitcoinAddressValidator.java | 14 +++++++++++ .../controls/ClickableBitcoinAddress.java | 14 +++++++++++ .../controls/NotificationBarPane.java | 15 +++++++++++- .../utils/AlertWindowController.java | 14 +++++++++++ .../wallettemplate/utils/BitcoinUIModel.java | 15 +++++++++++- .../java/wallettemplate/utils/GuiUtils.java | 14 +++++++++++ .../utils/KeyDerivationTasks.java | 14 +++++++++++ .../utils/TextFieldValidator.java | 14 +++++++++++ .../utils/ThrottledRunLater.java | 2 +- .../java/wallettemplate/utils/WTUtils.java | 14 +++++++++++ .../utils/easing/EasingMode.java | 24 +++++++++++++++++++ 239 files changed, 1208 insertions(+), 178 deletions(-) diff --git a/core/src/main/java/org/bitcoin/NativeSecp256k1.java b/core/src/main/java/org/bitcoin/NativeSecp256k1.java index 65c93412f23..d7d2303f91f 100644 --- a/core/src/main/java/org/bitcoin/NativeSecp256k1.java +++ b/core/src/main/java/org/bitcoin/NativeSecp256k1.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/Address.java b/core/src/main/java/org/bitcoinj/core/Address.java index 6c2c3ffc015..2b9d6a12701 100644 --- a/core/src/main/java/org/bitcoinj/core/Address.java +++ b/core/src/main/java/org/bitcoinj/core/Address.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Giannis Dzegoutanis * Copyright 2015 Andreas Schildbach diff --git a/core/src/main/java/org/bitcoinj/core/Base58.java b/core/src/main/java/org/bitcoinj/core/Base58.java index 03b8cddd306..dc07b0236ed 100644 --- a/core/src/main/java/org/bitcoinj/core/Base58.java +++ b/core/src/main/java/org/bitcoinj/core/Base58.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java b/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java index 5f3ea0700f9..6f68e00c63b 100644 --- a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java +++ b/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/BlockChain.java b/core/src/main/java/org/bitcoinj/core/BlockChain.java index dfd7c45ca30..d80f7cab1be 100644 --- a/core/src/main/java/org/bitcoinj/core/BlockChain.java +++ b/core/src/main/java/org/bitcoinj/core/BlockChain.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/CheckpointManager.java b/core/src/main/java/org/bitcoinj/core/CheckpointManager.java index fd22a851bcf..c9d3628c61f 100644 --- a/core/src/main/java/org/bitcoinj/core/CheckpointManager.java +++ b/core/src/main/java/org/bitcoinj/core/CheckpointManager.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/ChildMessage.java b/core/src/main/java/org/bitcoinj/core/ChildMessage.java index 06ba88cd9d5..87576d311a6 100644 --- a/core/src/main/java/org/bitcoinj/core/ChildMessage.java +++ b/core/src/main/java/org/bitcoinj/core/ChildMessage.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/core/Coin.java b/core/src/main/java/org/bitcoinj/core/Coin.java index dd7884a7ea2..a1a22b4a353 100644 --- a/core/src/main/java/org/bitcoinj/core/Coin.java +++ b/core/src/main/java/org/bitcoinj/core/Coin.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/Context.java b/core/src/main/java/org/bitcoinj/core/Context.java index 3e32d76e8e9..b9bf4254e09 100644 --- a/core/src/main/java/org/bitcoinj/core/Context.java +++ b/core/src/main/java/org/bitcoinj/core/Context.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import org.bitcoinj.core.Wallet.SendRequest; diff --git a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java b/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java index 89d2d6e335e..7c9895c242a 100644 --- a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java +++ b/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2015 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java b/core/src/main/java/org/bitcoinj/core/FilteredBlock.java index b477c245c39..84def7e4d83 100644 --- a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java +++ b/core/src/main/java/org/bitcoinj/core/FilteredBlock.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Matt Corallo * Copyright 2015 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/InventoryItem.java b/core/src/main/java/org/bitcoinj/core/InventoryItem.java index 1524d0ec214..a505bc5c20f 100644 --- a/core/src/main/java/org/bitcoinj/core/InventoryItem.java +++ b/core/src/main/java/org/bitcoinj/core/InventoryItem.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/Monetary.java b/core/src/main/java/org/bitcoinj/core/Monetary.java index 26bf479e775..9f94ec21148 100644 --- a/core/src/main/java/org/bitcoinj/core/Monetary.java +++ b/core/src/main/java/org/bitcoinj/core/Monetary.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java b/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java index eeacc44aa35..832e1b75c93 100644 --- a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java +++ b/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 The Bitcoin Developers * Copyright 2012 Matt Corallo * Copyright 2015 Andreas Schildbach diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java index a512d8531ae..473952d58dc 100644 --- a/core/src/main/java/org/bitcoinj/core/Peer.java +++ b/core/src/main/java/org/bitcoinj/core/Peer.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/PeerException.java b/core/src/main/java/org/bitcoinj/core/PeerException.java index ac4ab5e358d..715448bce3e 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerException.java +++ b/core/src/main/java/org/bitcoinj/core/PeerException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java index 8a0c4c3dbcb..94e59097aeb 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerGroup.java +++ b/core/src/main/java/org/bitcoinj/core/PeerGroup.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/Ping.java b/core/src/main/java/org/bitcoinj/core/Ping.java index e2fe65682ad..fa4faa1fc7d 100644 --- a/core/src/main/java/org/bitcoinj/core/Ping.java +++ b/core/src/main/java/org/bitcoinj/core/Ping.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Noa Resare * Copyright 2015 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/Pong.java b/core/src/main/java/org/bitcoinj/core/Pong.java index dea5d805a82..eaffa3a8daf 100644 --- a/core/src/main/java/org/bitcoinj/core/Pong.java +++ b/core/src/main/java/org/bitcoinj/core/Pong.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Matt Corallo * Copyright 2015 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/ProtocolException.java b/core/src/main/java/org/bitcoinj/core/ProtocolException.java index 898c1bc8529..b4951343cc4 100644 --- a/core/src/main/java/org/bitcoinj/core/ProtocolException.java +++ b/core/src/main/java/org/bitcoinj/core/ProtocolException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/ScriptException.java b/core/src/main/java/org/bitcoinj/core/ScriptException.java index b578f0ed8e0..d72bd430a5b 100644 --- a/core/src/main/java/org/bitcoinj/core/ScriptException.java +++ b/core/src/main/java/org/bitcoinj/core/ScriptException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java b/core/src/main/java/org/bitcoinj/core/Sha256Hash.java index 700850bca00..1e741492e4a 100644 --- a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java +++ b/core/src/main/java/org/bitcoinj/core/Sha256Hash.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java index 966b680952b..6ab47110e52 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/bitcoinj/core/Transaction.java @@ -25,7 +25,6 @@ import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.wallet.WalletTransaction.Pool; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBag.java b/core/src/main/java/org/bitcoinj/core/TransactionBag.java index 305850d7bb8..6748ade7631 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionBag.java +++ b/core/src/main/java/org/bitcoinj/core/TransactionBag.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Giannis Dzegoutanis * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java b/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java index 51c50120fde..5c2cf754c02 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java +++ b/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java b/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java index 74d63c35f7e..d006795ed49 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java +++ b/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Matt Corallo. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/UTXO.java b/core/src/main/java/org/bitcoinj/core/UTXO.java index 427a6bfc879..5012bd00cac 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXO.java +++ b/core/src/main/java/org/bitcoinj/core/UTXO.java @@ -1,12 +1,12 @@ -/** +/* * Copyright 2012 Matt Corallo. - *

+ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/core/src/main/java/org/bitcoinj/core/UTXOProvider.java b/core/src/main/java/org/bitcoinj/core/UTXOProvider.java index 38225127bd0..aa7fdbaaf2f 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXOProvider.java +++ b/core/src/main/java/org/bitcoinj/core/UTXOProvider.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kalpesh Parmar. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/core/UTXOProviderException.java b/core/src/main/java/org/bitcoinj/core/UTXOProviderException.java index 71f97fbb7ea..64d9c81f085 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXOProviderException.java +++ b/core/src/main/java/org/bitcoinj/core/UTXOProviderException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kalpesh Parmar. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core; public class UTXOProviderException extends Exception { diff --git a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java b/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java index 1ab8c51b5fe..e6dd0214986 100644 --- a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java +++ b/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Steve Coughlan. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core; import java.io.ByteArrayOutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/Utils.java b/core/src/main/java/org/bitcoinj/core/Utils.java index 74c29f61a73..80c2c735690 100644 --- a/core/src/main/java/org/bitcoinj/core/Utils.java +++ b/core/src/main/java/org/bitcoinj/core/Utils.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/VarInt.java b/core/src/main/java/org/bitcoinj/core/VarInt.java index 8a2d629a403..7969ffa29ad 100644 --- a/core/src/main/java/org/bitcoinj/core/VarInt.java +++ b/core/src/main/java/org/bitcoinj/core/VarInt.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/VerificationException.java b/core/src/main/java/org/bitcoinj/core/VerificationException.java index 18c02fc3adc..14daabc38dd 100644 --- a/core/src/main/java/org/bitcoinj/core/VerificationException.java +++ b/core/src/main/java/org/bitcoinj/core/VerificationException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/VersionAck.java b/core/src/main/java/org/bitcoinj/core/VersionAck.java index 8413d9a3c2c..0dcfb05a53a 100644 --- a/core/src/main/java/org/bitcoinj/core/VersionAck.java +++ b/core/src/main/java/org/bitcoinj/core/VersionAck.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Noa Resare. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java b/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java index fec6481e7ea..38141490624 100644 --- a/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java +++ b/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java index 799c62d76e7..391edba32e2 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core.listeners; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java index aa35be32c6e..6e5aa5ba9c4 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java index 787534d7900..81595672c71 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java index c5ab70991c7..a8d9ee54aed 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractWalletEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractWalletEventListener.java index 41974cf2508..b167b416e68 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractWalletEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/AbstractWalletEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java b/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java index 85b9fc32258..a19a42b74fe 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core.listeners; /** diff --git a/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java index c4e7f379b1d..6edb2282b11 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java index 56f6ba854f3..434b0843434 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java b/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java index 24c1eb2700a..dfd8b1fd65b 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java index 4a8041aeaa1..2fbc1e0c11f 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java b/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java index 6c40554dd8f..178b3470329 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core.listeners; import org.bitcoinj.core.StoredBlock; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java b/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java index df0b11468c3..9ae94af20bd 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core.listeners; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java index 9fb3f4b3ea7..c41722038ca 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java index b05df14bd72..ed5e9d9014c 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java index 9063c221868..5d42cc4684d 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java index e67a57ac4d4..7565b2c8c23 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java index 23994825da2..45d6f24737b 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java index 732acb1c692..ff1256430b4 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java b/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java index c977cbc6d82..67c59bd36fc 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core.listeners; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ScriptsChangeEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/ScriptsChangeEventListener.java index 1c02d579c07..833832844cd 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/ScriptsChangeEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/ScriptsChangeEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java index 159e8a5390e..ea83a106fc8 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java b/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java index c8acaf3e834..c1b1865c7b3 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core.listeners; import org.bitcoinj.core.BlockChain; -import org.bitcoinj.core.ScriptException; import org.bitcoinj.core.Sha256Hash; import org.bitcoinj.core.StoredBlock; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/WalletChangeEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/WalletChangeEventListener.java index 16d56384f06..ae36312331b 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/WalletChangeEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/WalletChangeEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsReceivedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsReceivedEventListener.java index 721d7eec6ba..a7fe8325045 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsReceivedEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsReceivedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsSentEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsSentEventListener.java index 15187d9a02b..85625e40d5d 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsSentEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/WalletCoinsSentEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/WalletEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/WalletEventListener.java index 7ae0255ca1f..a51b58156eb 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/WalletEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/WalletEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/WalletReorganizeEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/WalletReorganizeEventListener.java index 6019bc8ff33..3436782c426 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/WalletReorganizeEventListener.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/WalletReorganizeEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ import org.bitcoinj.core.Wallet; - /** *

Implementors are called when the wallet is reorganized.

*/ diff --git a/core/src/main/java/org/bitcoinj/core/package-info.java b/core/src/main/java/org/bitcoinj/core/package-info.java index 2cc8abf80b2..d3d582240b9 100644 --- a/core/src/main/java/org/bitcoinj/core/package-info.java +++ b/core/src/main/java/org/bitcoinj/core/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * The core package contains classes for network messages like {@link org.bitcoinj.core.Block} and * {@link org.bitcoinj.core.Transaction}, peer connectivity via {@link org.bitcoinj.core.PeerGroup}, diff --git a/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java b/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java index 8a42e1c1127..1952036bab7 100644 --- a/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java +++ b/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Matija Mazi. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java b/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java index e250436cb81..7f8320e40dd 100644 --- a/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java +++ b/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.crypto; import org.bitcoinj.core.Utils; diff --git a/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java b/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java index 798bb944fb4..22c1fec3f7b 100644 --- a/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java +++ b/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/crypto/EncryptedData.java b/core/src/main/java/org/bitcoinj/crypto/EncryptedData.java index 54cdd3ff1af..9214e3a46f8 100644 --- a/core/src/main/java/org/bitcoinj/crypto/EncryptedData.java +++ b/core/src/main/java/org/bitcoinj/crypto/EncryptedData.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Jim Burton. * * Licensed under the MIT license (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.crypto; import com.google.common.base.Objects; diff --git a/core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java b/core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java index 0bde820836e..7fd930c11f4 100644 --- a/core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java +++ b/core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Matija Mazi. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java b/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java index 78018708947..8640617cf75 100644 --- a/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java +++ b/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Matija Mazi. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/crypto/HDUtils.java b/core/src/main/java/org/bitcoinj/crypto/HDUtils.java index 20328033dc2..fb9581c9fa5 100644 --- a/core/src/main/java/org/bitcoinj/crypto/HDUtils.java +++ b/core/src/main/java/org/bitcoinj/crypto/HDUtils.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Matija Mazi. * Copyright 2014 Giannis Dzegoutanis. * diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java b/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java index 3662c903441..2089e675a43 100644 --- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java +++ b/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Jim Burton. * * Licensed under the MIT license (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.crypto; import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java b/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java index e14acc5e466..e65a1deddce 100644 --- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java +++ b/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.crypto; /** diff --git a/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java b/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java index ae0a87f5013..8d2e9cce378 100644 --- a/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java +++ b/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.crypto; import org.spongycastle.math.ec.ECCurve; diff --git a/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java b/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java index 39238f03df2..a3542e8b043 100644 --- a/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java +++ b/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/crypto/X509Utils.java b/core/src/main/java/org/bitcoinj/crypto/X509Utils.java index ffc856f9852..074468f7ba2 100644 --- a/core/src/main/java/org/bitcoinj/crypto/X509Utils.java +++ b/core/src/main/java/org/bitcoinj/crypto/X509Utils.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 The bitcoinj authors. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/crypto/package-info.java b/core/src/main/java/org/bitcoinj/crypto/package-info.java index 9c5bc84eb85..f3b1447daae 100644 --- a/core/src/main/java/org/bitcoinj/crypto/package-info.java +++ b/core/src/main/java/org/bitcoinj/crypto/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * The crypto package contains classes that work with key derivation algorithms like scrypt (passwords to AES keys), * BIP 32 hierarchies (chains of keys from a root seed), X.509 utilities for the payment protocol and other general diff --git a/core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java b/core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java index 87efe56f38c..4ce13e205a1 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java b/core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java index 67a47354452..bcf9d4dbdad 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java index f2b9ec014e2..81377f06a84 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java index 88e394ac8e5..afee9c32c55 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java +++ b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.jni; import org.bitcoinj.protocols.channels.PaymentChannelServerListener; diff --git a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java index f4c1ecc3714..a706cc5ac64 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java +++ b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.jni; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java index 15c5a95eed3..f9b160b8310 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java index 5db2eb5b179..89f483650ed 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java index f67f5dd6df3..924f7fcb3d7 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java b/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java index d753d7b4d2c..af656d4a43c 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java index 831688abdc1..f496a8f5d4c 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java index 0f6cb0a23d9..10c343ac5e6 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java index 5c9cb4294ec..64fc63ba8a9 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java index 5a53e6ba80f..a2b674a578a 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java index a0f1e185312..fc0bf41ed3c 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/kits/package-info.java b/core/src/main/java/org/bitcoinj/kits/package-info.java index b29b5f353b1..efb678dd491 100644 --- a/core/src/main/java/org/bitcoinj/kits/package-info.java +++ b/core/src/main/java/org/bitcoinj/kits/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * High level wrapper APIs around the bitcoinj building blocks. WalletAppKit is suitable for many different types of * apps that require an SPV wallet. diff --git a/core/src/main/java/org/bitcoinj/net/FilterMerger.java b/core/src/main/java/org/bitcoinj/net/FilterMerger.java index ba68e07cc7c..53a718b3cd9 100644 --- a/core/src/main/java/org/bitcoinj/net/FilterMerger.java +++ b/core/src/main/java/org/bitcoinj/net/FilterMerger.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.net; import com.google.common.collect.Lists; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java b/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java index 711828cb431..585d19b5d83 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java b/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java index f6f030bda13..b44b4ee7e29 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Micheal Swiggs * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.net.discovery; import org.bitcoinj.core.NetworkParameters; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java b/core/src/main/java/org/bitcoinj/net/discovery/package-info.java index 2c8f3176f53..d54d6e3e5bb 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Classes that know how to discover peers in the P2P network using DNS, IRC or DNS via Tor (orchid). */ diff --git a/core/src/main/java/org/bitcoinj/net/package-info.java b/core/src/main/java/org/bitcoinj/net/package-info.java index 8e4a9f43d1c..48249a61180 100644 --- a/core/src/main/java/org/bitcoinj/net/package-info.java +++ b/core/src/main/java/org/bitcoinj/net/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Classes handling low level network management using either NIO (async io) or older style blocking sockets (useful for * using SOCKS proxies, Tor, SSL etc). The code in this package implements a simple network abstraction a little like diff --git a/core/src/main/java/org/bitcoinj/params/package-info.java b/core/src/main/java/org/bitcoinj/params/package-info.java index 69d263ff01d..a0e1697c549 100644 --- a/core/src/main/java/org/bitcoinj/params/package-info.java +++ b/core/src/main/java/org/bitcoinj/params/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Network parameters encapsulate some of the differences between different Bitcoin networks such as the main * network, the testnet, regtest mode, unit testing params and so on. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java index 01a4f36117d..63680531ba1 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java @@ -23,7 +23,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.bitcoinj.core.*; -import org.bitcoinj.core.listeners.AbstractWalletEventListener; import org.bitcoinj.crypto.TransactionSignature; import org.bitcoinj.script.Script; import org.bitcoinj.utils.Threading; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java index f07717f64f8..d64afaed401 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java @@ -17,7 +17,6 @@ package org.bitcoinj.protocols.channels; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -26,7 +25,6 @@ import org.bitcoinj.core.*; import org.bitcoinj.crypto.TransactionSignature; import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java index aad85bf9935..3a5492aaef8 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; import java.util.Locale; import static com.google.common.base.Preconditions.*; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java index 685cc19a70c..d51bdd29b31 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java @@ -17,7 +17,6 @@ package org.bitcoinj.protocols.channels; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import org.bitcoinj.core.*; @@ -31,8 +30,6 @@ import javax.annotation.Nullable; import java.math.BigInteger; -import java.util.List; - import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java index 91fb016ae4b..3f7b3c10c03 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java @@ -33,10 +33,6 @@ import java.util.Arrays; import java.util.Locale; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - /** * Version 2 of the payment channel state machine - uses CLTV opcode transactions * instead of multisig transactions. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java index 027883265ec..40da762e643 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.protocols.channels; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java b/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java index 3e872282cdc..f8bfcebd939 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java @@ -19,8 +19,6 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import org.bitcoinj.core.*; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; import org.bitcoinj.utils.Threading; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java b/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java index df339ad0e03..458f16c40f3 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Micropayment channels allow for rapid tiny payments to be made to a third party once a channel has been set up, using * some of the advanced features of the Bitcoin protocol. diff --git a/core/src/main/java/org/bitcoinj/protocols/package-info.java b/core/src/main/java/org/bitcoinj/protocols/package-info.java index 19577a05ff7..3d1caf59aa3 100644 --- a/core/src/main/java/org/bitcoinj/protocols/package-info.java +++ b/core/src/main/java/org/bitcoinj/protocols/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * High level protocols that build on top of Bitcoin go here: we have the payment protocol for sending transactions * from sender to receiver with metadata, and a micropayment channels implementation. diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java index ac408d4afbe..3a77baf70a5 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java +++ b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java index 01a2a025005..63f34897a0c 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java +++ b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java index 107652aae61..f767eefa128 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java +++ b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java b/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java index 2c3f9ba0345..0d6de7187dc 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java +++ b/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * The BIP70 payment protocol wraps Bitcoin transactions and adds various useful features like memos, refund addresses * and authentication. diff --git a/core/src/main/java/org/bitcoinj/script/Script.java b/core/src/main/java/org/bitcoinj/script/Script.java index 1380e7d7666..9ddb45ca741 100644 --- a/core/src/main/java/org/bitcoinj/script/Script.java +++ b/core/src/main/java/org/bitcoinj/script/Script.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2012 Matt Corallo. * Copyright 2014 Andreas Schildbach diff --git a/core/src/main/java/org/bitcoinj/script/package-info.java b/core/src/main/java/org/bitcoinj/script/package-info.java index 7dc8381a17d..8198e99ce2a 100644 --- a/core/src/main/java/org/bitcoinj/script/package-info.java +++ b/core/src/main/java/org/bitcoinj/script/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Classes for working with and executing Bitcoin script programs, as embedded in inputs and outputs. */ diff --git a/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java index 1e35fed2e28..28f705c6c34 100644 --- a/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java +++ b/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.signers; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java index 4958f9fd6be..ee02a31a645 100644 --- a/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java +++ b/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.signers; import java.util.EnumSet; diff --git a/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java b/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java index 1e529cff539..1a67645b606 100644 --- a/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java +++ b/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.signers; import org.bitcoinj.core.ECKey; diff --git a/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java index 29932607688..393804bf0bc 100644 --- a/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java +++ b/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.signers; /** diff --git a/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java index 1662850d61d..98705e654a3 100644 --- a/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java +++ b/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.signers; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/org/bitcoinj/signers/package-info.java b/core/src/main/java/org/bitcoinj/signers/package-info.java index 2d3d5601538..49f0680b05c 100644 --- a/core/src/main/java/org/bitcoinj/signers/package-info.java +++ b/core/src/main/java/org/bitcoinj/signers/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Transaction signers know how to calculate signatures over transactions in different contexts, for example, using * local private keys or fetching them from remote servers. The {@link org.bitcoinj.core.Wallet} class uses these diff --git a/core/src/main/java/org/bitcoinj/store/BlockStore.java b/core/src/main/java/org/bitcoinj/store/BlockStore.java index 0709672becd..188ebb7b33e 100644 --- a/core/src/main/java/org/bitcoinj/store/BlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/BlockStore.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/store/BlockStoreException.java b/core/src/main/java/org/bitcoinj/store/BlockStoreException.java index 413db309de6..dc28f2540a2 100644 --- a/core/src/main/java/org/bitcoinj/store/BlockStoreException.java +++ b/core/src/main/java/org/bitcoinj/store/BlockStoreException.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java b/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java index c7856b85bc2..7d7cf0721a1 100644 --- a/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java +++ b/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.store; /** diff --git a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java index 3c79dc3c137..9e9f9e2ab88 100644 --- a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.store; import com.google.common.collect.Lists; diff --git a/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java b/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java index 219bf12566a..90ff4089901 100644 --- a/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.store; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java b/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java index ca531040ecd..eb2be66ea0a 100644 --- a/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java index 95c2689fb93..03244255736 100644 --- a/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.store; import org.bitcoinj.core.NetworkParameters; diff --git a/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java index 0b9563538e7..a08283bfc8c 100644 --- a/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.store; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java index 0b2e393bfb6..8a3427780c8 100644 --- a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/store/UnreadableWalletException.java b/core/src/main/java/org/bitcoinj/store/UnreadableWalletException.java index 1a8c4e88b4e..a7bb58af76d 100644 --- a/core/src/main/java/org/bitcoinj/store/UnreadableWalletException.java +++ b/core/src/main/java/org/bitcoinj/store/UnreadableWalletException.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.store; /** diff --git a/core/src/main/java/org/bitcoinj/store/WalletProtobufSerializer.java b/core/src/main/java/org/bitcoinj/store/WalletProtobufSerializer.java index 8573782f82b..fd95917e3cb 100644 --- a/core/src/main/java/org/bitcoinj/store/WalletProtobufSerializer.java +++ b/core/src/main/java/org/bitcoinj/store/WalletProtobufSerializer.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java b/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java index d78aee5825e..035d4f21de0 100644 --- a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java +++ b/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.store; import sun.misc.*; diff --git a/core/src/main/java/org/bitcoinj/store/package-info.java b/core/src/main/java/org/bitcoinj/store/package-info.java index b8783471fca..929cf916171 100644 --- a/core/src/main/java/org/bitcoinj/store/package-info.java +++ b/core/src/main/java/org/bitcoinj/store/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Block stores persist blockchain data downloaded from remote peers. There is an SPV block store which preserves a ring * buffer of headers on disk and is suitable for lightweight user wallets, a store that's backed by Postgres and which diff --git a/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java b/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java index d270a166248..fbac47c6ec8 100644 --- a/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java +++ b/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.uri; /** diff --git a/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java b/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java index 98300925279..5b0df64911d 100644 --- a/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java +++ b/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.uri; /** diff --git a/core/src/main/java/org/bitcoinj/uri/package-info.java b/core/src/main/java/org/bitcoinj/uri/package-info.java index a9e8faa715c..b1fc1857f49 100644 --- a/core/src/main/java/org/bitcoinj/uri/package-info.java +++ b/core/src/main/java/org/bitcoinj/uri/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Parsing and handling of bitcoin: textual URIs as found in qr codes and web links. */ diff --git a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java b/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java index badf9a25c1f..14f2814aadd 100644 --- a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java +++ b/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.utils; import com.google.common.collect.Maps; diff --git a/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java b/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java index 556d306de20..ca0cb761f57 100644 --- a/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java +++ b/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.utils; import com.google.common.base.*; diff --git a/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java b/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java index 254feccd710..1f3d9d28e79 100644 --- a/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java +++ b/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.utils; import javax.annotation.Nonnull; diff --git a/core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java b/core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java index 46ae2ff2014..35927c831cc 100644 --- a/core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java +++ b/core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/utils/Fiat.java b/core/src/main/java/org/bitcoinj/utils/Fiat.java index ec8b3b60d5c..e7c9165cc0e 100644 --- a/core/src/main/java/org/bitcoinj/utils/Fiat.java +++ b/core/src/main/java/org/bitcoinj/utils/Fiat.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java b/core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java index 2c7895ac608..f98e26f6593 100644 --- a/core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java +++ b/core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/utils/TaggableObject.java b/core/src/main/java/org/bitcoinj/utils/TaggableObject.java index 65469fa7326..60c74cde6e1 100644 --- a/core/src/main/java/org/bitcoinj/utils/TaggableObject.java +++ b/core/src/main/java/org/bitcoinj/utils/TaggableObject.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.utils; import com.google.protobuf.ByteString; diff --git a/core/src/main/java/org/bitcoinj/utils/Threading.java b/core/src/main/java/org/bitcoinj/utils/Threading.java index b526468c92f..bbbdbdfd983 100644 --- a/core/src/main/java/org/bitcoinj/utils/Threading.java +++ b/core/src/main/java/org/bitcoinj/utils/Threading.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/utils/package-info.java b/core/src/main/java/org/bitcoinj/utils/package-info.java index 756151a4cc2..fe2cc0017d9 100644 --- a/core/src/main/java/org/bitcoinj/utils/package-info.java +++ b/core/src/main/java/org/bitcoinj/utils/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Formatting monetary amounts, representing exchange rates, a program for loading Bitcoin Core saved block files, * a class to control how bitcoinj uses threads and misc other utility classes that don't fit anywhere else. diff --git a/core/src/main/java/org/bitcoinj/wallet/AbstractKeyChainEventListener.java b/core/src/main/java/org/bitcoinj/wallet/AbstractKeyChainEventListener.java index 9880271a5dc..27b81ad9a1c 100644 --- a/core/src/main/java/org/bitcoinj/wallet/AbstractKeyChainEventListener.java +++ b/core/src/main/java/org/bitcoinj/wallet/AbstractKeyChainEventListener.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; import org.bitcoinj.core.ECKey; diff --git a/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java b/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java index b7a60acedb8..5624ef83586 100644 --- a/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java +++ b/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; /** diff --git a/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java index 054ea75ce18..1d0528350dc 100644 --- a/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java +++ b/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java index 7f54f42fbd6..9fd44b5a833 100644 --- a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java b/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java index d9e41c4ab88..758402109fd 100644 --- a/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java +++ b/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java index b62d67eaac5..e656416a230 100644 --- a/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java +++ b/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java b/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java index c82792e81b0..b9f1e46f70f 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java +++ b/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 The bitcoinj authors. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java index 6c5234ebbcf..e2144a2fa22 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java +++ b/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; import org.bitcoinj.core.Coin; @@ -5,7 +19,6 @@ import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionConfidence; import org.bitcoinj.core.TransactionOutput; -import org.bitcoinj.params.RegTestParams; import com.google.common.annotations.VisibleForTesting; import java.math.BigInteger; diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java b/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java index f09f79c261f..6a4022fd230 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java +++ b/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 devrandom * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java index 25a003b8b71..bd99e1d90f9 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 The bitcoinj developers. * Copyright 2015 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java index b6520cb6322..208a4d375c7 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java index fd8d5bf8b9b..dcd5e75e66c 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; /** diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java index 0199b20bab1..4210e6b8337 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.wallet; /** diff --git a/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java index 0a178100b5b..9b0dcc68ea4 100644 --- a/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java index a500b8398de..fb142dbee50 100644 --- a/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java +++ b/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 the bitcoinj authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.bitcoinj.wallet; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java b/core/src/main/java/org/bitcoinj/wallet/KeyBag.java index bb8b61262ef..684f133085c 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyBag.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 The bitcoinj authors. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChain.java b/core/src/main/java/org/bitcoinj/wallet/KeyChain.java index 85e50379089..bcb88031c79 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChain.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainEventListener.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainEventListener.java index ba50ccec705..88f77c54dde 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainEventListener.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainEventListener.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.wallet; import org.bitcoinj.core.ECKey; diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java index 7975fa82e9d..906b9d7226b 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 devrandom * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java index e2ac6ba65c7..7b47376a4ee 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Mike Hearn * Copyright 2014 Andreas Schildbach * @@ -17,7 +17,6 @@ package org.bitcoinj.wallet; -import com.google.common.base.*; import com.google.common.collect.*; import com.google.protobuf.*; import org.bitcoinj.core.*; diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java index cc25b160b26..210ec71b7ad 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java index 91fa2c22c30..5499b938162 100644 --- a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 The bitcoinj developers. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +32,6 @@ import java.security.SecureRandom; import java.util.LinkedHashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/wallet/RedeemData.java b/core/src/main/java/org/bitcoinj/wallet/RedeemData.java index f07d4bb8833..2f8e8cc11b2 100644 --- a/core/src/main/java/org/bitcoinj/wallet/RedeemData.java +++ b/core/src/main/java/org/bitcoinj/wallet/RedeemData.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.wallet; import org.bitcoinj.core.ECKey; diff --git a/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java b/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java index f20a43f5623..13ea5e90357 100644 --- a/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java +++ b/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java b/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java index 9e8aa31e8bf..b179cd7cc6c 100644 --- a/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java +++ b/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/main/java/org/bitcoinj/wallet/package-info.java b/core/src/main/java/org/bitcoinj/wallet/package-info.java index fe8026651a1..821fcd76c14 100644 --- a/core/src/main/java/org/bitcoinj/wallet/package-info.java +++ b/core/src/main/java/org/bitcoinj/wallet/package-info.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Classes that support the {@link org.bitcoinj.core.Wallet}, which knows how to find and save transactions relevant to * a set of keys or scripts, calculate balances, and spend money: the wallet has many features and can be extended diff --git a/core/src/test/java/org/bitcoinj/core/AddressTest.java b/core/src/test/java/org/bitcoinj/core/AddressTest.java index 5f6447a4dc7..d758e9b9c54 100644 --- a/core/src/test/java/org/bitcoinj/core/AddressTest.java +++ b/core/src/test/java/org/bitcoinj/core/AddressTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java b/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java index 631514c20a8..c43cbac6633 100644 --- a/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java +++ b/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Noa Resare * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/BlockChainTest.java b/core/src/test/java/org/bitcoinj/core/BlockChainTest.java index 51b1373fa58..2ede98437a7 100644 --- a/core/src/test/java/org/bitcoinj/core/BlockChainTest.java +++ b/core/src/test/java/org/bitcoinj/core/BlockChainTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * @@ -27,7 +27,6 @@ import org.bitcoinj.utils.BriefLogFormatter; import com.google.common.util.concurrent.ListenableFuture; import org.junit.rules.ExpectedException; -import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -38,7 +37,6 @@ import java.util.Locale; import static org.bitcoinj.core.Coin.*; -import org.bitcoinj.store.BlockStoreException; import static org.bitcoinj.testing.FakeTxBuilder.createFakeBlock; import static org.bitcoinj.testing.FakeTxBuilder.createFakeTx; import static org.junit.Assert.*; diff --git a/core/src/test/java/org/bitcoinj/core/CoinTest.java b/core/src/test/java/org/bitcoinj/core/CoinTest.java index 4230c8fd18b..a741caf46ad 100644 --- a/core/src/test/java/org/bitcoinj/core/CoinTest.java +++ b/core/src/test/java/org/bitcoinj/core/CoinTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/core/ECKeyTest.java b/core/src/test/java/org/bitcoinj/core/ECKeyTest.java index 1792da20af7..ed1fe56f14f 100644 --- a/core/src/test/java/org/bitcoinj/core/ECKeyTest.java +++ b/core/src/test/java/org/bitcoinj/core/ECKeyTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java b/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java index 43ea5446478..d78b8f175d2 100644 --- a/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java +++ b/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Matt Corallo * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java b/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java index 742bee75bf5..08481e13b5c 100644 --- a/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java +++ b/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import com.google.common.collect.ImmutableList; diff --git a/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java index d47ad4af50f..1c2301d03c5 100644 --- a/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java +++ b/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import org.bitcoinj.store.BlockStoreException; diff --git a/core/src/test/java/org/bitcoinj/core/LevelDBFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/LevelDBFullPrunedBlockChainTest.java index ee092e322c5..12c2788d63c 100644 --- a/core/src/test/java/org/bitcoinj/core/LevelDBFullPrunedBlockChainTest.java +++ b/core/src/test/java/org/bitcoinj/core/LevelDBFullPrunedBlockChainTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core; import org.bitcoinj.store.BlockStoreException; diff --git a/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java index dc0fe8daf3f..68f3d55c313 100644 --- a/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java +++ b/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import org.bitcoinj.store.BlockStoreException; diff --git a/core/src/test/java/org/bitcoinj/core/MySQLFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/MySQLFullPrunedBlockChainTest.java index cf37a33d1b9..e26ddcb14b5 100644 --- a/core/src/test/java/org/bitcoinj/core/MySQLFullPrunedBlockChainTest.java +++ b/core/src/test/java/org/bitcoinj/core/MySQLFullPrunedBlockChainTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.core; import org.bitcoinj.store.BlockStoreException; diff --git a/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java b/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java index dfbacc10b03..ad405be0c19 100644 --- a/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java +++ b/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Steve Coughlan. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java index 6961122a252..57b448b9d17 100644 --- a/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java +++ b/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import org.bitcoinj.store.BlockStoreException; diff --git a/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java b/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java index bac2bd4ea85..37513346c9a 100644 --- a/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java +++ b/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java b/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java index 5a7ace5e2d4..4c2f7554b55 100644 --- a/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java +++ b/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import com.google.common.collect.ImmutableList; diff --git a/core/src/test/java/org/bitcoinj/core/UtilsTest.java b/core/src/test/java/org/bitcoinj/core/UtilsTest.java index 5c7f8d50ef2..b3171cba20f 100644 --- a/core/src/test/java/org/bitcoinj/core/UtilsTest.java +++ b/core/src/test/java/org/bitcoinj/core/UtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Thilo Planz * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/core/VarIntTest.java b/core/src/test/java/org/bitcoinj/core/VarIntTest.java index b48b67c27c0..8c4e91e7434 100644 --- a/core/src/test/java/org/bitcoinj/core/VarIntTest.java +++ b/core/src/test/java/org/bitcoinj/core/VarIntTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java b/core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java index 4530eeefb21..702527e623c 100644 --- a/core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java +++ b/core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java @@ -1,5 +1,5 @@ -/** - * Copyright 2014 BitcoinJ Project +/* + * Copyright 2014 bitcoinj project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/src/test/java/org/bitcoinj/core/WalletExtensionsTest.java b/core/src/test/java/org/bitcoinj/core/WalletExtensionsTest.java index 7253e1ffd15..af334528519 100644 --- a/core/src/test/java/org/bitcoinj/core/WalletExtensionsTest.java +++ b/core/src/test/java/org/bitcoinj/core/WalletExtensionsTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.core; import org.bitcoinj.testing.FooWalletExtension; diff --git a/core/src/test/java/org/bitcoinj/core/WalletTest.java b/core/src/test/java/org/bitcoinj/core/WalletTest.java index d73e9952e9d..a5e095c26b5 100644 --- a/core/src/test/java/org/bitcoinj/core/WalletTest.java +++ b/core/src/test/java/org/bitcoinj/core/WalletTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java b/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java index 8809a76d8f7..95419356f6e 100644 --- a/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java +++ b/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Matija Mazi. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java b/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java index a77811eb645..8971025fa68 100644 --- a/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java +++ b/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Jim Burton. * Copyright 2014 Andreas Schildbach * @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.crypto; import org.bitcoinj.core.Utils; diff --git a/core/src/test/java/org/bitcoinj/crypto/X509UtilsTest.java b/core/src/test/java/org/bitcoinj/crypto/X509UtilsTest.java index 195ee601f11..782311d1767 100644 --- a/core/src/test/java/org/bitcoinj/crypto/X509UtilsTest.java +++ b/core/src/test/java/org/bitcoinj/crypto/X509UtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java b/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java index 2c63e2df658..626a354766b 100644 --- a/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java +++ b/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.net.discovery; import org.bitcoinj.params.MainNetParams; diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java index c350399a0e1..5912364b413 100644 --- a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java +++ b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java @@ -41,7 +41,6 @@ import java.net.SocketAddress; import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java index 019b3b1210c..af59fb72569 100644 --- a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java +++ b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.protocols.channels; import org.bitcoinj.core.Coin; diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java index dba6a177523..20c35329f7d 100644 --- a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java +++ b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.protocols.channels; import org.bitcoinj.core.*; diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java index c94f74112ac..74c464c2bef 100644 --- a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java +++ b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.protocols.channels; import org.bitcoinj.core.Coin; diff --git a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java index a75676b4aeb..f7c805fce6b 100644 --- a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java +++ b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java index dc6a3a1d761..41d5de3affc 100644 --- a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java +++ b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java b/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java index 3183ad703ed..7ba2ea34d92 100644 --- a/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java +++ b/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java b/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java index 8d203c1a59f..1d5ffbbfffc 100644 --- a/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java +++ b/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.store; import org.bitcoinj.core.*; diff --git a/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java b/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java index baacc82f724..01e20725850 100644 --- a/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java +++ b/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java b/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java index d7f35708c41..88eca3c597d 100644 --- a/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java +++ b/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012 Google Inc. * Copyright 2014 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java b/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java index 238c50a1021..8bb1ff72228 100644 --- a/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java +++ b/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2011 Google Inc. * Copyright 2016 Andreas Schildbach * diff --git a/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java b/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java index f56e082ce6c..70459b3b877 100644 --- a/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java +++ b/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.testing; import org.bitcoinj.core.Wallet; diff --git a/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java b/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java index 50b492cdd41..d286639a758 100644 --- a/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java +++ b/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.testing; import org.bitcoinj.core.*; diff --git a/core/src/test/java/org/bitcoinj/testing/KeyChainTransactionSigner.java b/core/src/test/java/org/bitcoinj/testing/KeyChainTransactionSigner.java index e789fc9b469..cc0538e79d4 100644 --- a/core/src/test/java/org/bitcoinj/testing/KeyChainTransactionSigner.java +++ b/core/src/test/java/org/bitcoinj/testing/KeyChainTransactionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.testing; import org.bitcoinj.core.Sha256Hash; diff --git a/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java b/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java index 77dd7ab7592..79fec0c7292 100644 --- a/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java +++ b/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java b/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java index ae17e923898..e5d016dda41 100644 --- a/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java +++ b/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Kosta Korenkov * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.testing; import org.bitcoinj.signers.TransactionSigner; diff --git a/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java b/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java index c0f6caf162b..bd1e31d8fa5 100644 --- a/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java +++ b/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java @@ -12,7 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ package org.bitcoinj.uri; diff --git a/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java b/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java index 2447f0383ef..1705ea68b76 100644 --- a/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java +++ b/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.bitcoinj.utils; import com.google.protobuf.ByteString; diff --git a/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java b/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java index 841dd271939..5add9cad36f 100644 --- a/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java +++ b/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,8 +25,6 @@ import static org.junit.Assert.*; -/** - */ public class ExponentialBackoffTest { private ExponentialBackoff.Params params; private ExponentialBackoff backoff; diff --git a/core/src/test/java/org/bitcoinj/utils/FiatTest.java b/core/src/test/java/org/bitcoinj/utils/FiatTest.java index fdcbf60be49..8b89a9c95c4 100644 --- a/core/src/test/java/org/bitcoinj/utils/FiatTest.java +++ b/core/src/test/java/org/bitcoinj/utils/FiatTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Andreas Schildbach * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java b/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java index f71f3a23e48..c10cfd5450d 100644 --- a/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java +++ b/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java b/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java index e5c4763fe09..20d651966a2 100644 --- a/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java +++ b/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java b/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java index 5277dbc97cc..715f7f1998b 100644 --- a/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java +++ b/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java b/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java index 3218a0ea038..4fe1b318ec4 100644 --- a/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java +++ b/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014 Mike Hearn * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelServer.java b/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelServer.java index 00631574461..ceb6c509872 100644 --- a/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelServer.java +++ b/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelServer.java @@ -26,9 +26,7 @@ import org.bitcoinj.core.VerificationException; import org.bitcoinj.core.WalletExtension; import org.bitcoinj.kits.WalletAppKit; -import org.bitcoinj.params.MainNetParams; import org.bitcoinj.params.RegTestParams; -import org.bitcoinj.params.TestNet3Params; import org.bitcoinj.protocols.channels.*; import org.bitcoinj.utils.BriefLogFormatter; import com.google.common.collect.ImmutableList; diff --git a/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java b/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java index 3ad8c52c186..fdbfb5d8bbf 100644 --- a/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java +++ b/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.examples; import java.io.IOException; diff --git a/examples/src/main/java/org/bitcoinj/examples/LevelDB.java b/examples/src/main/java/org/bitcoinj/examples/LevelDB.java index 56093aacbbd..0242e26bb26 100644 --- a/examples/src/main/java/org/bitcoinj/examples/LevelDB.java +++ b/examples/src/main/java/org/bitcoinj/examples/LevelDB.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.examples; import java.net.InetAddress; diff --git a/examples/src/main/java/org/bitcoinj/examples/LevelDbSizes.java b/examples/src/main/java/org/bitcoinj/examples/LevelDbSizes.java index ce27693f1fe..503bff5ea59 100644 --- a/examples/src/main/java/org/bitcoinj/examples/LevelDbSizes.java +++ b/examples/src/main/java/org/bitcoinj/examples/LevelDbSizes.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.bitcoinj.examples; import static org.fusesource.leveldbjni.JniDBFactory.*; diff --git a/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java b/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java index b3349064bb0..8494e948a9f 100644 --- a/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java +++ b/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java @@ -22,7 +22,6 @@ import org.bitcoinj.utils.BriefLogFormatter; import java.io.File; -import java.util.Set; /** * A program that sends a transaction with the specified fee and measures how long it takes to confirm. diff --git a/wallettemplate/src/main/java/wallettemplate/Main.java b/wallettemplate/src/main/java/wallettemplate/Main.java index a760f380735..6c62d3db0b2 100644 --- a/wallettemplate/src/main/java/wallettemplate/Main.java +++ b/wallettemplate/src/main/java/wallettemplate/Main.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate; import com.google.common.util.concurrent.*; diff --git a/wallettemplate/src/main/java/wallettemplate/MainController.java b/wallettemplate/src/main/java/wallettemplate/MainController.java index 074944aa31b..325c72f0cd7 100644 --- a/wallettemplate/src/main/java/wallettemplate/MainController.java +++ b/wallettemplate/src/main/java/wallettemplate/MainController.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate; import org.bitcoinj.core.listeners.DownloadProgressTracker; diff --git a/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java b/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java index 71f7bb76483..8748a2b3389 100644 --- a/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java +++ b/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate; import javafx.scene.layout.HBox; diff --git a/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java b/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java index 396354565c8..745264e47e0 100644 --- a/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java +++ b/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate; import javafx.application.Platform; diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java b/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java index 6374c506c52..ec91d3dfe31 100644 --- a/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java +++ b/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate; import com.google.protobuf.*; diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java index c0cab4bd923..9389e33191a 100644 --- a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java +++ b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate; import org.bitcoinj.core.Utils; diff --git a/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java b/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java index 230318ba69f..a48d6dba03d 100644 --- a/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java +++ b/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.controls; import org.bitcoinj.core.Address; diff --git a/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java b/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java index c0e5b702473..7506efc8276 100644 --- a/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java +++ b/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.controls; import org.bitcoinj.core.Address; diff --git a/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java b/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java index 73a347bf560..f523eab2e86 100644 --- a/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java +++ b/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java @@ -1,5 +1,18 @@ -package wallettemplate.controls; +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package wallettemplate.controls; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java b/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java index 4cdee35e09f..0ae1c40a6bd 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.utils; import javafx.scene.control.Button; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java b/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java index 83d7a41b2b5..62151594cea 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java @@ -1,6 +1,19 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.utils; -import org.bitcoinj.core.listeners.AbstractWalletEventListener; import org.bitcoinj.core.listeners.DownloadProgressTracker; import org.bitcoinj.core.*; import javafx.application.Platform; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java b/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java index 0cad5b6854a..cd9037c6db6 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.utils; import com.google.common.base.Throwables; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java b/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java index c6aa3bd0bc5..b4dd0612da9 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.utils; import org.bitcoinj.crypto.KeyCrypterScrypt; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java b/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java index 28798c4bf64..8b9385ac388 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.utils; import javafx.beans.property.BooleanProperty; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java b/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java index cae0bcd2624..6a7950c4588 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java b/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java index 3f747704138..fe10dbb3195 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java @@ -1,3 +1,17 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package wallettemplate.utils; import org.slf4j.Logger; diff --git a/wallettemplate/src/main/java/wallettemplate/utils/easing/EasingMode.java b/wallettemplate/src/main/java/wallettemplate/utils/easing/EasingMode.java index 46b29bbe12a..01486d13793 100644 --- a/wallettemplate/src/main/java/wallettemplate/utils/easing/EasingMode.java +++ b/wallettemplate/src/main/java/wallettemplate/utils/easing/EasingMode.java @@ -1,3 +1,27 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013, Christian Schudt + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + package wallettemplate.utils.easing; /**