From ce3bc26be6f5eec3a97e652d2ca3aaf4b6f39c28 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 14 Mar 2015 18:06:50 +0100 Subject: [PATCH] Rename method --- .../gui/main/trade/takeoffer/TakeOfferView.java | 15 --------------- .../main/trade/takeoffer/TakeOfferViewModel.java | 12 ------------ core/src/main/java/io/bitsquare/offer/Offer.java | 9 ++++++--- .../java/io/bitsquare/trade/TradeManager.java | 4 ++-- .../availability/tasks/GetPeerAddress.java | 2 +- .../ProcessReportOfferAvailabilityMessage.java | 2 +- .../tasks/RequestIsOfferAvailable.java | 2 +- .../tasks/AddOfferToRemoteOfferBook.java | 2 +- .../tasks/BroadcastCreateOfferFeeTx.java | 2 +- .../placeoffer/tasks/CreateOfferFeeTx.java | 2 +- .../protocol/placeoffer/tasks/ValidateOffer.java | 2 +- .../trade/offerer/tasks/CreateDepositTx.java | 2 +- .../tasks/ProcessPayoutTxPublishedMessage.java | 2 +- ...cessRequestOffererPublishDepositTxMessage.java | 2 +- .../tasks/ProcessRequestTakeOfferMessage.java | 2 +- .../tasks/ProcessTakeOfferFeePayedMessage.java | 2 +- .../offerer/tasks/RespondToTakeOfferRequest.java | 2 +- .../tasks/SendBankTransferInitedMessage.java | 2 +- .../offerer/tasks/SendDepositTxIdToTaker.java | 2 +- .../tasks/SendTakerDepositPaymentRequest.java | 2 +- .../SetupListenerForBlockChainConfirmation.java | 2 +- .../offerer/tasks/SignAndPublishDepositTx.java | 2 +- .../trade/offerer/tasks/SignPayoutTx.java | 2 +- .../offerer/tasks/VerifyAndSignContract.java | 2 +- .../offerer/tasks/VerifyTakeOfferFeePayment.java | 2 +- .../trade/offerer/tasks/VerifyTakerAccount.java | 2 +- .../trade/taker/SellerAsTakerProtocol.java | 12 ++++++------ .../trade/taker/tasks/CreateAndSignContract.java | 2 +- .../trade/taker/tasks/GetPeerAddress.java | 2 +- .../protocol/trade/taker/tasks/PayDeposit.java | 2 +- .../trade/taker/tasks/PayTakeOfferFee.java | 2 +- .../tasks/ProcessBankTransferInitedMessage.java | 2 +- .../tasks/ProcessDepositTxPublishedMessage.java | 2 +- .../ProcessRespondToTakeOfferRequestMessage.java | 2 +- .../ProcessTakerDepositPaymentRequestMessage.java | 2 +- .../trade/taker/tasks/RequestTakeOffer.java | 2 +- .../trade/taker/tasks/SendPayoutTxToOfferer.java | 2 +- .../tasks/SendSignedTakerDepositTxAsHex.java | 2 +- .../taker/tasks/SendTakeOfferFeePayedMessage.java | 2 +- .../trade/taker/tasks/SignAndPublishPayoutTx.java | 2 +- .../trade/taker/tasks/TakerCommitDepositTx.java | 2 +- .../trade/taker/tasks/VerifyOfferFeePayment.java | 2 +- .../trade/taker/tasks/VerifyOffererAccount.java | 2 +- .../trade/tomp2p/TomP2PTradeMessageService.java | 3 +-- .../java/io/bitsquare/util/taskrunner/Task.java | 4 ++-- 45 files changed, 55 insertions(+), 80 deletions(-) diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java index de3055b4f2..16b7ed78f0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java @@ -96,7 +96,6 @@ public class TakeOfferView extends ActivatableViewAndModel offerIsAvailableChangeListener; - private ChangeListener errorMessageChangeListener; private TradeView.CloseHandler closeHandler; @Inject @@ -118,9 +117,6 @@ public class TakeOfferView extends ActivatableViewAndModel handleOfferIsAvailableState(newValue); model.offerIsAvailable.addListener(offerIsAvailableChangeListener); handleOfferIsAvailableState(model.offerIsAvailable.get()); - - errorMessageChangeListener = (ov, oldValue, newValue) -> handleErrorMessage(newValue); - model.errorMessage.addListener(errorMessageChangeListener); } public void setCloseHandler(TradeView.CloseHandler closeHandler) { this.closeHandler = closeHandler; } - - private void handleErrorMessage(String errorMessage) { - if (errorMessage != null) - Popups.openErrorPopup("An error occurred", errorMessage); - - model.errorMessage.set(null); - } - private void handleOfferIsAvailableState(Offer.State state) { switch (state) { case UNKNOWN: diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java index 8d2609e69c..a69f6d6c7c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java @@ -24,7 +24,6 @@ import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; import io.bitsquare.offer.Direction; import io.bitsquare.offer.Offer; -import io.bitsquare.util.Utilities; import io.bitsquare.viewfx.model.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ViewModel; @@ -33,7 +32,6 @@ import org.bitcoinj.core.Coin; import javax.inject.Inject; -import javafx.animation.AnimationTimer; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -79,7 +77,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel im final StringProperty transactionId = new SimpleStringProperty(); final StringProperty requestTakeOfferErrorMessage = new SimpleStringProperty(); final StringProperty btcCode = new SimpleStringProperty(); - final StringProperty errorMessage = new SimpleStringProperty(); final BooleanProperty isTakeOfferButtonVisible = new SimpleBooleanProperty(false); @@ -93,7 +90,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel im // Needed for the addressTextField final ObjectProperty totalToPayAsCoin = new SimpleObjectProperty<>(); - private AnimationTimer timeoutTimer; @Inject @@ -152,14 +148,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel im isTakeOfferButtonDisabled.set(true); isTakeOfferSpinnerVisible.set(true); - timeoutTimer = Utilities.setTimeout(20000, animationTimer -> { - errorMessage.set("Timeout reached. Maybe there are connection problems. Please try again later."); - updateButtonDisableState(); - isTakeOfferSpinnerVisible.set(false); - return null; - }); - timeoutTimer.start(); - dataModel.takeOffer(); } diff --git a/core/src/main/java/io/bitsquare/offer/Offer.java b/core/src/main/java/io/bitsquare/offer/Offer.java index 3400d84da4..7efe7d5de1 100644 --- a/core/src/main/java/io/bitsquare/offer/Offer.java +++ b/core/src/main/java/io/bitsquare/offer/Offer.java @@ -38,13 +38,16 @@ import java.util.Locale; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import static com.google.common.base.Preconditions.*; //TODO flatten down? public class Offer implements Serializable { private static final long serialVersionUID = -971164804305475826L; - + private transient static final Logger log = LoggerFactory.getLogger(Offer.class); public enum State { UNKNOWN, @@ -58,11 +61,10 @@ public class Offer implements Serializable { // key attributes for lookup private final Direction direction; private final Currency currency; - private final String id; - private final Date creationDate; + //TODO check with latest bitcoinJ version // Fiat cause problems with offer removal (don` found out why, but we want plain objects anyway) private final long fiatPrice; private final Coin amount; @@ -136,6 +138,7 @@ public class Offer implements Serializable { getStateProperty().set(state); } + /////////////////////////////////////////////////////////////////////////////////////////// // Getters /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 2c0025dc8c..9dfb014c3c 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -314,7 +314,7 @@ public class TradeManager { private void removeOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler, - boolean removeFromOffererAsBuyerProtocolMap) { + boolean removeFromBuyerAcceptsOfferProtocolMap) { String offerId = offer.getId(); offerBookService.removeOffer(offer, () -> { @@ -322,7 +322,7 @@ public class TradeManager { OpenOffer openOffer = openOffers.remove(offerId); disposeCheckOfferAvailabilityRequest(openOffer.getOffer()); persistOpenOffers(); - if (removeFromOffererAsBuyerProtocolMap && buyerAcceptsOfferProtocolMap.containsKey(offerId)) { + if (removeFromBuyerAcceptsOfferProtocolMap && buyerAcceptsOfferProtocolMap.containsKey(offerId)) { buyerAcceptsOfferProtocolMap.get(offerId).cleanup(); buyerAcceptsOfferProtocolMap.remove(offerId); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java index 69d5d2d282..1f7088f9f9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java @@ -55,7 +55,7 @@ public class GetPeerAddress extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { model.getOffer().setState(Offer.State.OFFERER_OFFLINE); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java index 82b1825e11..cf6ae8a86d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java @@ -51,7 +51,7 @@ public class ProcessReportOfferAvailabilityMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { if (model.getOffer().getState() != Offer.State.OFFERER_OFFLINE) model.getOffer().setState(Offer.State.AVAILABILITY_CHECK_FAILED); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java index 5a342ccf79..de03b7fb10 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java @@ -44,7 +44,7 @@ public class AddOfferToRemoteOfferBook extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { // do nothing } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java index e52d896f70..a8df89e139 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java @@ -103,7 +103,7 @@ public class BroadcastCreateOfferFeeTx extends Task { } } - protected void applyStateOnFault() { + protected void updateStateOnFault() { if (!removeOfferFailed && !addOfferFailed) { // If broadcast fails we need to remove offer from offerbook model.getOfferBookService().removeOffer(model.getOffer(), diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java index 42c4b518ad..a3d9fe862d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java @@ -49,7 +49,7 @@ public class CreateOfferFeeTx extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { // do nothing } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java index 650e1f258e..785b147299 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java @@ -43,7 +43,7 @@ public class ValidateOffer extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { // do nothing } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java index e4334165a4..4a5f2eab8d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java @@ -63,6 +63,6 @@ public class CreateDepositTx extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java index 73c77f3c7d..c1248a5881 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java @@ -55,6 +55,6 @@ public class ProcessPayoutTxPublishedMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java index 79263779c4..fe860de15a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java @@ -58,6 +58,6 @@ public class ProcessRequestOffererPublishDepositTxMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { // do nothing } } \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java index a5315543be..6d2398ed85 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java @@ -54,6 +54,6 @@ public class ProcessTakeOfferFeePayedMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java index 3a80bcb9bb..296fe39f20 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java @@ -64,7 +64,7 @@ public class RespondToTakeOfferRequest extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { if (offerIsAvailable && model.getOpenOffer().getState() == OpenOffer.State.OFFER_ACCEPTED) { model.getOpenOffer().setState(OpenOffer.State.OPEN); model.setTrade(null); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java index 55014fdbec..07aec6f60d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java @@ -58,6 +58,6 @@ public class SendBankTransferInitedMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java index 78ca233b59..1ef9186ca3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java @@ -55,6 +55,6 @@ public class SendDepositTxIdToTaker extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java index 5107dcc77d..8a89968579 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java @@ -58,6 +58,6 @@ public class SendTakerDepositPaymentRequest extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java index fb199b1dd3..81e54d2446 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java @@ -57,6 +57,6 @@ public class SetupListenerForBlockChainConfirmation extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java index 6e439e02df..4642705604 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java @@ -64,7 +64,7 @@ public class SignPayoutTx extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java index 19446f9dc7..ec26b9bb7f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java @@ -59,6 +59,6 @@ public class VerifyAndSignContract extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java index 108545103f..b4c88cfa8d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java @@ -43,6 +43,6 @@ public class VerifyTakeOfferFeePayment extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java index 3381a90dd2..12dc182a65 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java @@ -49,6 +49,6 @@ public class VerifyTakerAccount extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java index 8e2e3a2ac3..1831b96032 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java @@ -77,7 +77,7 @@ public class SellerAsTakerProtocol { SellerAsTakerTaskRunner taskRunner = new SellerAsTakerTaskRunner<>(model, () -> { - log.debug("sequence at handleRequestTakeOfferUIEvent completed"); + log.debug("taskRunner at handleRequestTakeOfferUIEvent completed"); }, (errorMessage) -> { log.error(errorMessage); @@ -100,7 +100,7 @@ public class SellerAsTakerProtocol { SellerAsTakerTaskRunner taskRunner = new SellerAsTakerTaskRunner<>(model, () -> { - log.debug("sequence at handleRespondToTakeOfferRequestMessage completed"); + log.debug("taskRunner at handleRespondToTakeOfferRequestMessage completed"); }, (errorMessage) -> { log.error(errorMessage); @@ -119,7 +119,7 @@ public class SellerAsTakerProtocol { SellerAsTakerTaskRunner taskRunner = new SellerAsTakerTaskRunner<>(model, () -> { - log.debug("sequence at handleTakerDepositPaymentRequestMessage completed"); + log.debug("taskRunner at handleTakerDepositPaymentRequestMessage completed"); }, (errorMessage) -> { log.error(errorMessage); @@ -140,7 +140,7 @@ public class SellerAsTakerProtocol { SellerAsTakerTaskRunner taskRunner = new SellerAsTakerTaskRunner<>(model, () -> { - log.debug("sequence at handleDepositTxPublishedMessage completed"); + log.debug("taskRunner at handleDepositTxPublishedMessage completed"); }, (errorMessage) -> { log.error(errorMessage); @@ -158,7 +158,7 @@ public class SellerAsTakerProtocol { SellerAsTakerTaskRunner taskRunner = new SellerAsTakerTaskRunner<>(model, () -> { - log.debug("sequence at handleBankTransferInitedMessage completed"); + log.debug("taskRunner at handleBankTransferInitedMessage completed"); model.getTrade().setState(Trade.State.FIAT_PAYMENT_STARTED); }, (errorMessage) -> { @@ -177,7 +177,7 @@ public class SellerAsTakerProtocol { public void onFiatPaymentReceived() { SellerAsTakerTaskRunner taskRunner = new SellerAsTakerTaskRunner<>(model, () -> { - log.debug("sequence at handleFiatReceivedUIEvent completed"); + log.debug("taskRunner at handleFiatReceivedUIEvent completed"); }, (errorMessage) -> { log.error(errorMessage); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java index e5d6ffad1b..89f294d4cd 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java @@ -58,6 +58,6 @@ public class CreateAndSignContract extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java index f0272f47a3..aca3047223 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java @@ -55,7 +55,7 @@ public class GetPeerAddress extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { if (model.getOffer().getState() != Offer.State.OFFERER_OFFLINE) model.getOffer().setState(Offer.State.AVAILABILITY_CHECK_FAILED); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java index ea97eb583e..c50eda6630 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java @@ -58,6 +58,6 @@ public class PayDeposit extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java index 8a78f8950f..88fd50a531 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java @@ -63,7 +63,7 @@ public class PayTakeOfferFee extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { // As long as the take offer fee was not paid nothing critical happens. // The take offer process can be repeated so we reset the trade state. appendToErrorMessage("Take offer fee payment failed. Maybe your network connection was lost. Please try again."); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java index 0e1969513c..3a991e2bc7 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java @@ -55,6 +55,6 @@ public class ProcessBankTransferInitedMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java index 496b971743..02f48022fd 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java @@ -49,6 +49,6 @@ public class ProcessDepositTxPublishedMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java index 8334262082..4f31aef910 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java @@ -54,7 +54,7 @@ public class ProcessRespondToTakeOfferRequestMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { timeoutTimer.stop(); if (model.getOffer().getState() != Offer.State.OFFERER_OFFLINE) model.getOffer().setState(Offer.State.AVAILABILITY_CHECK_FAILED); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java index 5f398e05b1..7fa47ec741 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java @@ -51,6 +51,6 @@ public class SendPayoutTxToOfferer extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java index aed13f38ad..8164d6ccbf 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java @@ -69,6 +69,6 @@ public class SendSignedTakerDepositTxAsHex extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java index 028deb61cf..080e69baa8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java @@ -68,7 +68,7 @@ public class SendTakeOfferFeePayedMessage extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { appendToErrorMessage("Sending TakeOfferFeePayedMessage to offerer failed. Maybe the network connection was lost or the offerer lost his connection. " + "We persisted the state of the trade, please try again later or cancel that trade."); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java index f52901dd77..a9a3f179c3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java @@ -74,6 +74,6 @@ public class SignAndPublishPayoutTx extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java index 4580d890c3..96a555f89f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java @@ -45,6 +45,6 @@ public class TakerCommitDepositTx extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java index e18fbf2719..5d8b9705d4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java @@ -42,6 +42,6 @@ public class VerifyOfferFeePayment extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java index 80f3fd8038..26d6a6b14c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java @@ -47,6 +47,6 @@ public class VerifyOffererAccount extends Task { } @Override - protected void applyStateOnFault() { + protected void updateStateOnFault() { } } diff --git a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java index 786b065129..57f78c59c8 100644 --- a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java +++ b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java @@ -151,8 +151,7 @@ public class TomP2PTradeMessageService implements TradeMessageService { @Override public void handleMessage(Object message, Peer sender) { if (message instanceof Message && sender instanceof TomP2PPeer) { - executor.execute(() -> messageHandlers.stream().forEach(e -> - e.handleMessage((Message) message, sender))); + executor.execute(() -> messageHandlers.stream().forEach(e -> e.handleMessage((Message) message, sender))); } } } diff --git a/core/src/main/java/io/bitsquare/util/taskrunner/Task.java b/core/src/main/java/io/bitsquare/util/taskrunner/Task.java index f8e8a660b6..214b97b131 100644 --- a/core/src/main/java/io/bitsquare/util/taskrunner/Task.java +++ b/core/src/main/java/io/bitsquare/util/taskrunner/Task.java @@ -47,7 +47,7 @@ public abstract class Task { abstract protected void doRun(); - abstract protected void applyStateOnFault(); + abstract protected void updateStateOnFault(); private void interceptBeforeRun() { if (getClass() == taskToInterceptBeforeRun) @@ -88,7 +88,7 @@ public abstract class Task { } protected void failed() { - applyStateOnFault(); + updateStateOnFault(); taskHandler.handleErrorMessage(errorMessage); }