Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-15 11:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Reverse the order of ListenerRegistration c'tor to restore compatibility with bcj 0.13

Browse Source
This commit is contained in:
Mike Hearn 2015-10-05 17:01:02 +02:00
parent 9bfce1bae0
commit f5db4b92be
7 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java
View File

@ -232,7 +232,7 @@ public abstract class AbstractBlockChain {
* Adds a {@link NewBestBlockListener} listener to the chain. * Adds a {@link NewBestBlockListener} listener to the chain.
*/ */
public void addNewBestBlockListener(Executor executor, NewBestBlockListener listener) { public void addNewBestBlockListener(Executor executor, NewBestBlockListener listener) {
newBestBlockListeners.add(new ListenerRegistration<NewBestBlockListener>(executor, listener)); newBestBlockListeners.add(new ListenerRegistration<NewBestBlockListener>(listener, executor));
} }
/** /**
@ -246,7 +246,7 @@ public abstract class AbstractBlockChain {
* Adds a generic {@link ReorganizeListener} listener to the chain. * Adds a generic {@link ReorganizeListener} listener to the chain.
*/ */
public void addReorganizeListener(Executor executor, ReorganizeListener listener) { public void addReorganizeListener(Executor executor, ReorganizeListener listener) {
reorganizeListeners.add(new ListenerRegistration<ReorganizeListener>(executor, listener)); reorganizeListeners.add(new ListenerRegistration<ReorganizeListener>(listener, executor));
} }
/** /**
@ -260,7 +260,7 @@ public abstract class AbstractBlockChain {
* Adds a generic {@link TransactionReceivedInBlockListener} listener to the chain. * Adds a generic {@link TransactionReceivedInBlockListener} listener to the chain.
*/ */
public void addTransactionReceivedListener(Executor executor, TransactionReceivedInBlockListener listener) { public void addTransactionReceivedListener(Executor executor, TransactionReceivedInBlockListener listener) {
transactionReceivedListeners.add(new ListenerRegistration<TransactionReceivedInBlockListener>(executor, listener)); transactionReceivedListeners.add(new ListenerRegistration<TransactionReceivedInBlockListener>(listener, executor));
} }
/** /**

6
core/src/main/java/org/bitcoinj/core/Peer.java
View File

@ -68,7 +68,7 @@ public class Peer extends PeerSocketHandler {
static class PeerConnectionListenerRegistration extends ListenerRegistration<PeerConnectionEventListener> { static class PeerConnectionListenerRegistration extends ListenerRegistration<PeerConnectionEventListener> {
boolean callOnDisconnect = true; boolean callOnDisconnect = true;
public PeerConnectionListenerRegistration(PeerConnectionEventListener listener, Executor executor) { public PeerConnectionListenerRegistration(PeerConnectionEventListener listener, Executor executor) {
super(executor, listener); super(listener, executor);
} }
public PeerConnectionListenerRegistration(PeerConnectionEventListener listener, Executor executor, boolean callOnDisconnect) { public PeerConnectionListenerRegistration(PeerConnectionEventListener listener, Executor executor, boolean callOnDisconnect) {
@ -285,7 +285,7 @@ public class Peer extends PeerSocketHandler {
/** Registers a listener that is called when messages are received. */ /** Registers a listener that is called when messages are received. */
public void addDataEventListener(Executor executor, PeerDataEventListener listener) { public void addDataEventListener(Executor executor, PeerDataEventListener listener) {
dataEventListeners.add(new ListenerRegistration<PeerDataEventListener>(executor, listener)); dataEventListeners.add(new ListenerRegistration<PeerDataEventListener>(listener, executor));
} }
/** Registers a listener that is called when a transaction is broadcast across the network */ /** Registers a listener that is called when a transaction is broadcast across the network */
@ -295,7 +295,7 @@ public class Peer extends PeerSocketHandler {
/** Registers a listener that is called when a transaction is broadcast across the network */ /** Registers a listener that is called when a transaction is broadcast across the network */
public void addOnTransactionBroadcastListener(Executor executor, OnTransactionBroadcastListener listener) { public void addOnTransactionBroadcastListener(Executor executor, OnTransactionBroadcastListener listener) {
onTransactionEventListeners.add(new ListenerRegistration<OnTransactionBroadcastListener>(executor, listener)); onTransactionEventListeners.add(new ListenerRegistration<OnTransactionBroadcastListener>(listener, executor));
} }
// Package-local version for PeerGroup // Package-local version for PeerGroup

6
core/src/main/java/org/bitcoinj/core/PeerGroup.java
View File

@ -680,7 +680,7 @@ public class PeerGroup implements TransactionBroadcaster {
* </ol> * </ol>
*/ */
public void addConnectionEventListener(Executor executor, PeerConnectionEventListener listener) { public void addConnectionEventListener(Executor executor, PeerConnectionEventListener listener) {
peerConnectionEventListeners.add(new ListenerRegistration<PeerConnectionEventListener>(executor, checkNotNull(listener))); peerConnectionEventListeners.add(new ListenerRegistration<PeerConnectionEventListener>(checkNotNull(listener), executor));
for (Peer peer : getConnectedPeers()) for (Peer peer : getConnectedPeers())
peer.addConnectionEventListener(executor, listener); peer.addConnectionEventListener(executor, listener);
for (Peer peer: getPendingPeers()) for (Peer peer: getPendingPeers())
@ -689,7 +689,7 @@ public class PeerGroup implements TransactionBroadcaster {
/** See {@link Peer#addDataEventListener(Executor, PeerDataEventListener)} */ /** See {@link Peer#addDataEventListener(Executor, PeerDataEventListener)} */
public void addDataEventListener(final Executor executor, final PeerDataEventListener listener) { public void addDataEventListener(final Executor executor, final PeerDataEventListener listener) {
peerDataEventListeners.add(new ListenerRegistration<PeerDataEventListener>(executor, checkNotNull(listener))); peerDataEventListeners.add(new ListenerRegistration<PeerDataEventListener>(checkNotNull(listener), executor));
for (Peer peer : getConnectedPeers()) for (Peer peer : getConnectedPeers())
peer.addDataEventListener(executor, listener); peer.addDataEventListener(executor, listener);
for (Peer peer: getPendingPeers()) for (Peer peer: getPendingPeers())
@ -708,7 +708,7 @@ public class PeerGroup implements TransactionBroadcaster {
/** See {@link Peer#addOnTransactionBroadcastListener(OnTransactionBroadcastListener)} */ /** See {@link Peer#addOnTransactionBroadcastListener(OnTransactionBroadcastListener)} */
public void addOnTransactionBroadcastListener(Executor executor, OnTransactionBroadcastListener listener) { public void addOnTransactionBroadcastListener(Executor executor, OnTransactionBroadcastListener listener) {
onTransactionBroadastEventListeners.add(new ListenerRegistration<OnTransactionBroadcastListener>(executor, checkNotNull(listener))); onTransactionBroadastEventListeners.add(new ListenerRegistration<OnTransactionBroadcastListener>(checkNotNull(listener), executor));
for (Peer peer : getConnectedPeers()) for (Peer peer : getConnectedPeers())
peer.addOnTransactionBroadcastListener(executor, listener); peer.addOnTransactionBroadcastListener(executor, listener);
for (Peer peer: getPendingPeers()) for (Peer peer: getPendingPeers())

3
core/src/main/java/org/bitcoinj/core/TransactionConfidence.java
View File

@ -22,7 +22,6 @@ import com.google.common.util.concurrent.*;
import org.bitcoinj.utils.*; import org.bitcoinj.utils.*;
import javax.annotation.*; import javax.annotation.*;
import java.io.*;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -195,7 +194,7 @@ public class TransactionConfidence {
*/ */
public void addEventListener(Executor executor, Listener listener) { public void addEventListener(Executor executor, Listener listener) {
checkNotNull(listener); checkNotNull(listener);
listeners.addIfAbsent(new ListenerRegistration<Listener>(executor, listener)); listeners.addIfAbsent(new ListenerRegistration<Listener>(listener, executor));
pinnedConfidenceObjects.add(this); pinnedConfidenceObjects.add(this);
} }

4
core/src/main/java/org/bitcoinj/core/Wallet.java
View File

@ -2325,7 +2325,7 @@ public class Wallet extends BaseTaggableObject
*/ */
public void addChangeEventListener(Executor executor, WalletChangeEventListener listener) { public void addChangeEventListener(Executor executor, WalletChangeEventListener listener) {
// This is thread safe, so we don't need to take the lock. // This is thread safe, so we don't need to take the lock.
changeListeners.add(new ListenerRegistration<WalletChangeEventListener>(executor, listener)); changeListeners.add(new ListenerRegistration<WalletChangeEventListener>(listener, executor));
keyChainGroup.addEventListener(listener, executor); keyChainGroup.addEventListener(listener, executor);
} }
@ -2335,7 +2335,7 @@ public class Wallet extends BaseTaggableObject
*/ */
public void addCoinEventListener(Executor executor, WalletCoinEventListener listener) { public void addCoinEventListener(Executor executor, WalletCoinEventListener listener) {
// This is thread safe, so we don't need to take the lock. // This is thread safe, so we don't need to take the lock.
coinListeners.add(new ListenerRegistration<WalletCoinEventListener>(executor, listener)); coinListeners.add(new ListenerRegistration<WalletCoinEventListener>(listener, executor));
} }
/** /**

2
core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java
View File

@ -28,7 +28,7 @@ public class ListenerRegistration<T> {
public final T listener; public final T listener;
public final Executor executor; public final Executor executor;
public ListenerRegistration(Executor executor, T listener) { public ListenerRegistration(T listener, Executor executor) {
this.listener = checkNotNull(listener); this.listener = checkNotNull(listener);
this.executor = checkNotNull(executor); this.executor = checkNotNull(executor);
} }

2
core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java
View File

@ -406,7 +406,7 @@ public class BasicKeyChain implements EncryptableKeyChain {
@Override @Override
public void addEventListener(KeyChainEventListener listener, Executor executor) { public void addEventListener(KeyChainEventListener listener, Executor executor) {
listeners.add(new ListenerRegistration<KeyChainEventListener>(executor, listener)); listeners.add(new ListenerRegistration<KeyChainEventListener>(listener, executor));
} }
@Override @Override