mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 22:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Repackage {io.bisq.core => bisq.core}

Browse source
This commit is contained in:
Chris Beams 2018-03-12 08:30:27 +01:00
parent 3146ccabe0
commit ac652ea388
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
175 changed files with 819 additions and 819 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/io/bisq/gui/GuiModule.java
View file

@ -21,7 +21,7 @@ import com.google.inject.Singleton;
import com.google.inject.name.Names;
import bisq.common.app.AppModule;
import bisq.common.locale.Res;
import io.bisq.core.app.AppOptionKeys;
import bisq.core.app.AppOptionKeys;
import io.bisq.gui.common.fxml.FxmlViewLoader;
import io.bisq.gui.common.view.CachingViewLoader;
import io.bisq.gui.common.view.ViewFactory;

2
src/main/java/io/bisq/gui/SystemTray.java
View file

@ -20,7 +20,7 @@ package io.bisq.gui;
import bisq.common.UserThread;
import bisq.common.locale.Res;
import bisq.common.util.Utilities;
import io.bisq.core.exceptions.BisqException;
import bisq.core.exceptions.BisqException;
import io.bisq.gui.util.GUIUtil;
import io.bisq.gui.util.ImageUtil;
import javafx.application.Platform;

36
src/main/java/io/bisq/gui/app/BisqApp.java
View file

@ -37,24 +37,24 @@ import bisq.common.proto.persistable.PersistedDataHost;
import bisq.common.storage.Storage;
import bisq.common.util.Profiler;
import bisq.common.util.Utilities;
import io.bisq.core.alert.AlertManager;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.arbitration.ArbitratorManager;
import io.bisq.core.arbitration.DisputeManager;
import io.bisq.core.btc.AddressEntryList;
import io.bisq.core.btc.BaseCurrencyNetwork;
import io.bisq.core.btc.wallet.*;
import io.bisq.core.dao.DaoManager;
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
import io.bisq.core.dao.vote.VotingManager;
import io.bisq.core.filter.FilterManager;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.trade.closed.ClosedTradableManager;
import io.bisq.core.trade.failed.FailedTradesManager;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.alert.AlertManager;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.arbitration.DisputeManager;
import bisq.core.btc.AddressEntryList;
import bisq.core.btc.BaseCurrencyNetwork;
import bisq.core.btc.wallet.*;
import bisq.core.dao.DaoManager;
import bisq.core.dao.request.compensation.CompensationRequestManager;
import bisq.core.dao.vote.VotingManager;
import bisq.core.filter.FilterManager;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.Navigation;
import io.bisq.gui.SystemTray;
import io.bisq.gui.common.UITimer;

10
src/main/java/io/bisq/gui/app/BisqAppMain.java
View file

@ -18,15 +18,15 @@
package io.bisq.gui.app;
import bisq.common.util.Utilities;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.app.BisqExecutable;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.app.BisqExecutable;
import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import static io.bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
import static io.bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
import static bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
import static bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
public class BisqAppMain extends BisqExecutable {

30
src/main/java/io/bisq/gui/app/BisqAppModule.java
View file

@ -26,21 +26,21 @@ import bisq.common.crypto.KeyStorage;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistenceProtoResolver;
import bisq.common.storage.Storage;
import io.bisq.core.alert.AlertModule;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import io.bisq.core.network.p2p.seed.SeedNodeAddressLookup;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.proto.network.CoreNetworkProtoResolver;
import io.bisq.core.proto.persistable.CorePersistenceProtoResolver;
import io.bisq.core.trade.TradeModule;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.alert.AlertModule;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.arbitration.ArbitratorModule;
import bisq.core.btc.BitcoinModule;
import bisq.core.dao.DaoModule;
import bisq.core.filter.FilterModule;
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import bisq.core.network.p2p.seed.SeedNodeAddressLookup;
import bisq.core.offer.OfferModule;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.core.proto.persistable.CorePersistenceProtoResolver;
import bisq.core.trade.TradeModule;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.GuiModule;
import io.bisq.gui.common.view.CachingViewLoader;
import io.bisq.gui.main.overlays.notifications.NotificationCenter;

6
src/main/java/io/bisq/gui/components/BalanceWithConfirmationTextField.java
View file

@ -17,9 +17,9 @@
package io.bisq.gui.components;
import io.bisq.core.btc.listeners.AddressConfidenceListener;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.listeners.AddressConfidenceListener;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.GUIUtil;

8
src/main/java/io/bisq/gui/components/PeerInfoIcon.java
View file

@ -2,10 +2,10 @@ package io.bisq.gui.components;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import io.bisq.core.alert.PrivateNotificationManager;
import io.bisq.core.offer.Offer;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.user.Preferences;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.offer.Offer;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.user.Preferences;
import io.bisq.gui.main.overlays.editor.PeerInfoWithTagEditor;
import io.bisq.gui.util.BSFormatter;
import bisq.network.p2p.NodeAddress;

2
src/main/java/io/bisq/gui/components/SeparatedPhaseBars.java
View file

@ -2,7 +2,7 @@ package io.bisq.gui.components;
import bisq.common.UserThread;
import bisq.common.locale.Res;
import io.bisq.core.dao.DaoPeriodService;
import bisq.core.dao.DaoPeriodService;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleDoubleProperty;

6
src/main/java/io/bisq/gui/components/TxIdTextField.java
View file

@ -21,9 +21,9 @@ import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.locale.Res;
import bisq.common.util.Utilities;
import io.bisq.core.btc.listeners.TxConfidenceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.user.Preferences;
import bisq.core.btc.listeners.TxConfidenceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.user.Preferences;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.GUIUtil;
import javafx.scene.control.Label;

10
src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.AliPayAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.AliPayAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.AliPayAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AliPayAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java
View file

@ -21,11 +21,11 @@ import bisq.common.locale.*;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import bisq.common.util.Tuple4;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CountryBasedPaymentAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.BankAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.main.overlays.popups.Popup;
import io.bisq.gui.util.BSFormatter;

10
src/main/java/io/bisq/gui/components/paymentmethods/CashAppForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CashAppAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.CashAppAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CashAppAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.CashAppAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
View file

@ -21,11 +21,11 @@ import bisq.common.locale.*;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import bisq.common.util.Tuple4;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CountryBasedPaymentAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.CashDepositAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.CashDepositAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.main.overlays.popups.Popup;
import io.bisq.gui.util.BSFormatter;

10
src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.ChaseQuickPayAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.ChaseQuickPayAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.ChaseQuickPayAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.ChaseQuickPayAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.FormBuilder;

10
src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.ClearXchangeAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.ClearXchangeAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.ClearXchangeAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.ClearXchangeAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.FormBuilder;

10
src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java
View file

@ -21,11 +21,11 @@ import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import bisq.common.util.Tuple2;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.CryptoCurrencyAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.CryptoCurrencyAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.FasterPaymentsAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.FasterPaymentsAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.FasterPaymentsAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.FasterPaymentsAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.InteracETransferAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.InteracETransferAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.InteracETransferAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.InteracETransferAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.FormBuilder;

10
src/main/java/io/bisq/gui/components/paymentmethods/MoneyBeamForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.MoneyBeamAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.MoneyBeamAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.MoneyBeamAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.MoneyBeamAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

6
src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java
View file

@ -17,9 +17,9 @@
package io.bisq.gui.components.paymentmethods;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.validation.InputValidator;
import javafx.scene.layout.GridPane;

10
src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.OKPayAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.OKPayAccountPayload;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.OKPayAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.OKPayAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.AutoTooltipCheckBox;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;

8
src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java
View file

@ -22,10 +22,10 @@ import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import bisq.common.util.Tuple3;
import bisq.common.util.Utilities;
import io.bisq.core.offer.Offer;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;
import bisq.core.offer.Offer;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import io.bisq.gui.components.InfoTextField;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.main.overlays.popups.Popup;

10
src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java
View file

@ -20,11 +20,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.FiatCurrency;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.PerfectMoneyAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.PerfectMoneyAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PerfectMoneyAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PerfectMoneyAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/PopmoneyForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.PopmoneyAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.PopmoneyAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PopmoneyAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PopmoneyAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/RevolutForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.RevolutAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.RevolutAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.RevolutAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.RevolutAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

8
src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java
View file

@ -20,10 +20,10 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.BankUtil;
import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CountryBasedPaymentAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.validation.InputValidator;

12
src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
View file

@ -18,12 +18,12 @@
package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.*;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CountryBasedPaymentAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.SepaAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.SepaAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.SepaAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.SepaAccountPayload;
import io.bisq.gui.components.AutoTooltipCheckBox;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;

12
src/main/java/io/bisq/gui/components/paymentmethods/SepaInstantForm.java
View file

@ -18,12 +18,12 @@
package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.*;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CountryBasedPaymentAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.SepaInstantAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.SepaInstantAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.SepaInstantAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.SepaInstantAccountPayload;
import io.bisq.gui.components.AutoTooltipCheckBox;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;

8
src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java
View file

@ -20,10 +20,10 @@ package io.bisq.gui.components.paymentmethods;
import com.google.common.base.Joiner;
import bisq.common.locale.Res;
import bisq.common.util.Tuple3;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.SpecificBanksAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.SpecificBanksAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.validation.InputValidator;

10
src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.SwishAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.SwishAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.SwishAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.SwishAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.USPostalMoneyOrderAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.USPostalMoneyOrderAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.USPostalMoneyOrderAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/UpholdForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.UpholdAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.UpholdAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.UpholdAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.UpholdAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/VenmoForm.java
View file

@ -19,11 +19,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.VenmoAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.VenmoAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.VenmoAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.VenmoAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.Layout;

10
src/main/java/io/bisq/gui/components/paymentmethods/WesternUnionForm.java
View file

@ -20,11 +20,11 @@ package io.bisq.gui.components.paymentmethods;
import bisq.common.locale.*;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CountryBasedPaymentAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.PaymentAccountPayload;
import io.bisq.core.payment.payload.WesternUnionAccountPayload;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.WesternUnionAccountPayload;
import io.bisq.gui.components.InputTextField;
import io.bisq.gui.main.overlays.popups.Popup;
import io.bisq.gui.util.BSFormatter;

4
src/main/java/io/bisq/gui/main/MainView.java
View file

@ -24,8 +24,8 @@ import bisq.common.app.Version;
import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.exceptions.BisqException;
import bisq.core.app.BisqEnvironment;
import bisq.core.exceptions.BisqException;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.*;
import io.bisq.gui.components.AutoTooltipButton;

70
src/main/java/io/bisq/gui/main/MainViewModel.java
View file

@ -31,41 +31,41 @@ import bisq.common.crypto.SealedAndSigned;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.alert.Alert;
import io.bisq.core.alert.AlertManager;
import io.bisq.core.alert.PrivateNotificationManager;
import io.bisq.core.alert.PrivateNotificationPayload;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.app.SetupUtils;
import io.bisq.core.arbitration.ArbitratorManager;
import io.bisq.core.arbitration.Dispute;
import io.bisq.core.arbitration.DisputeManager;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsManager;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.dao.DaoManager;
import io.bisq.core.filter.FilterManager;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.PerfectMoneyAccount;
import io.bisq.core.payment.payload.PaymentMethod;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.provider.price.MarketPrice;
import io.bisq.core.provider.price.PriceFeedService;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.trade.closed.ClosedTradableManager;
import io.bisq.core.trade.failed.FailedTradesManager;
import io.bisq.core.trade.statistics.TradeStatisticsManager;
import io.bisq.core.user.DontShowAgainLookup;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.alert.Alert;
import bisq.core.alert.AlertManager;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.alert.PrivateNotificationPayload;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.app.SetupUtils;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.arbitration.Dispute;
import bisq.core.arbitration.DisputeManager;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.dao.DaoManager;
import bisq.core.filter.FilterManager;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PerfectMoneyAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.provider.fee.FeeService;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.common.model.ViewModel;
import io.bisq.gui.components.BalanceWithConfirmationTextField;
import io.bisq.gui.components.TxIdTextField;

4
src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
View file

@ -23,8 +23,8 @@ import bisq.common.UserThread;
import bisq.common.locale.LanguageUtil;
import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.arbitration.Arbitrator;
import bisq.core.app.AppOptionKeys;
import bisq.core.arbitration.Arbitrator;
import io.bisq.gui.common.view.ActivatableViewAndModel;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipButton;

10
src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
View file

@ -22,11 +22,11 @@ import bisq.common.crypto.KeyRing;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.handlers.ResultHandler;
import bisq.common.locale.LanguageUtil;
import io.bisq.core.arbitration.Arbitrator;
import io.bisq.core.arbitration.ArbitratorManager;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.user.User;
import bisq.core.arbitration.Arbitrator;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.user.User;
import io.bisq.gui.common.model.ActivatableViewModel;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;

16
src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View file

@ -22,14 +22,14 @@ import bisq.common.locale.CryptoCurrency;
import bisq.common.locale.FiatCurrency;
import bisq.common.locale.TradeCurrency;
import bisq.common.proto.persistable.PersistenceProtoResolver;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.PaymentMethod;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.trade.TradeManager;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.common.model.ActivatableDataModel;
import io.bisq.gui.util.GUIUtil;
import javafx.collections.FXCollections;

8
src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java
View file

@ -23,10 +23,10 @@ import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.PaymentAccountFactory;
import io.bisq.core.payment.payload.PaymentMethod;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountFactory;
import bisq.core.payment.payload.PaymentMethod;
import io.bisq.gui.common.view.ActivatableViewAndModel;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipButton;

2
src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java
View file

@ -18,7 +18,7 @@
package io.bisq.gui.main.account.content.altcoinaccounts;
import com.google.inject.Inject;
import io.bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccount;
import io.bisq.gui.common.model.ActivatableWithDataModel;
import io.bisq.gui.common.model.ViewModel;
import javafx.collections.ObservableList;

2
src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.account.content.arbitratorselection;
import io.bisq.core.arbitration.Arbitrator;
import bisq.core.arbitration.Arbitrator;
import io.bisq.gui.util.BSFormatter;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;

8
src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java
View file

@ -20,10 +20,10 @@ package io.bisq.gui.main.account.content.arbitratorselection;
import com.google.inject.Inject;
import bisq.common.crypto.KeyRing;
import bisq.common.locale.LanguageUtil;
import io.bisq.core.arbitration.Arbitrator;
import io.bisq.core.arbitration.ArbitratorManager;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.arbitration.Arbitrator;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.common.model.ActivatableDataModel;
import io.bisq.gui.util.BSFormatter;
import bisq.network.p2p.NodeAddress;

6
src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java
View file

@ -21,9 +21,9 @@ import bisq.common.locale.Res;
import bisq.common.storage.FileUtil;
import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.user.Preferences;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.InputTextField;

16
src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java
View file

@ -23,14 +23,14 @@ import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.FiatCurrency;
import bisq.common.locale.TradeCurrency;
import bisq.common.proto.persistable.PersistenceProtoResolver;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;
import io.bisq.core.payment.payload.PaymentMethod;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.trade.TradeManager;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.common.model.ActivatableDataModel;
import io.bisq.gui.util.GUIUtil;
import javafx.collections.FXCollections;

6
src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java
View file

@ -21,9 +21,9 @@ import bisq.common.UserThread;
import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.payment.*;
import io.bisq.core.payment.payload.PaymentMethod;
import bisq.core.app.BisqEnvironment;
import bisq.core.payment.*;
import bisq.core.payment.payload.PaymentMethod;
import io.bisq.gui.common.view.ActivatableViewAndModel;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipButton;

2
src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java
View file

@ -18,7 +18,7 @@
package io.bisq.gui.main.account.content.fiataccounts;
import com.google.inject.Inject;
import io.bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccount;
import io.bisq.gui.common.model.ActivatableWithDataModel;
import io.bisq.gui.common.model.ViewModel;
import javafx.collections.ObservableList;

4
src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java
View file

@ -20,8 +20,8 @@ package io.bisq.gui.main.account.content.password;
import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import io.bisq.core.btc.wallet.WalletsManager;
import io.bisq.core.crypto.ScryptUtil;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.crypto.ScryptUtil;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;

6
src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
View file

@ -21,9 +21,9 @@ import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import bisq.common.locale.Res;
import bisq.common.storage.Storage;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsManager;
import io.bisq.core.user.DontShowAgainLookup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.user.DontShowAgainLookup;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.main.overlays.popups.Popup;

2
src/main/java/io/bisq/gui/main/dao/DaoView.java
View file

@ -19,7 +19,7 @@ package io.bisq.gui.main.dao;
import bisq.common.app.DevEnv;
import bisq.common.locale.Res;
import io.bisq.core.app.BisqEnvironment;
import bisq.core.app.BisqEnvironment;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.model.Activatable;
import io.bisq.gui.common.view.*;

8
src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java
View file

@ -18,10 +18,10 @@
package io.bisq.gui.main.dao.compensation;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.request.compensation.CompensationRequestPayload;
import io.bisq.core.dao.request.compensation.consensus.Restrictions;
import io.bisq.core.provider.fee.FeeService;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.request.compensation.CompensationRequestPayload;
import bisq.core.dao.request.compensation.consensus.Restrictions;
import bisq.core.provider.fee.FeeService;
import io.bisq.gui.components.*;
import io.bisq.gui.util.BsqFormatter;
import io.bisq.gui.util.GUIUtil;

14
src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java
View file

@ -18,13 +18,13 @@
package io.bisq.gui.main.dao.compensation;
import bisq.common.locale.Res;
import io.bisq.core.btc.listeners.TxConfidenceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.vo.Tx;
import io.bisq.core.dao.request.compensation.CompensationRequest;
import bisq.core.btc.listeners.TxConfidenceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import bisq.core.dao.blockchain.BsqBlockChainListener;
import bisq.core.dao.blockchain.vo.Tx;
import bisq.core.dao.request.compensation.CompensationRequest;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.BsqFormatter;
import javafx.beans.value.ChangeListener;

12
src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java
View file

@ -19,12 +19,12 @@ package io.bisq.gui.main.dao.compensation;
import bisq.common.UserThread;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.request.compensation.CompensationRequest;
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import bisq.core.dao.blockchain.BsqBlockChainListener;
import bisq.core.dao.request.compensation.CompensationRequest;
import bisq.core.dao.request.compensation.CompensationRequestManager;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.util.BsqFormatter;

16
src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
View file

@ -18,14 +18,14 @@
package io.bisq.gui.main.dao.compensation.active;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.DaoPeriodService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.request.compensation.CompensationRequest;
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
import io.bisq.core.provider.fee.FeeService;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.DaoPeriodService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import bisq.core.dao.blockchain.BsqBlockChainListener;
import bisq.core.dao.request.compensation.CompensationRequest;
import bisq.core.dao.request.compensation.CompensationRequestManager;
import bisq.core.provider.fee.FeeService;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.SeparatedPhaseBars;

24
src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
View file

@ -20,18 +20,18 @@ package io.bisq.gui.main.dao.compensation.create;
import com.google.common.util.concurrent.FutureCallback;
import bisq.common.crypto.KeyRing;
import bisq.common.locale.Res;
import io.bisq.core.btc.exceptions.TransactionVerificationException;
import io.bisq.core.btc.exceptions.WalletException;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.InsufficientBsqException;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.dao.request.compensation.CompensationAmountException;
import io.bisq.core.dao.request.compensation.CompensationRequest;
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
import io.bisq.core.dao.request.compensation.CompensationRequestPayload;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.util.CoinUtil;
import bisq.core.btc.exceptions.TransactionVerificationException;
import bisq.core.btc.exceptions.WalletException;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.InsufficientBsqException;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.dao.request.compensation.CompensationAmountException;
import bisq.core.dao.request.compensation.CompensationRequest;
import bisq.core.dao.request.compensation.CompensationRequestManager;
import bisq.core.dao.request.compensation.CompensationRequestPayload;
import bisq.core.provider.fee.FeeService;
import bisq.core.util.CoinUtil;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.main.dao.compensation.CompensationRequestDisplay;

12
src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java
View file

@ -18,12 +18,12 @@
package io.bisq.gui.main.dao.compensation.past;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.DaoPeriodService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.DaoPeriodService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import bisq.core.dao.blockchain.BsqBlockChainListener;
import bisq.core.dao.request.compensation.CompensationRequestManager;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.SeparatedPhaseBars;
import io.bisq.gui.main.dao.compensation.CompensationRequestDisplay;

8
src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java
View file

@ -19,10 +19,10 @@ package io.bisq.gui.main.dao.voting.vote;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.request.compensation.CompensationRequest;
import io.bisq.core.dao.request.compensation.CompensationRequestPayload;
import io.bisq.core.dao.vote.CompensationRequestVoteItem;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.request.compensation.CompensationRequest;
import bisq.core.dao.request.compensation.CompensationRequestPayload;
import bisq.core.dao.vote.CompensationRequestVoteItem;
import io.bisq.gui.components.AutoTooltipButton;
import io.bisq.gui.components.AutoTooltipCheckBox;
import io.bisq.gui.components.HyperlinkWithIcon;

4
src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java
View file

@ -19,8 +19,8 @@ package io.bisq.gui.main.dao.voting.vote;
import bisq.common.UserThread;
import bisq.common.locale.Res;
import io.bisq.core.dao.vote.VoteItem;
import io.bisq.core.dao.vote.VotingDefaultValues;
import bisq.core.dao.vote.VoteItem;
import bisq.core.dao.vote.VotingDefaultValues;
import io.bisq.gui.components.AutoTooltipButton;
import io.bisq.gui.components.AutoTooltipLabel;
import io.bisq.gui.components.InputTextField;

20
src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java
View file

@ -20,16 +20,16 @@ package io.bisq.gui.main.dao.voting.vote;
import com.google.common.util.concurrent.FutureCallback;
import bisq.common.UserThread;
import bisq.common.locale.Res;
import io.bisq.core.btc.exceptions.TransactionVerificationException;
import io.bisq.core.btc.exceptions.WalletException;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.dao.request.compensation.CompensationRequest;
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
import io.bisq.core.dao.vote.*;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.util.CoinUtil;
import bisq.core.btc.exceptions.TransactionVerificationException;
import bisq.core.btc.exceptions.WalletException;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.dao.request.compensation.CompensationRequest;
import bisq.core.dao.request.compensation.CompensationRequestManager;
import bisq.core.dao.vote.*;
import bisq.core.provider.fee.FeeService;
import bisq.core.util.CoinUtil;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.TitledGroupBg;

4
src/main/java/io/bisq/gui/main/dao/wallet/BsqBalanceUtil.java
View file

@ -18,8 +18,8 @@
package io.bisq.gui.main.dao.wallet;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqBalanceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BsqBalanceListener;
import bisq.core.btc.wallet.BsqWalletService;
import io.bisq.gui.util.BsqFormatter;
import io.bisq.gui.util.Layout;
import javafx.geometry.Pos;

2
src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java
View file

@ -20,7 +20,7 @@ package io.bisq.gui.main.dao.wallet;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.locale.Res;
import io.bisq.core.app.BisqEnvironment;
import bisq.core.app.BisqEnvironment;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.*;
import io.bisq.gui.components.AutoTooltipLabel;

14
src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.java
View file

@ -22,13 +22,13 @@ import bisq.common.locale.Res;
import bisq.common.monetary.Altcoin;
import bisq.common.monetary.Price;
import bisq.common.util.MathUtils;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.node.BsqNode;
import io.bisq.core.dao.node.BsqNodeProvider;
import io.bisq.core.provider.price.MarketPrice;
import io.bisq.core.provider.price.PriceFeedService;
import io.bisq.core.user.Preferences;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.BsqBlockChainListener;
import bisq.core.dao.node.BsqNode;
import bisq.core.dao.node.BsqNodeProvider;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipLabel;

2
src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
View file

@ -18,7 +18,7 @@
package io.bisq.gui.main.dao.wallet.receive;
import bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BsqWalletService;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.BsqAddressTextField;

12
src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
View file

@ -19,12 +19,12 @@ package io.bisq.gui.main.dao.wallet.send;
import com.google.common.util.concurrent.FutureCallback;
import bisq.common.locale.Res;
import io.bisq.core.btc.Restrictions;
import io.bisq.core.btc.wallet.BsqBalanceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.util.CoinUtil;
import bisq.core.btc.Restrictions;
import bisq.core.btc.wallet.BsqBalanceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.util.CoinUtil;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;

12
src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java
View file

@ -18,12 +18,12 @@
package io.bisq.gui.main.dao.wallet.tx;
import bisq.common.locale.Res;
import io.bisq.core.btc.listeners.TxConfidenceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.vo.TxType;
import bisq.core.btc.listeners.TxConfidenceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.vo.TxType;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.BsqFormatter;
import io.bisq.gui.util.GUIUtil;

20
src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java
View file

@ -20,16 +20,16 @@ package io.bisq.gui.main.dao.wallet.tx;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.locale.Res;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.btc.wallet.BsqBalanceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.vo.TxType;
import io.bisq.core.dao.node.BsqNode;
import io.bisq.core.dao.node.BsqNodeProvider;
import io.bisq.core.user.Preferences;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.wallet.BsqBalanceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.BsqBlockChainListener;
import bisq.core.dao.blockchain.vo.TxType;
import bisq.core.dao.node.BsqNode;
import bisq.core.dao.node.BsqNodeProvider;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AddressWithIconAndDirection;

44
src/main/java/io/bisq/gui/main/debug/DebugView.java
View file

@ -18,28 +18,28 @@
package io.bisq.gui.main.debug;
import bisq.common.taskrunner.Task;
import io.bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse;
import io.bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest;
import io.bisq.core.offer.placeoffer.tasks.AddToOfferBook;
import io.bisq.core.offer.placeoffer.tasks.CreateMakerFeeTx;
import io.bisq.core.offer.placeoffer.tasks.ValidateOffer;
import io.bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned;
import io.bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import io.bisq.core.trade.protocol.tasks.buyer.BuyerSendCounterCurrencyTransferStartedMessage;
import io.bisq.core.trade.protocol.tasks.buyer.BuyerSetupPayoutTxListener;
import io.bisq.core.trade.protocol.tasks.buyer_as_maker.BuyerAsMakerCreatesAndSignsDepositTx;
import io.bisq.core.trade.protocol.tasks.buyer_as_maker.BuyerAsMakerSignPayoutTx;
import io.bisq.core.trade.protocol.tasks.buyer_as_taker.BuyerAsTakerCreatesDepositTxInputs;
import io.bisq.core.trade.protocol.tasks.buyer_as_taker.BuyerAsTakerSignAndPublishDepositTx;
import io.bisq.core.trade.protocol.tasks.maker.*;
import io.bisq.core.trade.protocol.tasks.seller.SellerBroadcastPayoutTx;
import io.bisq.core.trade.protocol.tasks.seller.SellerProcessCounterCurrencyTransferStartedMessage;
import io.bisq.core.trade.protocol.tasks.seller.SellerSendPayoutTxPublishedMessage;
import io.bisq.core.trade.protocol.tasks.seller.SellerSignAndFinalizePayoutTx;
import io.bisq.core.trade.protocol.tasks.seller_as_maker.SellerAsMakerCreatesAndSignsDepositTx;
import io.bisq.core.trade.protocol.tasks.seller_as_taker.SellerAsTakerCreatesDepositTxInputs;
import io.bisq.core.trade.protocol.tasks.seller_as_taker.SellerAsTakerSignAndPublishDepositTx;
import io.bisq.core.trade.protocol.tasks.taker.*;
import bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse;
import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest;
import bisq.core.offer.placeoffer.tasks.AddToOfferBook;
import bisq.core.offer.placeoffer.tasks.CreateMakerFeeTx;
import bisq.core.offer.placeoffer.tasks.ValidateOffer;
import bisq.core.trade.protocol.tasks.CheckIfPeerIsBanned;
import bisq.core.trade.protocol.tasks.PublishTradeStatistics;
import bisq.core.trade.protocol.tasks.buyer.BuyerSendCounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.tasks.buyer.BuyerSetupPayoutTxListener;
import bisq.core.trade.protocol.tasks.buyer_as_maker.BuyerAsMakerCreatesAndSignsDepositTx;
import bisq.core.trade.protocol.tasks.buyer_as_maker.BuyerAsMakerSignPayoutTx;
import bisq.core.trade.protocol.tasks.buyer_as_taker.BuyerAsTakerCreatesDepositTxInputs;
import bisq.core.trade.protocol.tasks.buyer_as_taker.BuyerAsTakerSignAndPublishDepositTx;
import bisq.core.trade.protocol.tasks.maker.*;
import bisq.core.trade.protocol.tasks.seller.SellerBroadcastPayoutTx;
import bisq.core.trade.protocol.tasks.seller.SellerProcessCounterCurrencyTransferStartedMessage;
import bisq.core.trade.protocol.tasks.seller.SellerSendPayoutTxPublishedMessage;
import bisq.core.trade.protocol.tasks.seller.SellerSignAndFinalizePayoutTx;
import bisq.core.trade.protocol.tasks.seller_as_maker.SellerAsMakerCreatesAndSignsDepositTx;
import bisq.core.trade.protocol.tasks.seller_as_taker.SellerAsTakerCreatesDepositTxInputs;
import bisq.core.trade.protocol.tasks.seller_as_taker.SellerAsTakerSignAndPublishDepositTx;
import bisq.core.trade.protocol.tasks.taker.*;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.common.view.InitializableView;
import io.bisq.gui.components.TitledGroupBg;

6
src/main/java/io/bisq/gui/main/disputes/DisputesView.java
View file

@ -20,9 +20,9 @@ package io.bisq.gui.main.disputes;
import bisq.common.app.DevEnv;
import bisq.common.crypto.KeyRing;
import bisq.common.locale.Res;
import io.bisq.core.arbitration.Arbitrator;
import io.bisq.core.arbitration.ArbitratorManager;
import io.bisq.core.arbitration.DisputeManager;
import bisq.core.arbitration.Arbitrator;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.arbitration.DisputeManager;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.model.Activatable;
import io.bisq.gui.common.view.*;

8
src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
View file

@ -19,10 +19,10 @@ package io.bisq.gui.main.disputes.arbitrator;
import com.google.inject.name.Named;
import bisq.common.crypto.KeyRing;
import io.bisq.core.alert.PrivateNotificationManager;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.arbitration.DisputeManager;
import io.bisq.core.trade.TradeManager;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.app.AppOptionKeys;
import bisq.core.arbitration.DisputeManager;
import bisq.core.trade.TradeManager;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.main.disputes.trader.TraderDisputeView;
import io.bisq.gui.main.overlays.windows.ContractWindow;

18
src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java
View file

@ -29,15 +29,15 @@ import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.locale.Res;
import bisq.common.util.Utilities;
import io.bisq.core.alert.PrivateNotificationManager;
import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.arbitration.Attachment;
import io.bisq.core.arbitration.Dispute;
import io.bisq.core.arbitration.DisputeManager;
import io.bisq.core.arbitration.messages.DisputeCommunicationMessage;
import io.bisq.core.trade.Contract;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.TradeManager;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.app.AppOptionKeys;
import bisq.core.arbitration.Attachment;
import bisq.core.arbitration.Dispute;
import bisq.core.arbitration.DisputeManager;
import bisq.core.arbitration.messages.DisputeCommunicationMessage;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.*;

8
src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java
View file

@ -18,10 +18,10 @@
package io.bisq.gui.main.funds.deposit;
import bisq.common.locale.Res;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.listeners.TxConfidenceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.listeners.TxConfidenceListener;
import bisq.core.btc.wallet.BtcWalletService;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.GUIUtil;

10
src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java
View file

@ -22,11 +22,11 @@ import bisq.common.UserThread;
import bisq.common.app.DevEnv;
import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.user.Preferences;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.provider.fee.FeeService;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.*;

12
src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java
View file

@ -17,12 +17,12 @@
package io.bisq.gui.main.funds.locked;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletService;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import io.bisq.gui.components.AutoTooltipLabel;
import io.bisq.gui.util.BSFormatter;
import javafx.scene.control.Label;

18
src/main/java/io/bisq/gui/main/funds/locked/LockedView.java
View file

@ -19,15 +19,15 @@ package io.bisq.gui.main.funds.locked;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.locale.Res;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.user.Preferences;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipLabel;

10
src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java
View file

@ -17,11 +17,11 @@
package io.bisq.gui.main.funds.reserved;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.trade.Tradable;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;
import io.bisq.gui.components.AutoTooltipLabel;
import io.bisq.gui.util.BSFormatter;
import javafx.scene.control.Label;

18
src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java
View file

@ -19,15 +19,15 @@ package io.bisq.gui.main.funds.reserved;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.locale.Res;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.user.Preferences;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipLabel;

4
src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactions.java
View file

@ -17,8 +17,8 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.trade.Tradable;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Tradable;
import org.bitcoinj.core.Transaction;
import java.util.List;

2
src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsFactory.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import javax.inject.Inject;

2
src/main/java/io/bisq/gui/main/funds/transactions/DummyTransactionAwareTradable.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.trade.Tradable;
import bisq.core.trade.Tradable;
import org.bitcoinj.core.Transaction;
class DummyTransactionAwareTradable implements TransactionAwareTradable {

10
src/main/java/io/bisq/gui/main/funds/transactions/TradableRepository.java
View file

@ -18,11 +18,11 @@
package io.bisq.gui.main.funds.transactions;
import com.google.common.collect.ImmutableSet;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.trade.closed.ClosedTradableManager;
import io.bisq.core.trade.failed.FailedTradesManager;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.Tradable;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import javax.inject.Inject;
import java.util.Set;

6
src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareOpenOffer.java
View file

@ -17,9 +17,9 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.trade.Tradable;
import bisq.core.offer.Offer;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;
import org.bitcoinj.core.Transaction;
class TransactionAwareOpenOffer implements TransactionAwareTradable {

2
src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradable.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.trade.Tradable;
import bisq.core.trade.Tradable;
import org.bitcoinj.core.Transaction;
interface TransactionAwareTradable {

8
src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactory.java
View file

@ -17,10 +17,10 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.arbitration.DisputeManager;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import bisq.core.arbitration.DisputeManager;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import javax.inject.Inject;

10
src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTrade.java
View file

@ -17,11 +17,11 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.arbitration.Dispute;
import io.bisq.core.arbitration.DisputeManager;
import io.bisq.core.offer.Offer;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import bisq.core.arbitration.Dispute;
import bisq.core.arbitration.DisputeManager;
import bisq.core.offer.Offer;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import javafx.collections.ObservableList;
import org.bitcoinj.core.Transaction;

8
src/main/java/io/bisq/gui/main/funds/transactions/TransactionListItemFactory.java
View file

@ -17,10 +17,10 @@
package io.bisq.gui.main.funds.transactions;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.trade.Tradable;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.trade.Tradable;
import io.bisq.gui.util.BSFormatter;
import org.bitcoinj.core.Transaction;

22
src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java
View file

@ -18,17 +18,17 @@
package io.bisq.gui.main.funds.transactions;
import bisq.common.locale.Res;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.btc.listeners.TxConfidenceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletService;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.vo.TxType;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.listeners.TxConfidenceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.dao.blockchain.BsqBlockChain;
import bisq.core.dao.blockchain.vo.TxType;
import bisq.core.offer.Offer;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.BSFormatter;
import io.bisq.gui.util.GUIUtil;

12
src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
View file

@ -23,12 +23,12 @@ import bisq.common.locale.Res;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple4;
import bisq.common.util.Utilities;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import io.bisq.core.user.Preferences;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.user.Preferences;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AddressWithIconAndDirection;

6
src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java
View file

@ -18,9 +18,9 @@
package io.bisq.gui.main.funds.withdrawal;
import bisq.common.locale.Res;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import io.bisq.gui.components.AutoTooltipLabel;
import io.bisq.gui.util.BSFormatter;
import javafx.scene.control.Label;

28
src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java
View file

@ -21,20 +21,20 @@ import com.google.common.util.concurrent.FutureCallback;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.UserThread;
import bisq.common.locale.Res;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.AddressEntryException;
import io.bisq.core.btc.InsufficientFundsException;
import io.bisq.core.btc.Restrictions;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.trade.Tradable;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.TradeManager;
import io.bisq.core.trade.closed.ClosedTradableManager;
import io.bisq.core.trade.failed.FailedTradesManager;
import io.bisq.core.user.Preferences;
import io.bisq.core.util.CoinUtil;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.AddressEntryException;
import bisq.core.btc.InsufficientFundsException;
import bisq.core.btc.Restrictions;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsSetup;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.user.Preferences;
import bisq.core.util.CoinUtil;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipCheckBox;

4
src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java
View file

@ -21,8 +21,8 @@ import bisq.common.UserThread;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import bisq.common.util.Tuple4;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OfferPayload;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.ActivatableViewAndModel;
import io.bisq.gui.common.view.FxmlView;

8
src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java
View file

@ -23,10 +23,10 @@ import bisq.common.GlobalSettings;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.TradeCurrency;
import bisq.common.monetary.Price;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OfferPayload;
import io.bisq.core.provider.price.PriceFeedService;
import io.bisq.core.user.Preferences;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.user.Preferences;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.model.ActivatableViewModel;
import io.bisq.gui.main.MainView;

2
src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.market.offerbook;
import io.bisq.core.offer.Offer;
import bisq.core.offer.Offer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

8
src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java
View file

@ -21,10 +21,10 @@ import com.google.inject.Inject;
import bisq.common.locale.CurrencyUtil;
import bisq.common.monetary.Altcoin;
import bisq.common.monetary.Price;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OfferPayload;
import io.bisq.core.provider.price.MarketPrice;
import io.bisq.core.provider.price.PriceFeedService;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import io.bisq.gui.common.model.ActivatableViewModel;
import io.bisq.gui.main.offer.offerbook.OfferBook;
import io.bisq.gui.main.offer.offerbook.OfferBookListItem;

4
src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.java
View file

@ -23,8 +23,8 @@ import bisq.common.locale.Res;
import bisq.common.monetary.Price;
import bisq.common.monetary.Volume;
import bisq.common.util.MathUtils;
import io.bisq.core.offer.OfferPayload;
import io.bisq.core.trade.statistics.TradeStatistics2;
import bisq.core.offer.OfferPayload;
import bisq.core.trade.statistics.TradeStatistics2;
import io.bisq.gui.common.view.ActivatableViewAndModel;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.AutoTooltipLabel;

8
src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
View file

@ -25,10 +25,10 @@ import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.TradeCurrency;
import bisq.common.monetary.Altcoin;
import bisq.common.util.MathUtils;
import io.bisq.core.provider.price.PriceFeedService;
import io.bisq.core.trade.statistics.TradeStatistics2;
import io.bisq.core.trade.statistics.TradeStatisticsManager;
import io.bisq.core.user.Preferences;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.statistics.TradeStatistics2;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.user.Preferences;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.model.ActivatableViewModel;
import io.bisq.gui.main.MainView;

2
src/main/java/io/bisq/gui/main/offer/BuyOfferView.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.offer;
import io.bisq.core.user.Preferences;
import bisq.core.user.Preferences;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.common.view.ViewLoader;

4
src/main/java/io/bisq/gui/main/offer/OfferDataModel.java
View file

@ -17,8 +17,8 @@
package io.bisq.gui.main.offer;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import io.bisq.gui.common.model.ActivatableDataModel;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;

6
src/main/java/io/bisq/gui/main/offer/OfferView.java
View file

@ -22,9 +22,9 @@ import bisq.common.UserThread;
import bisq.common.locale.CurrencyUtil;
import bisq.common.locale.Res;
import bisq.common.locale.TradeCurrency;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OfferPayload;
import io.bisq.core.user.Preferences;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import bisq.core.user.Preferences;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.View;

2
src/main/java/io/bisq/gui/main/offer/SellOfferView.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.offer;
import io.bisq.core.user.Preferences;
import bisq.core.user.Preferences;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.common.view.ViewLoader;

40
src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
View file

@ -27,26 +27,26 @@ import bisq.common.locale.TradeCurrency;
import bisq.common.monetary.Price;
import bisq.common.monetary.Volume;
import bisq.common.util.Utilities;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.arbitration.Arbitrator;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.Restrictions;
import io.bisq.core.btc.listeners.BalanceListener;
import io.bisq.core.btc.wallet.BsqBalanceListener;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.TradeWalletService;
import io.bisq.core.filter.FilterManager;
import io.bisq.core.offer.Offer;
import io.bisq.core.offer.OfferPayload;
import io.bisq.core.offer.OfferUtil;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.payment.*;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.provider.price.PriceFeedService;
import io.bisq.core.trade.handlers.TransactionResultHandler;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;
import bisq.core.app.BisqEnvironment;
import bisq.core.arbitration.Arbitrator;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.Restrictions;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.BsqBalanceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TradeWalletService;
import bisq.core.filter.FilterManager;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import bisq.core.offer.OfferUtil;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.*;
import bisq.core.provider.fee.FeeService;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.handlers.TransactionResultHandler;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import io.bisq.gui.main.offer.OfferDataModel;
import io.bisq.gui.util.BSFormatter;
import bisq.network.p2p.P2PService;

Some files were not shown because too many files have changed in this diff Show more