From 922a2cd22f2fa4c0b517f710f5dc9acfc2f0a53f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 4 Nov 2014 23:22:32 +0100 Subject: [PATCH] Introduce io.bitsquare.offer package Move io.bitsquare.trade.{Offer,Directory=>}.offer, in order to remove the final cycle between the msg and trade packages --- .../gui/main/portfolio/closed/ClosedTradesModel.java | 4 ++-- .../io/bitsquare/gui/main/portfolio/offer/OfferListItem.java | 2 +- .../io/bitsquare/gui/main/portfolio/offer/OffersModel.java | 4 ++-- .../gui/main/portfolio/pending/PendingTradesModel.java | 4 ++-- src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java | 2 +- src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java | 4 ++-- .../gui/main/trade/createoffer/CreateOfferModel.java | 2 +- .../bitsquare/gui/main/trade/createoffer/CreateOfferPM.java | 2 +- .../gui/main/trade/createoffer/CreateOfferViewCB.java | 2 +- .../java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java | 2 +- .../bitsquare/gui/main/trade/offerbook/OfferBookListItem.java | 2 +- .../io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java | 4 ++-- .../io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java | 4 ++-- .../bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java | 4 ++-- .../io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java | 2 +- .../io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java | 4 ++-- .../bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java | 4 ++-- src/main/java/io/bitsquare/gui/util/BSFormatter.java | 4 ++-- src/main/java/io/bitsquare/msg/MessageFacade.java | 2 +- src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java | 2 +- .../java/io/bitsquare/msg/listeners/OfferBookListener.java | 2 +- src/main/java/io/bitsquare/{trade => offer}/Direction.java | 2 +- src/main/java/io/bitsquare/{trade => offer}/Offer.java | 2 +- src/main/java/io/bitsquare/trade/Contract.java | 1 + src/main/java/io/bitsquare/trade/Trade.java | 2 ++ src/main/java/io/bitsquare/trade/TradeManager.java | 2 ++ .../trade/protocol/createoffer/CreateOfferCoordinator.java | 2 +- .../trade/protocol/createoffer/tasks/PublishOfferToDHT.java | 2 +- .../trade/protocol/createoffer/tasks/VerifyOffer.java | 2 +- .../protocol/trade/offerer/BuyerAcceptsOfferProtocol.java | 2 +- .../trade/offerer/BuyerAcceptsOfferProtocolListener.java | 2 +- .../protocol/trade/offerer/tasks/VerifyAndSignContract.java | 2 +- .../trade/protocol/trade/taker/SellerTakesOfferProtocol.java | 2 +- .../protocol/trade/taker/tasks/CreateAndSignContract.java | 2 +- 34 files changed, 46 insertions(+), 41 deletions(-) rename src/main/java/io/bitsquare/{trade => offer}/Direction.java (96%) rename src/main/java/io/bitsquare/{trade => offer}/Offer.java (99%) diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java index 4db4756aa7..453884402b 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.gui.UIModel; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java index 70ed12c71f..51cec54090 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio.offer; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; /** * We could remove that wrapper if it is not needed for additional UI only fields. diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java index cdc27a3451..2e067cec85 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.portfolio.offer; import io.bitsquare.gui.UIModel; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java index 31eac954fe..d78a34e3e7 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java @@ -22,8 +22,8 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.listeners.TxConfidenceListener; import io.bitsquare.gui.UIModel; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java b/src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java index e65a0cd346..253590b00a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.trade; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java index 7e7b80f649..910ce9a3a8 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java @@ -24,8 +24,8 @@ import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB; import io.bitsquare.gui.main.trade.offerbook.OfferBookViewCB; import io.bitsquare.gui.main.trade.takeoffer.TakeOfferViewCB; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java index bd4fc104f4..b7bc9eb5d1 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java @@ -26,9 +26,9 @@ import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.gui.UIModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; +import io.bitsquare.offer.Direction; import io.bitsquare.persistence.Persistence; import io.bitsquare.settings.Settings; -import io.bitsquare.trade.Direction; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java index 45fc40ef04..c8dfecadab 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java @@ -24,7 +24,7 @@ import io.bitsquare.gui.util.validation.BtcValidator; import io.bitsquare.gui.util.validation.FiatValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; -import io.bitsquare.trade.Direction; +import io.bitsquare.offer.Direction; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index a63dada893..39c968a6bb 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -31,7 +31,7 @@ import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.BSResources; -import io.bitsquare.trade.Direction; +import io.bitsquare.offer.Direction; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java index 55470fc053..e962e6b451 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java @@ -22,7 +22,7 @@ import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OfferBookListener; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import io.bitsquare.user.User; import io.bitsquare.util.Utilities; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java index 47ea51087f..40b9119509 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.trade.offerbook; import io.bitsquare.locale.Country; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java index 355e9041b0..f625a8a7c7 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java @@ -22,9 +22,9 @@ import io.bitsquare.gui.UIModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import io.bitsquare.settings.Settings; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java index 8845e5940d..d15de26015 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java @@ -23,8 +23,8 @@ import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.OptionalBtcValidator; import io.bitsquare.gui.util.validation.OptionalFiatValidator; import io.bitsquare.locale.BSResources; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java index 7a8d188c2d..a761de2ada 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java @@ -28,8 +28,8 @@ import io.bitsquare.gui.util.validation.OptionalBtcValidator; import io.bitsquare.gui.util.validation.OptionalFiatValidator; import io.bitsquare.locale.BSResources; import io.bitsquare.locale.Country; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java index a67f7eccf9..fc9196f9fa 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java @@ -22,9 +22,9 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.gui.UIModel; +import io.bitsquare.offer.Offer; import io.bitsquare.persistence.Persistence; import io.bitsquare.settings.Settings; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java index 48afc5b312..931587ab89 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java @@ -23,8 +23,8 @@ import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java index de51061850..cbeeec5d58 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java @@ -32,8 +32,8 @@ import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.BSResources; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import org.bitcoinj.core.Coin; diff --git a/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/src/main/java/io/bitsquare/gui/util/BSFormatter.java index 5d04eb8d4f..b39c366086 100644 --- a/src/main/java/io/bitsquare/gui/util/BSFormatter.java +++ b/src/main/java/io/bitsquare/gui/util/BSFormatter.java @@ -20,8 +20,8 @@ package io.bitsquare.gui.util; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.locale.BSResources; import io.bitsquare.locale.Country; -import io.bitsquare.trade.Direction; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import io.bitsquare.user.User; import org.bitcoinj.core.Coin; diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java index 92795b3193..f6d6de4c7a 100644 --- a/src/main/java/io/bitsquare/msg/MessageFacade.java +++ b/src/main/java/io/bitsquare/msg/MessageFacade.java @@ -26,7 +26,7 @@ import io.bitsquare.msg.listeners.IncomingMessageListener; import io.bitsquare.msg.listeners.OfferBookListener; import io.bitsquare.msg.listeners.OutgoingMessageListener; import io.bitsquare.network.Peer; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import java.security.PublicKey; diff --git a/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java b/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java index 595f952192..b974144bf6 100644 --- a/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java +++ b/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java @@ -27,7 +27,7 @@ import io.bitsquare.msg.listeners.OfferBookListener; import io.bitsquare.msg.listeners.OutgoingMessageListener; import io.bitsquare.network.Peer; import io.bitsquare.network.tomp2p.TomP2PPeer; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import io.bitsquare.user.User; import com.google.common.util.concurrent.FutureCallback; diff --git a/src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java b/src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java index 1b6054fda1..8a6edae6dc 100644 --- a/src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java +++ b/src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java @@ -17,7 +17,7 @@ package io.bitsquare.msg.listeners; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import java.util.List; diff --git a/src/main/java/io/bitsquare/trade/Direction.java b/src/main/java/io/bitsquare/offer/Direction.java similarity index 96% rename from src/main/java/io/bitsquare/trade/Direction.java rename to src/main/java/io/bitsquare/offer/Direction.java index 82ddb645d5..d7fe57800d 100644 --- a/src/main/java/io/bitsquare/trade/Direction.java +++ b/src/main/java/io/bitsquare/offer/Direction.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade; +package io.bitsquare.offer; public enum Direction { BUY, SELL diff --git a/src/main/java/io/bitsquare/trade/Offer.java b/src/main/java/io/bitsquare/offer/Offer.java similarity index 99% rename from src/main/java/io/bitsquare/trade/Offer.java rename to src/main/java/io/bitsquare/offer/Offer.java index d0f3ad33cb..8cfa2940e4 100644 --- a/src/main/java/io/bitsquare/trade/Offer.java +++ b/src/main/java/io/bitsquare/offer/Offer.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade; +package io.bitsquare.offer; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.bank.BankAccountType; diff --git a/src/main/java/io/bitsquare/trade/Contract.java b/src/main/java/io/bitsquare/trade/Contract.java index 4b389c2211..e42891ce17 100644 --- a/src/main/java/io/bitsquare/trade/Contract.java +++ b/src/main/java/io/bitsquare/trade/Contract.java @@ -18,6 +18,7 @@ package io.bitsquare.trade; import io.bitsquare.bank.BankAccount; +import io.bitsquare.offer.Offer; import io.bitsquare.util.DSAKeyUtil; import org.bitcoinj.core.Coin; diff --git a/src/main/java/io/bitsquare/trade/Trade.java b/src/main/java/io/bitsquare/trade/Trade.java index 0b5c3e9e84..719512357d 100644 --- a/src/main/java/io/bitsquare/trade/Trade.java +++ b/src/main/java/io/bitsquare/trade/Trade.java @@ -17,6 +17,8 @@ package io.bitsquare.trade; +import io.bitsquare.offer.Offer; + import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; import org.bitcoinj.utils.Fiat; diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java index e8910bda8b..7956036edb 100644 --- a/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/src/main/java/io/bitsquare/trade/TradeManager.java @@ -23,6 +23,8 @@ import io.bitsquare.crypto.CryptoFacade; import io.bitsquare.msg.Message; import io.bitsquare.msg.MessageFacade; import io.bitsquare.network.Peer; +import io.bitsquare.offer.Direction; +import io.bitsquare.offer.Offer; import io.bitsquare.persistence.Persistence; import io.bitsquare.settings.Settings; import io.bitsquare.trade.handlers.ErrorMessageHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java index f47f2be6b5..4e17d6d897 100644 --- a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java +++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java @@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.createoffer; import io.bitsquare.btc.WalletFacade; import io.bitsquare.msg.MessageFacade; +import io.bitsquare.offer.Offer; import io.bitsquare.persistence.Persistence; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.TransactionResultHandler; import io.bitsquare.trade.protocol.createoffer.tasks.BroadCastOfferFeeTx; diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java index 75d4a0af5a..d5611bd519 100644 --- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java +++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.createoffer.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.AddOfferListener; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.ResultHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/VerifyOffer.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/VerifyOffer.java index 45323e40b3..d3857a74bb 100644 --- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/VerifyOffer.java +++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/VerifyOffer.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.createoffer.tasks; import io.bitsquare.btc.Restrictions; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.ResultHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java index 7e5b5c606b..a23a004cae 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java @@ -24,8 +24,8 @@ import io.bitsquare.btc.WalletFacade; import io.bitsquare.crypto.CryptoFacade; import io.bitsquare.msg.MessageFacade; import io.bitsquare.network.Peer; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateDepositTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.HandleTakeOfferRequest; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java index 610600de2d..d9ab268099 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.offerer; -import io.bitsquare.trade.Offer; +import io.bitsquare.offer.Offer; import org.bitcoinj.core.Transaction; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java index 7caaa5d2e8..a8afea8c00 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java @@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.crypto.CryptoFacade; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.util.Utilities; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java index d29cfc46d2..431cf2415a 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java @@ -23,8 +23,8 @@ import io.bitsquare.btc.WalletFacade; import io.bitsquare.crypto.CryptoFacade; import io.bitsquare.msg.MessageFacade; import io.bitsquare.network.Peer; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java index 54195001a4..ea634dfa75 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java @@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.crypto.CryptoFacade; +import io.bitsquare.offer.Offer; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.Offer; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.util.Utilities;