Harmonize license headers.

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");

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

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");

core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *

core/src/main/java/org/bitcoinj/core/BlockChain.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *

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");

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;

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");

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;

core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2015 Andreas Schildbach
  *

core/src/main/java/org/bitcoinj/core/FilteredBlock.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2012 Matt Corallo
  * Copyright 2015 Andreas Schildbach
  *

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");

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");

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

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");

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");

core/src/main/java/org/bitcoinj/core/PeerGroup.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2013 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *

core/src/main/java/org/bitcoinj/core/Ping.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Noa Resare
  * Copyright 2015 Andreas Schildbach
  *

core/src/main/java/org/bitcoinj/core/Pong.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2012 Matt Corallo
  * Copyright 2015 Andreas Schildbach
  *

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");

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");

core/src/main/java/org/bitcoinj/core/Sha256Hash.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *

core/src/main/java/org/bitcoinj/core/Transaction.java

@@ -25,7 +25,6 @@ import org.bitcoinj.script.ScriptOpCodes;
 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;

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");

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");

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");

core/src/main/java/org/bitcoinj/core/UTXO.java

@@ -1,12 +1,12 @@
-/**
+/*
  * Copyright 2012 Matt Corallo.
- * <p/>
+ *
  * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *    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.

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;

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 {

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;

core/src/main/java/org/bitcoinj/core/Utils.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *

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");

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");

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");

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");

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.*;

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");

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");

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");

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");

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;
 
 /**

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");

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");

core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *

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");

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;

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.*;

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");

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");

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");

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");

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");

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");

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;

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");

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");

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;

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");

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");

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");

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");

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 @@ package org.bitcoinj.core.listeners;
 
 import org.bitcoinj.core.Wallet;
 
-
 /**
  * <p>Implementors are called when the wallet is reorganized.</p>
  */

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},

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");

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;

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");

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;

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");

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");

core/src/main/java/org/bitcoinj/crypto/HDUtils.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2013 Matija Mazi.
  * Copyright 2014 Giannis Dzegoutanis.
  *

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;

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;
 
 /**

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;

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");

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");

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

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");

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");

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");

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;

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.*;

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");

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");

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");

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");

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");

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");

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");

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");

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");

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.

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;

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");

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;

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).
  */

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

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.

core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java

@@ -23,7 +23,6 @@ import com.google.common.util.concurrent.FutureCallback;
 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;

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 com.google.common.util.concurrent.SettableFuture;
 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;
 

core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java

@@ -28,7 +28,6 @@ import com.google.common.util.concurrent.SettableFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
 import java.util.Locale;
 
 import static com.google.common.base.Preconditions.*;