diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java index 52d12b1b4b..d6a908cac6 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java @@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import io.bitsquare.trade.states.TradeState; import com.google.inject.Inject; @@ -71,8 +71,8 @@ class ClosedTradesViewModel extends ActivatableWithDataModel im msg = "\nError message: " + trade.getErrorMessage(); if (trade instanceof BuyerAsTakerTrade) { - switch ((TakerState.ProcessState) newValue) { + switch ((TakerTradeState.ProcessState) newValue) { case TAKE_OFFER_FEE_TX_CREATED: break; case DEPOSIT_PUBLISHED: @@ -267,7 +267,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel im } } else if (trade instanceof SellerAsTakerTrade) { - switch ((TakerState.ProcessState) newValue) { + switch ((TakerTradeState.ProcessState) newValue) { case TAKE_OFFER_FEE_TX_CREATED: break; case DEPOSIT_PUBLISHED: diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java index 925615d081..0aaac5dce1 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java @@ -20,7 +20,7 @@ package io.bitsquare.trade; import io.bitsquare.offer.Offer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.buyer.BuyerAsOffererProtocol; -import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.TradeState; import org.bitcoinj.core.Coin; @@ -63,8 +63,8 @@ public class BuyerAsOffererTrade extends Trade implements OffererTrade, BuyerTra @Override protected void initStates() { - processState = OffererState.ProcessState.UNDEFINED; - lifeCycleState = OffererState.LifeCycleState.OFFER_OPEN; + processState = OffererTradeState.ProcessState.UNDEFINED; + lifeCycleState = OffererTradeState.LifeCycleState.OFFER_OPEN; initStateProperties(); } @@ -93,10 +93,10 @@ public class BuyerAsOffererTrade extends Trade implements OffererTrade, BuyerTra public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); - switch ((OffererState.ProcessState) processState) { + switch ((OffererTradeState.ProcessState) processState) { case EXCEPTION: disposeProtocol(); - setLifeCycleState(OffererState.LifeCycleState.FAILED); + setLifeCycleState(OffererTradeState.LifeCycleState.FAILED); break; } } @@ -105,7 +105,7 @@ public class BuyerAsOffererTrade extends Trade implements OffererTrade, BuyerTra public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); - switch ((OffererState.LifeCycleState) lifeCycleState) { + switch ((OffererTradeState.LifeCycleState) lifeCycleState) { case FAILED: disposeProtocol(); break; @@ -119,7 +119,7 @@ public class BuyerAsOffererTrade extends Trade implements OffererTrade, BuyerTra public void setThrowable(Throwable throwable) { super.setThrowable(throwable); - setProcessState(OffererState.ProcessState.EXCEPTION); + setProcessState(OffererTradeState.ProcessState.EXCEPTION); } @@ -129,7 +129,7 @@ public class BuyerAsOffererTrade extends Trade implements OffererTrade, BuyerTra @Override protected void handleConfidenceResult() { - if (((OffererState.ProcessState) processState).ordinal() < OffererState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) - setProcessState(OffererState.ProcessState.DEPOSIT_CONFIRMED); + if (((OffererTradeState.ProcessState) processState).ordinal() < OffererTradeState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) + setProcessState(OffererTradeState.ProcessState.DEPOSIT_CONFIRMED); } } diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java index 5de78f5251..6ea1e39840 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java @@ -21,7 +21,7 @@ import io.bitsquare.offer.Offer; import io.bitsquare.p2p.Peer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.buyer.BuyerAsTakerProtocol; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TakerTradeState; import io.bitsquare.trade.states.TradeState; import org.bitcoinj.core.Coin; @@ -58,8 +58,8 @@ public class BuyerAsTakerTrade extends Trade implements TakerTrade, BuyerTrade, @Override protected void initStates() { - processState = TakerState.ProcessState.UNDEFINED; - lifeCycleState = TakerState.LifeCycleState.PENDING; + processState = TakerTradeState.ProcessState.UNDEFINED; + lifeCycleState = TakerTradeState.LifeCycleState.PENDING; initStateProperties(); } @@ -98,10 +98,10 @@ public class BuyerAsTakerTrade extends Trade implements TakerTrade, BuyerTrade, public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); - switch ((TakerState.ProcessState) processState) { + switch ((TakerTradeState.ProcessState) processState) { case EXCEPTION: disposeProtocol(); - setLifeCycleState(TakerState.LifeCycleState.FAILED); + setLifeCycleState(TakerTradeState.LifeCycleState.FAILED); break; } } @@ -110,7 +110,7 @@ public class BuyerAsTakerTrade extends Trade implements TakerTrade, BuyerTrade, public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); - switch ((TakerState.LifeCycleState) lifeCycleState) { + switch ((TakerTradeState.LifeCycleState) lifeCycleState) { case FAILED: disposeProtocol(); break; @@ -124,7 +124,7 @@ public class BuyerAsTakerTrade extends Trade implements TakerTrade, BuyerTrade, public void setThrowable(Throwable throwable) { super.setThrowable(throwable); - setProcessState(TakerState.ProcessState.EXCEPTION); + setProcessState(TakerTradeState.ProcessState.EXCEPTION); } @@ -134,7 +134,7 @@ public class BuyerAsTakerTrade extends Trade implements TakerTrade, BuyerTrade, @Override protected void handleConfidenceResult() { - if (((TakerState.ProcessState) processState).ordinal() < TakerState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) - setProcessState(TakerState.ProcessState.DEPOSIT_CONFIRMED); + if (((TakerTradeState.ProcessState) processState).ordinal() < TakerTradeState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) + setProcessState(TakerTradeState.ProcessState.DEPOSIT_CONFIRMED); } } diff --git a/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java index e78d68c2d7..8989d4cd06 100644 --- a/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java @@ -20,7 +20,7 @@ package io.bitsquare.trade; import io.bitsquare.offer.Offer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.seller.SellerAsOffererProtocol; -import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.TradeState; import java.io.IOException; @@ -61,8 +61,8 @@ public class SellerAsOffererTrade extends Trade implements OffererTrade, SellerT @Override protected void initStates() { - processState = OffererState.ProcessState.UNDEFINED; - lifeCycleState = OffererState.LifeCycleState.OFFER_OPEN; + processState = OffererTradeState.ProcessState.UNDEFINED; + lifeCycleState = OffererTradeState.LifeCycleState.OFFER_OPEN; initStateProperties(); } @@ -86,10 +86,10 @@ public class SellerAsOffererTrade extends Trade implements OffererTrade, SellerT public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); - switch ((OffererState.ProcessState) processState) { + switch ((OffererTradeState.ProcessState) processState) { case EXCEPTION: disposeProtocol(); - setLifeCycleState(OffererState.LifeCycleState.FAILED); + setLifeCycleState(OffererTradeState.LifeCycleState.FAILED); break; } } @@ -98,7 +98,7 @@ public class SellerAsOffererTrade extends Trade implements OffererTrade, SellerT public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); - switch ((OffererState.LifeCycleState) lifeCycleState) { + switch ((OffererTradeState.LifeCycleState) lifeCycleState) { case FAILED: disposeProtocol(); break; @@ -112,7 +112,7 @@ public class SellerAsOffererTrade extends Trade implements OffererTrade, SellerT public void setThrowable(Throwable throwable) { super.setThrowable(throwable); - setProcessState(OffererState.ProcessState.EXCEPTION); + setProcessState(OffererTradeState.ProcessState.EXCEPTION); } @@ -122,8 +122,8 @@ public class SellerAsOffererTrade extends Trade implements OffererTrade, SellerT @Override protected void handleConfidenceResult() { - if (((OffererState.ProcessState) processState).ordinal() < OffererState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) - setProcessState(OffererState.ProcessState.DEPOSIT_CONFIRMED); + if (((OffererTradeState.ProcessState) processState).ordinal() < OffererTradeState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) + setProcessState(OffererTradeState.ProcessState.DEPOSIT_CONFIRMED); } } diff --git a/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java index 1ee88c7eb5..2297f61048 100644 --- a/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java @@ -21,7 +21,7 @@ import io.bitsquare.offer.Offer; import io.bitsquare.p2p.Peer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.seller.SellerAsTakerProtocol; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TakerTradeState; import io.bitsquare.trade.states.TradeState; import org.bitcoinj.core.Coin; @@ -36,7 +36,7 @@ public class SellerAsTakerTrade extends Trade implements TakerTrade, SellerTrade // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = 1L; - transient private static final Logger log = LoggerFactory.getLogger(TakerState.class); + transient private static final Logger log = LoggerFactory.getLogger(TakerTradeState.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,7 @@ public class SellerAsTakerTrade extends Trade implements TakerTrade, SellerTrade public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); - switch ((TakerState.LifeCycleState) lifeCycleState) { + switch ((TakerTradeState.LifeCycleState) lifeCycleState) { case FAILED: disposeProtocol(); break; @@ -72,8 +72,8 @@ public class SellerAsTakerTrade extends Trade implements TakerTrade, SellerTrade @Override protected void initStates() { - processState = TakerState.ProcessState.UNDEFINED; - lifeCycleState = TakerState.LifeCycleState.PENDING; + processState = TakerTradeState.ProcessState.UNDEFINED; + lifeCycleState = TakerTradeState.LifeCycleState.PENDING; initStateProperties(); } @@ -108,10 +108,10 @@ public class SellerAsTakerTrade extends Trade implements TakerTrade, SellerTrade public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); - switch ((TakerState.ProcessState) processState) { + switch ((TakerTradeState.ProcessState) processState) { case EXCEPTION: disposeProtocol(); - setLifeCycleState(TakerState.LifeCycleState.FAILED); + setLifeCycleState(TakerTradeState.LifeCycleState.FAILED); break; } } @@ -120,7 +120,7 @@ public class SellerAsTakerTrade extends Trade implements TakerTrade, SellerTrade public void setThrowable(Throwable throwable) { super.setThrowable(throwable); - setProcessState(TakerState.ProcessState.EXCEPTION); + setProcessState(TakerTradeState.ProcessState.EXCEPTION); } @@ -130,7 +130,7 @@ public class SellerAsTakerTrade extends Trade implements TakerTrade, SellerTrade @Override protected void handleConfidenceResult() { - if (((TakerState.ProcessState) processState).ordinal() < TakerState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) - setProcessState(TakerState.ProcessState.DEPOSIT_CONFIRMED); + if (((TakerTradeState.ProcessState) processState).ordinal() < TakerTradeState.ProcessState.DEPOSIT_CONFIRMED.ordinal()) + setProcessState(TakerTradeState.ProcessState.DEPOSIT_CONFIRMED); } } diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 18a38bfe23..89e6ea6333 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -43,8 +43,8 @@ import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityProtocol; import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel; import io.bitsquare.trade.protocol.placeoffer.PlaceOfferProtocol; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import io.bitsquare.user.AccountSettings; import io.bitsquare.user.User; @@ -171,9 +171,9 @@ public class TradeManager { boolean failed = false; if (trade instanceof TakerTrade) - failed = trade.lifeCycleState == TakerState.LifeCycleState.FAILED; + failed = trade.lifeCycleState == TakerTradeState.LifeCycleState.FAILED; else if (trade instanceof OffererTrade) - failed = trade.lifeCycleState == OffererState.LifeCycleState.FAILED; + failed = trade.lifeCycleState == OffererTradeState.LifeCycleState.FAILED; if (failed) { failedTrades.add(trade); @@ -293,7 +293,7 @@ public class TradeManager { private void setupDepositPublishedListener(Trade trade) { trade.processStateProperty().addListener((ov, oldValue, newValue) -> { log.debug("setupDepositPublishedListener state = " + newValue); - if (newValue == OffererState.ProcessState.DEPOSIT_PUBLISHED) { + if (newValue == OffererTradeState.ProcessState.DEPOSIT_PUBLISHED) { removeOpenOffer(trade.getOffer(), () -> log.debug("remove offer was successful"), log::error, @@ -322,7 +322,7 @@ public class TradeManager { if (isCancelRequest) { if (trade instanceof OffererTrade) - trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_CANCELED); + trade.setLifeCycleState(OffererTradeState.LifeCycleState.OFFER_CANCELED); closedTrades.add(trade); trade.disposeProtocol(); } @@ -406,9 +406,9 @@ public class TradeManager { if (transaction != null) { log.info("onWithdraw onSuccess tx ID:" + transaction.getHashAsString()); if (trade instanceof OffererTrade) - trade.setLifeCycleState(OffererState.LifeCycleState.COMPLETED); + trade.setLifeCycleState(OffererTradeState.LifeCycleState.COMPLETED); else if (trade instanceof TakerTrade) - trade.setLifeCycleState(TakerState.LifeCycleState.COMPLETED); + trade.setLifeCycleState(TakerTradeState.LifeCycleState.COMPLETED); pendingTrades.remove(trade); closedTrades.add(trade); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/StateUtil.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/StateUtil.java index 11cef26d7e..989250bc85 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/StateUtil.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/StateUtil.java @@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,13 +31,13 @@ public class StateUtil { public static void setSendFailedState(Trade trade) { if (trade instanceof OffererTrade) - trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + trade.setProcessState(OffererTradeState.ProcessState.MESSAGE_SENDING_FAILED); else if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); + trade.setProcessState(TakerTradeState.ProcessState.MESSAGE_SENDING_FAILED); } public static void setOfferOpenState(Trade trade) { if (trade instanceof OffererTrade) - trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); + trade.setLifeCycleState(OffererTradeState.LifeCycleState.OFFER_OPEN); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/BuyerAsOffererProtocol.java index 25f96757da..a034671955 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/BuyerAsOffererProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/BuyerAsOffererProtocol.java @@ -46,7 +46,7 @@ import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; -import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.OffererTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -111,7 +111,7 @@ public class BuyerAsOffererProtocol implements TradeProtocol { // to take the // offer // at the same time - boolean isOfferOpen = trade.lifeCycleStateProperty().get() == OffererState.LifeCycleState.OFFER_OPEN; + boolean isOfferOpen = trade.lifeCycleStateProperty().get() == OffererTradeState.LifeCycleState.OFFER_OPEN; ReportOfferAvailabilityMessage reportOfferAvailabilityMessage = new ReportOfferAvailabilityMessage(processModel.getId(), isOfferOpen); processModel.getMessageService().sendMessage(sender, reportOfferAvailabilityMessage, new SendMessageListener() { @Override @@ -138,7 +138,7 @@ public class BuyerAsOffererProtocol implements TradeProtocol { processModel.setTradeMessage(tradeMessage); trade.setTradingPeer(taker); - trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_RESERVED); + trade.setLifeCycleState(OffererTradeState.LifeCycleState.OFFER_RESERVED); TaskRunner taskRunner = new TaskRunner<>(trade, () -> log.debug("taskRunner at handleRequestDepositTxInputsMessage completed"), diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerProcessPayoutTxPublishedMessage.java index e73519d9e4..d939003616 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerProcessPayoutTxPublishedMessage.java @@ -23,8 +23,8 @@ import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,9 +49,9 @@ public class BuyerProcessPayoutTxPublishedMessage extends TradeTask { trade.setPayoutTx(checkNotNull(message.payoutTx)); if (trade instanceof OffererTrade) - trade.setProcessState(OffererState.ProcessState.PAYOUT_PUBLISHED); + trade.setProcessState(OffererTradeState.ProcessState.PAYOUT_PUBLISHED); else if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.PAYOUT_PUBLISHED); + trade.setProcessState(TakerTradeState.ProcessState.PAYOUT_PUBLISHED); complete(); } catch (Throwable t) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSendsFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSendsFiatTransferStartedMessage.java index 56f0761fb5..3845554e8f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSendsFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSendsFiatTransferStartedMessage.java @@ -25,8 +25,8 @@ import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.StateUtil; import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,9 +57,9 @@ public class BuyerSendsFiatTransferStartedMessage extends TradeTask { log.trace("Sending FiatTransferStartedMessage succeeded."); if (trade instanceof OffererTrade) - trade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); + trade.setProcessState(OffererTradeState.ProcessState.FIAT_PAYMENT_STARTED); if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_STARTED); + trade.setProcessState(TakerTradeState.ProcessState.FIAT_PAYMENT_STARTED); complete(); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSignsAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSignsAndPublishDepositTx.java index 7c53dd325d..05bcd9428e 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSignsAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/tasks/BuyerSignsAndPublishDepositTx.java @@ -23,8 +23,8 @@ import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; @@ -65,12 +65,12 @@ public class BuyerSignsAndPublishDepositTx extends TradeTask { trade.setDepositTx(transaction); if (trade instanceof TakerTrade) { - trade.setProcessState(TakerState.ProcessState.DEPOSIT_PUBLISHED); - trade.setLifeCycleState(TakerState.LifeCycleState.PENDING); + trade.setProcessState(TakerTradeState.ProcessState.DEPOSIT_PUBLISHED); + trade.setLifeCycleState(TakerTradeState.LifeCycleState.PENDING); } else if (trade instanceof OffererTrade) { - trade.setProcessState(OffererState.ProcessState.DEPOSIT_PUBLISHED); - trade.setLifeCycleState(OffererState.LifeCycleState.PENDING); + trade.setProcessState(OffererTradeState.ProcessState.DEPOSIT_PUBLISHED); + trade.setLifeCycleState(OffererTradeState.LifeCycleState.PENDING); } complete(); @@ -91,7 +91,7 @@ public class BuyerSignsAndPublishDepositTx extends TradeTask { trade.setThrowable(t); if (trade instanceof OffererTrade) - trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); + trade.setLifeCycleState(OffererTradeState.LifeCycleState.OFFER_OPEN); failed(t); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsOffererProtocol.java index cac5fee167..9355c06662 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsOffererProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsOffererProtocol.java @@ -44,7 +44,7 @@ import io.bitsquare.trade.protocol.trade.seller.tasks.SellerSignsAndPublishPayou import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; -import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.OffererTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,7 +109,7 @@ public class SellerAsOffererProtocol implements TradeProtocol { // to take the // offer // at the same time - boolean isOfferOpen = trade.lifeCycleStateProperty().get() == OffererState.LifeCycleState.OFFER_OPEN; + boolean isOfferOpen = trade.lifeCycleStateProperty().get() == OffererTradeState.LifeCycleState.OFFER_OPEN; ReportOfferAvailabilityMessage reportOfferAvailabilityMessage = new ReportOfferAvailabilityMessage(processModel.getId(), isOfferOpen); processModel.getMessageService().sendMessage(sender, reportOfferAvailabilityMessage, new SendMessageListener() { @@ -187,7 +187,7 @@ public class SellerAsOffererProtocol implements TradeProtocol { // User clicked the "bank transfer received" button, so we release the funds for pay out public void onFiatPaymentReceived() { - trade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_RECEIVED); + trade.setProcessState(OffererTradeState.ProcessState.FIAT_PAYMENT_RECEIVED); TaskRunner taskRunner = new TaskRunner<>(trade, () -> { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsTakerProtocol.java index 5dfc44755b..5aca206630 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/SellerAsTakerProtocol.java @@ -44,7 +44,7 @@ import io.bitsquare.trade.protocol.trade.shared.taker.tasks.BroadcastTakeOfferFe import io.bitsquare.trade.protocol.trade.shared.taker.tasks.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOffererAccount; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TakerTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,7 +163,7 @@ public class SellerAsTakerProtocol implements TradeProtocol { // User clicked the "bank transfer received" button, so we release the funds for pay out public void onFiatPaymentReceived() { - trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_RECEIVED); + trade.setProcessState(TakerTradeState.ProcessState.FIAT_PAYMENT_RECEIVED); TaskRunner taskRunner = new TaskRunner<>(trade, () -> { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessDepositTxPublishedMessage.java index 54869d07cf..5320809d3c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessDepositTxPublishedMessage.java @@ -23,8 +23,8 @@ import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,9 +49,9 @@ public class SellerProcessDepositTxPublishedMessage extends TradeTask { trade.setDepositTx(checkNotNull(message.depositTx)); if (trade instanceof OffererTrade) - trade.setProcessState(OffererState.ProcessState.DEPOSIT_PUBLISHED); + trade.setProcessState(OffererTradeState.ProcessState.DEPOSIT_PUBLISHED); else if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.DEPOSIT_PUBLISHED); + trade.setProcessState(TakerTradeState.ProcessState.DEPOSIT_PUBLISHED); complete(); } catch (Throwable t) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessFiatTransferStartedMessage.java index 8590c9ff62..7faf3ada33 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerProcessFiatTransferStartedMessage.java @@ -23,8 +23,8 @@ import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,9 +52,9 @@ public class SellerProcessFiatTransferStartedMessage extends TradeTask { processModel.tradingPeer.setPayoutAddressString(nonEmptyStringOf(message.buyerPayoutAddress)); if (trade instanceof OffererTrade) - trade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); + trade.setProcessState(OffererTradeState.ProcessState.FIAT_PAYMENT_STARTED); else if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_STARTED); + trade.setProcessState(TakerTradeState.ProcessState.FIAT_PAYMENT_STARTED); complete(); } catch (Throwable t) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerSignsAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerSignsAndPublishPayoutTx.java index 596167a5d0..146fa9e1d8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerSignsAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/tasks/SellerSignsAndPublishPayoutTx.java @@ -22,8 +22,8 @@ import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; -import io.bitsquare.trade.states.OffererState; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.OffererTradeState; +import io.bitsquare.trade.states.TakerTradeState; import org.bitcoinj.core.Transaction; @@ -60,9 +60,9 @@ public class SellerSignsAndPublishPayoutTx extends TradeTask { processModel.setPayoutTx(transaction); if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.PAYOUT_PUBLISHED); + trade.setProcessState(TakerTradeState.ProcessState.PAYOUT_PUBLISHED); else if (trade instanceof OffererTrade) - trade.setProcessState(OffererState.ProcessState.PAYOUT_PUBLISHED); + trade.setProcessState(OffererTradeState.ProcessState.PAYOUT_PUBLISHED); complete(); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java index 216569f11a..9333ba1dda 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java @@ -21,7 +21,7 @@ import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TakerTradeState; import org.bitcoinj.core.Transaction; @@ -49,7 +49,7 @@ public class BroadcastTakeOfferFeeTx extends TradeTask { log.debug("Take offer fee published successfully. Transaction ID = " + transaction.getHashAsString()); if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_PUBLISHED); + trade.setProcessState(TakerTradeState.ProcessState.TAKE_OFFER_FEE_PUBLISHED); complete(); } @@ -60,7 +60,7 @@ public class BroadcastTakeOfferFeeTx extends TradeTask { trade.setErrorMessage(errorMessage); if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_PUBLISH_FAILED); + trade.setProcessState(TakerTradeState.ProcessState.TAKE_OFFER_FEE_PUBLISH_FAILED); failed(t); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java index d9ad5861b3..01ba673b4f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java @@ -21,7 +21,7 @@ import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.TradeTask; -import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TakerTradeState; import org.bitcoinj.core.Transaction; @@ -44,7 +44,7 @@ public class CreateTakeOfferFeeTx extends TradeTask { processModel.setTakeOfferFeeTxId(createTakeOfferFeeTx.getHashAsString()); if (trade instanceof TakerTrade) - trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_TX_CREATED); + trade.setProcessState(TakerTradeState.ProcessState.TAKE_OFFER_FEE_TX_CREATED); complete(); } catch (Throwable t) { diff --git a/core/src/main/java/io/bitsquare/trade/states/OffererState.java b/core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/states/OffererState.java rename to core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java index 2dc3fae771..9b07d2f04f 100644 --- a/core/src/main/java/io/bitsquare/trade/states/OffererState.java +++ b/core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java @@ -20,8 +20,8 @@ package io.bitsquare.trade.states; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererState { - private static final Logger log = LoggerFactory.getLogger(OffererState.class); +public class OffererTradeState { + private static final Logger log = LoggerFactory.getLogger(OffererTradeState.class); public enum LifeCycleState implements TradeState.LifeCycleState { OFFER_OPEN, diff --git a/core/src/main/java/io/bitsquare/trade/states/TakerState.java b/core/src/main/java/io/bitsquare/trade/states/TakerTradeState.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/states/TakerState.java rename to core/src/main/java/io/bitsquare/trade/states/TakerTradeState.java index c1fb15e9fb..cf671083d3 100644 --- a/core/src/main/java/io/bitsquare/trade/states/TakerState.java +++ b/core/src/main/java/io/bitsquare/trade/states/TakerTradeState.java @@ -20,8 +20,8 @@ package io.bitsquare.trade.states; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerState { - private static final Logger log = LoggerFactory.getLogger(TakerState.class); +public class TakerTradeState { + private static final Logger log = LoggerFactory.getLogger(TakerTradeState.class); public enum LifeCycleState implements TradeState.LifeCycleState { PENDING,