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