mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, TradeUtil, TradeTxException to package bisq.core.trade.bisq_v1

Browse Source
This commit is contained in:
chimp1984 2021-10-19 23:18:38 +02:00
parent 3b7a14cd3a
commit ac8dd031b3
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
20 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/api/CoreTradesService.java
View File

@ -23,8 +23,8 @@ import bisq.core.offer.Offer;
import bisq.core.offer.OfferUtil;
import bisq.core.offer.bisq_v1.TakeOfferModel;
import bisq.core.trade.TradeManager;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.TradeUtil;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.BuyerProtocol;

2
core/src/main/java/bisq/core/app/BisqSetup.java
View File

@ -42,7 +42,7 @@ import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.TradeTxException;
import bisq.core.trade.bisq_v1.TradeTxException;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import bisq.core.util.FormattingUtils;

2
core/src/main/java/bisq/core/support/dispute/DisputeManager.java
View File

@ -35,9 +35,9 @@ import bisq.core.support.dispute.messages.DisputeResultMessage;
import bisq.core.support.dispute.messages.OpenNewDisputeMessage;
import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.TradeManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.Trade;

3
core/src/main/java/bisq/core/trade/TradeManager.java
View File

@ -31,8 +31,11 @@ import bisq.core.provider.price.PriceFeedService;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.DumpDelayedPayoutTx;
import bisq.core.trade.bisq_v1.FailedTradesManager;
import bisq.core.trade.bisq_v1.TradeResultHandler;
import bisq.core.trade.bisq_v1.TradeTxException;
import bisq.core.trade.bisq_v1.TradeUtil;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;

1
core/src/main/java/bisq/core/trade/bisq_v1/ClosedTradableManager.java
View File

@ -19,7 +19,6 @@ package bisq.core.trade.bisq_v1;
import bisq.core.offer.Offer;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.DumpDelayedPayoutTx;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.Trade;

2
core/src/main/java/bisq/core/trade/DumpDelayedPayoutTx.java → core/src/main/java/bisq/core/trade/bisq_v1/DumpDelayedPayoutTx.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.bisq_v1;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.TradableList;

2
core/src/main/java/bisq/core/trade/bisq_v1/FailedTradesManager.java
View File

@ -21,8 +21,6 @@ import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.DumpDelayedPayoutTx;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.Trade;

2
core/src/main/java/bisq/core/trade/TradeDataValidation.java → core/src/main/java/bisq/core/trade/bisq_v1/TradeDataValidation.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.dao.DaoFacade;

2
core/src/main/java/bisq/core/trade/TradeTxException.java → core/src/main/java/bisq/core/trade/bisq_v1/TradeTxException.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.bisq_v1;
public class TradeTxException extends Exception {
public TradeTxException(String message) {

2
core/src/main/java/bisq/core/trade/TradeUtil.java → core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesPreparedDelayedPayoutTx.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.bisq_v1.tasks.buyer;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/seller/SellerCreatesDelayedPayoutTx.java
View File

@ -19,7 +19,7 @@ package bisq.core.trade.protocol.bisq_v1.tasks.seller;
import bisq.core.btc.wallet.TradeWalletService;
import bisq.core.dao.governance.param.Param;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.protocol.bisq_v1.tasks.TradeTask;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
View File

@ -46,7 +46,7 @@ import bisq.core.support.dispute.DisputeManager;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.util.FormattingUtils;
import bisq.core.util.ParsingUtils;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View File

@ -47,8 +47,8 @@ import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.traderchat.TraderChatManager;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.TradeManager;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.BuyerTrade;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.trade.model.bisq_v1.Trade;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View File

@ -32,8 +32,8 @@ import bisq.core.offer.Offer;
import bisq.core.offer.OfferUtil;
import bisq.core.provider.fee.FeeService;
import bisq.core.provider.mempool.MempoolService;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.bisq_v1.ClosedTradableManager;
import bisq.core.trade.bisq_v1.TradeUtil;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.user.User;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java
View File

@ -22,7 +22,7 @@ import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel;
import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView;
import bisq.core.locale.Res;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
public class BuyerStep1View extends TradeStepView {

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View File

@ -97,7 +97,7 @@ import bisq.core.payment.payload.PaymentMethod;
import bisq.core.payment.payload.SwiftAccountPayload;
import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload;
import bisq.core.payment.payload.WesternUnionAccountPayload;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.util.VolumeUtil;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java
View File

@ -22,7 +22,7 @@ import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel;
import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView;
import bisq.core.locale.Res;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.bisq_v1.TradeDataValidation;
public class SellerStep1View extends TradeStepView {

4
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
View File

@ -34,8 +34,8 @@ import bisq.core.support.dispute.DisputeManager;
import bisq.core.support.dispute.agent.MultipleHolderNameDetection;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.TradeManager;
import bisq.core.trade.bisq_v1.TradeDataValidation;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences;
import bisq.core.util.coin.CoinFormatter;
@ -64,7 +64,7 @@ import java.util.List;
import org.jetbrains.annotations.NotNull;
import static bisq.core.trade.TradeDataValidation.ValidationException;
import static bisq.core.trade.bisq_v1.TradeDataValidation.ValidationException;
import static bisq.desktop.util.FormBuilder.getIconForLabel;
public abstract class DisputeAgentView extends DisputeView implements MultipleHolderNameDetection.Listener {