mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-04-06 21:13:59 -04:00
Rename method
This commit is contained in:
parent
0c0efd3fe0
commit
ce3bc26be6
@ -96,7 +96,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
|
||||
private final Navigation navigation;
|
||||
private final OverlayManager overlayManager;
|
||||
private ChangeListener<Offer.State> offerIsAvailableChangeListener;
|
||||
private ChangeListener<String> errorMessageChangeListener;
|
||||
private TradeView.CloseHandler closeHandler;
|
||||
|
||||
@Inject
|
||||
@ -118,9 +117,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
|
||||
protected void doDeactivate() {
|
||||
if (offerIsAvailableChangeListener != null)
|
||||
model.offerIsAvailable.removeListener(offerIsAvailableChangeListener);
|
||||
|
||||
if (errorMessageChangeListener != null)
|
||||
model.errorMessage.removeListener(errorMessageChangeListener);
|
||||
}
|
||||
|
||||
public void initWithData(Direction direction, Coin amount, Offer offer) {
|
||||
@ -155,23 +151,12 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
|
||||
offerIsAvailableChangeListener = (ov, oldValue, newValue) -> 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:
|
||||
|
@ -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<TakeOfferDataModel> 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<TakeOfferDataModel> im
|
||||
|
||||
// Needed for the addressTextField
|
||||
final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>();
|
||||
private AnimationTimer timeoutTimer;
|
||||
|
||||
|
||||
@Inject
|
||||
@ -152,14 +148,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> 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();
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ public class GetPeerAddress extends Task<CheckOfferAvailabilityModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
|
||||
}
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ public class ProcessReportOfferAvailabilityMessage extends Task<CheckOfferAvaila
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
model.getOffer().setState(Offer.State.AVAILABILITY_CHECK_FAILED);
|
||||
}
|
||||
}
|
||||
|
@ -52,7 +52,7 @@ public class RequestIsOfferAvailable extends Task<CheckOfferAvailabilityModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
if (model.getOffer().getState() != Offer.State.OFFERER_OFFLINE)
|
||||
model.getOffer().setState(Offer.State.AVAILABILITY_CHECK_FAILED);
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ public class AddOfferToRemoteOfferBook extends Task<PlaceOfferModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
@ -103,7 +103,7 @@ public class BroadcastCreateOfferFeeTx extends Task<PlaceOfferModel> {
|
||||
}
|
||||
}
|
||||
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
if (!removeOfferFailed && !addOfferFailed) {
|
||||
// If broadcast fails we need to remove offer from offerbook
|
||||
model.getOfferBookService().removeOffer(model.getOffer(),
|
||||
|
@ -49,7 +49,7 @@ public class CreateOfferFeeTx extends Task<PlaceOfferModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ public class ValidateOffer extends Task<PlaceOfferModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
@ -63,6 +63,6 @@ public class CreateDepositTx extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -55,6 +55,6 @@ public class ProcessPayoutTxPublishedMessage extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
@ -58,6 +58,6 @@ public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOf
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
@ -45,7 +45,7 @@ public class ProcessRequestTakeOfferMessage extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
// do nothing
|
||||
}
|
||||
}
|
@ -54,6 +54,6 @@ public class ProcessTakeOfferFeePayedMessage extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
@ -64,7 +64,7 @@ public class RespondToTakeOfferRequest extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@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);
|
||||
|
@ -58,6 +58,6 @@ public class SendBankTransferInitedMessage extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -55,6 +55,6 @@ public class SendDepositTxIdToTaker extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -58,6 +58,6 @@ public class SendTakerDepositPaymentRequest extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -57,6 +57,6 @@ public class SetupListenerForBlockChainConfirmation extends Task<BuyerAsOffererM
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -69,6 +69,6 @@ public class SignAndPublishDepositTx extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -64,7 +64,7 @@ public class SignPayoutTx extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -59,6 +59,6 @@ public class VerifyAndSignContract extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -43,6 +43,6 @@ public class VerifyTakeOfferFeePayment extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -49,6 +49,6 @@ public class VerifyTakerAccount extends Task<BuyerAsOffererModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ public class SellerAsTakerProtocol {
|
||||
|
||||
SellerAsTakerTaskRunner<SellerAsTakerModel> 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<SellerAsTakerModel> 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<SellerAsTakerModel> 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<SellerAsTakerModel> 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<SellerAsTakerModel> 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<SellerAsTakerModel> taskRunner = new SellerAsTakerTaskRunner<>(model,
|
||||
() -> {
|
||||
log.debug("sequence at handleFiatReceivedUIEvent completed");
|
||||
log.debug("taskRunner at handleFiatReceivedUIEvent completed");
|
||||
},
|
||||
(errorMessage) -> {
|
||||
log.error(errorMessage);
|
||||
|
@ -58,6 +58,6 @@ public class CreateAndSignContract extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ public class GetPeerAddress extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
if (model.getOffer().getState() != Offer.State.OFFERER_OFFLINE)
|
||||
model.getOffer().setState(Offer.State.AVAILABILITY_CHECK_FAILED);
|
||||
}
|
||||
|
@ -58,6 +58,6 @@ public class PayDeposit extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -63,7 +63,7 @@ public class PayTakeOfferFee extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@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.");
|
||||
|
@ -55,6 +55,6 @@ public class ProcessBankTransferInitedMessage extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
@ -49,6 +49,6 @@ public class ProcessDepositTxPublishedMessage extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
@ -54,7 +54,7 @@ public class ProcessRespondToTakeOfferRequestMessage extends Task<SellerAsTakerM
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
model.getTrade().setState(Trade.State.MESSAGE_SENDING_FAILED);
|
||||
}
|
||||
}
|
@ -53,6 +53,6 @@ public class ProcessTakerDepositPaymentRequestMessage extends Task<SellerAsTaker
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
@ -64,7 +64,7 @@ public class RequestTakeOffer extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@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);
|
||||
|
@ -51,6 +51,6 @@ public class SendPayoutTxToOfferer extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -69,6 +69,6 @@ public class SendSignedTakerDepositTxAsHex extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -68,7 +68,7 @@ public class SendTakeOfferFeePayedMessage extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@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.");
|
||||
}
|
||||
|
@ -74,6 +74,6 @@ public class SignAndPublishPayoutTx extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -45,6 +45,6 @@ public class TakerCommitDepositTx extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -42,6 +42,6 @@ public class VerifyOfferFeePayment extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -47,6 +47,6 @@ public class VerifyOffererAccount extends Task<SellerAsTakerModel> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyStateOnFault() {
|
||||
protected void updateStateOnFault() {
|
||||
}
|
||||
}
|
||||
|
@ -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)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -47,7 +47,7 @@ public abstract class Task<T extends SharedModel> {
|
||||
|
||||
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<T extends SharedModel> {
|
||||
}
|
||||
|
||||
protected void failed() {
|
||||
applyStateOnFault();
|
||||
updateStateOnFault();
|
||||
taskHandler.handleErrorMessage(errorMessage);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user