Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-18 14:55:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduce io.bitsquare.offer package

Browse Source 
Move io.bitsquare.trade.{Offer,Directory=>}.offer, in order to remove
the final cycle between the msg and trade packages
This commit is contained in:
Chris Beams 2014-11-04 23:22:32 +01:00
parent 8eb988616f
commit 922a2cd22f
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
34 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java
View File

@ -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.

4
src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java
View File

@ -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;

2
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java
View File

@ -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;

4
src/main/java/io/bitsquare/gui/util/BSFormatter.java
View File

@ -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;

2
src/main/java/io/bitsquare/msg/MessageFacade.java
View File

@ -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;

2
src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java
View File

@ -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;

2
src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java
View File

@ -17,7 +17,7 @@
package io.bitsquare.msg.listeners;
import io.bitsquare.trade.Offer;
import io.bitsquare.offer.Offer;
import java.util.List;

2
src/main/java/io/bitsquare/trade/Direction.java → src/main/java/io/bitsquare/offer/Direction.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade;
package io.bitsquare.offer;
public enum Direction {
BUY, SELL

2
src/main/java/io/bitsquare/trade/Offer.java → src/main/java/io/bitsquare/offer/Offer.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade;
package io.bitsquare.offer;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.bank.BankAccountType;

1
src/main/java/io/bitsquare/trade/Contract.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/Trade.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/TradeManager.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/VerifyOffer.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java
View File

@ -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;

2
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
View File

@ -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;