From 3146ccabe0740547448d696d8ebb20882c9ef590 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 12 Mar 2018 08:17:33 +0100 Subject: [PATCH] Repackage {io.bisq.network => bisq.network} --- src/main/java/io/bisq/gui/app/BisqApp.java | 2 +- .../java/io/bisq/gui/app/BisqAppModule.java | 8 ++++---- .../io/bisq/gui/components/PeerInfoIcon.java | 2 +- .../java/io/bisq/gui/main/MainViewModel.java | 18 +++++++++--------- .../ArbitratorRegistrationViewModel.java | 4 ++-- .../ArbitratorSelectionViewModel.java | 2 +- .../create/CreateCompensationRequestView.java | 4 ++-- .../gui/main/dao/voting/vote/VoteView.java | 2 +- .../gui/main/dao/wallet/send/BsqSendView.java | 2 +- .../bisq/gui/main/disputes/DisputesView.java | 2 +- .../arbitrator/ArbitratorDisputeView.java | 2 +- .../disputes/trader/TraderDisputeView.java | 6 +++--- .../funds/transactions/TransactionsView.java | 2 +- .../main/funds/withdrawal/WithdrawalView.java | 2 +- .../createoffer/CreateOfferDataModel.java | 2 +- .../createoffer/CreateOfferViewModel.java | 2 +- .../main/offer/offerbook/OfferBookView.java | 2 +- .../offer/offerbook/OfferBookViewModel.java | 4 ++-- .../offer/takeoffer/TakeOfferViewModel.java | 8 ++++---- .../overlays/windows/EmptyWalletWindow.java | 2 +- .../overlays/windows/ManualPayoutTxWindow.java | 2 +- .../windows/SendPrivateNotificationWindow.java | 4 ++-- .../windows/TorNetworkSettingsWindow.java | 6 +++--- .../closedtrades/ClosedTradesView.java | 2 +- .../openoffer/OpenOffersViewModel.java | 2 +- .../pendingtrades/PendingTradesDataModel.java | 2 +- .../pendingtrades/PendingTradesView.java | 2 +- .../pendingtrades/PendingTradesViewModel.java | 2 +- .../settings/network/NetworkSettingsView.java | 4 ++-- .../settings/network/P2pNetworkListItem.java | 6 +++--- .../java/io/bisq/gui/util/BSFormatter.java | 2 +- src/main/java/io/bisq/gui/util/GUIUtil.java | 2 +- 32 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/main/java/io/bisq/gui/app/BisqApp.java b/src/main/java/io/bisq/gui/app/BisqApp.java index 5ab2f73df8..d8a396dc28 100644 --- a/src/main/java/io/bisq/gui/app/BisqApp.java +++ b/src/main/java/io/bisq/gui/app/BisqApp.java @@ -68,7 +68,7 @@ import io.bisq.gui.main.debug.DebugView; import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.main.overlays.windows.*; import io.bisq.gui.util.ImageUtil; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.application.Application; import javafx.application.Platform; import javafx.scene.Parent; diff --git a/src/main/java/io/bisq/gui/app/BisqAppModule.java b/src/main/java/io/bisq/gui/app/BisqAppModule.java index 7b7283a71d..a5cd5d3d37 100644 --- a/src/main/java/io/bisq/gui/app/BisqAppModule.java +++ b/src/main/java/io/bisq/gui/app/BisqAppModule.java @@ -44,10 +44,10 @@ import io.bisq.core.user.User; import io.bisq.gui.GuiModule; import io.bisq.gui.common.view.CachingViewLoader; import io.bisq.gui.main.overlays.notifications.NotificationCenter; -import io.bisq.network.crypto.EncryptionServiceModule; -import io.bisq.network.p2p.P2PModule; -import io.bisq.network.p2p.network.BridgeAddressProvider; -import io.bisq.network.p2p.seed.SeedNodeRepository; +import bisq.network.crypto.EncryptionServiceModule; +import bisq.network.p2p.P2PModule; +import bisq.network.p2p.network.BridgeAddressProvider; +import bisq.network.p2p.seed.SeedNodeRepository; import javafx.stage.Stage; import org.springframework.core.env.Environment; diff --git a/src/main/java/io/bisq/gui/components/PeerInfoIcon.java b/src/main/java/io/bisq/gui/components/PeerInfoIcon.java index 3e054c784f..21070ee2cf 100644 --- a/src/main/java/io/bisq/gui/components/PeerInfoIcon.java +++ b/src/main/java/io/bisq/gui/components/PeerInfoIcon.java @@ -8,7 +8,7 @@ import io.bisq.core.payment.AccountAgeWitnessService; import io.bisq.core.user.Preferences; import io.bisq.gui.main.overlays.editor.PeerInfoWithTagEditor; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import javafx.geometry.Point2D; import javafx.scene.Group; import javafx.scene.canvas.Canvas; diff --git a/src/main/java/io/bisq/gui/main/MainViewModel.java b/src/main/java/io/bisq/gui/main/MainViewModel.java index d4fcaa691d..0a749f26dc 100644 --- a/src/main/java/io/bisq/gui/main/MainViewModel.java +++ b/src/main/java/io/bisq/gui/main/MainViewModel.java @@ -78,15 +78,15 @@ import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; import io.bisq.gui.main.overlays.windows.downloadupdate.DisplayUpdateDownloadWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.crypto.DecryptedDataTuple; -import io.bisq.network.crypto.EncryptionService; -import io.bisq.network.p2p.BootstrapListener; -import io.bisq.network.p2p.P2PService; -import io.bisq.network.p2p.P2PServiceListener; -import io.bisq.network.p2p.network.CloseConnectionReason; -import io.bisq.network.p2p.network.Connection; -import io.bisq.network.p2p.network.ConnectionListener; -import io.bisq.network.p2p.peers.keepalive.messages.Ping; +import bisq.network.crypto.DecryptedDataTuple; +import bisq.network.crypto.EncryptionService; +import bisq.network.p2p.BootstrapListener; +import bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PServiceListener; +import bisq.network.p2p.network.CloseConnectionReason; +import bisq.network.p2p.network.Connection; +import bisq.network.p2p.network.ConnectionListener; +import bisq.network.p2p.peers.keepalive.messages.Ping; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; diff --git a/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java b/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java index ddb33ce901..caf81e9e2e 100644 --- a/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java +++ b/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java @@ -28,8 +28,8 @@ import io.bisq.core.btc.AddressEntry; import io.bisq.core.btc.wallet.BtcWalletService; import io.bisq.core.user.User; import io.bisq.gui.common.model.ActivatableViewModel; -import io.bisq.network.p2p.NodeAddress; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.NodeAddress; +import bisq.network.p2p.P2PService; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; diff --git a/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java b/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java index 7d9da3dff3..9fd184b858 100644 --- a/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java +++ b/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java @@ -26,7 +26,7 @@ import io.bisq.core.user.Preferences; import io.bisq.core.user.User; import io.bisq.gui.common.model.ActivatableDataModel; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java b/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java index 4e08b657f1..81e23d8dec 100644 --- a/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java +++ b/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java @@ -39,8 +39,8 @@ import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.BsqFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.NodeAddress; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.NodeAddress; +import bisq.network.p2p.P2PService; import javafx.scene.control.Button; import javafx.scene.layout.GridPane; import org.bitcoinj.core.Coin; diff --git a/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java b/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java index b40d636967..0a8e3c61b9 100644 --- a/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java +++ b/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java @@ -38,7 +38,7 @@ import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.BsqFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.Layout; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.value.ChangeListener; diff --git a/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java b/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java index efc7e3bcb6..74b98353f8 100644 --- a/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java +++ b/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java @@ -40,7 +40,7 @@ import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.Layout; import io.bisq.gui.util.validation.BsqAddressValidator; import io.bisq.gui.util.validation.BsqValidator; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.value.ChangeListener; import javafx.scene.control.Button; import javafx.scene.layout.GridPane; diff --git a/src/main/java/io/bisq/gui/main/disputes/DisputesView.java b/src/main/java/io/bisq/gui/main/disputes/DisputesView.java index ac9f9b3f96..45f8e8630a 100644 --- a/src/main/java/io/bisq/gui/main/disputes/DisputesView.java +++ b/src/main/java/io/bisq/gui/main/disputes/DisputesView.java @@ -30,7 +30,7 @@ import io.bisq.gui.main.MainView; import io.bisq.gui.main.disputes.arbitrator.ArbitratorDisputeView; import io.bisq.gui.main.disputes.trader.TraderDisputeView; import io.bisq.gui.main.overlays.popups.Popup; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import javafx.beans.value.ChangeListener; import javafx.collections.MapChangeListener; import javafx.fxml.FXML; diff --git a/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java b/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java index a663ee3d92..dcd1255e0e 100644 --- a/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java +++ b/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java @@ -29,7 +29,7 @@ import io.bisq.gui.main.overlays.windows.ContractWindow; import io.bisq.gui.main.overlays.windows.DisputeSummaryWindow; import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.stage.Stage; import javax.inject.Inject; diff --git a/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java b/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java index febf87ef12..22ce6147c0 100644 --- a/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java +++ b/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java @@ -49,9 +49,9 @@ import io.bisq.gui.main.overlays.windows.SendPrivateNotificationWindow; import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.NodeAddress; -import io.bisq.network.p2p.P2PService; -import io.bisq.network.p2p.network.Connection; +import bisq.network.p2p.NodeAddress; +import bisq.network.p2p.P2PService; +import bisq.network.p2p.network.Connection; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; diff --git a/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java index b22e740519..cefc77ba15 100644 --- a/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java +++ b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java @@ -40,7 +40,7 @@ import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.ObservableList; import javafx.collections.transformation.SortedList; diff --git a/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java b/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java index 1eea63b489..82d032a74b 100644 --- a/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java +++ b/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java @@ -45,7 +45,7 @@ import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.validation.BtcAddressValidator; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java index 80df11c60e..f3405c29d8 100644 --- a/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java +++ b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java @@ -49,7 +49,7 @@ import io.bisq.core.user.Preferences; import io.bisq.core.user.User; import io.bisq.gui.main.offer.OfferDataModel; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java index 4e43ef7204..1aee34d269 100644 --- a/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java +++ b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java @@ -49,7 +49,7 @@ import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.BsqFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.validation.*; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import org.bitcoinj.core.Address; diff --git a/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java index 9ac9cb8b0b..e0e6ef7852 100644 --- a/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java +++ b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java @@ -47,7 +47,7 @@ import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.Layout; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; diff --git a/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java index 564ec57df7..4ed2bc5208 100644 --- a/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java +++ b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java @@ -47,8 +47,8 @@ import io.bisq.gui.main.settings.SettingsView; import io.bisq.gui.main.settings.preferences.PreferencesView; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.NodeAddress; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.NodeAddress; +import bisq.network.p2p.P2PService; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java b/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java index 8e494e48a3..46331cac76 100644 --- a/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java +++ b/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java @@ -37,10 +37,10 @@ import io.bisq.gui.util.BsqFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.validation.BtcValidator; import io.bisq.gui.util.validation.InputValidator; -import io.bisq.network.p2p.P2PService; -import io.bisq.network.p2p.network.CloseConnectionReason; -import io.bisq.network.p2p.network.Connection; -import io.bisq.network.p2p.network.ConnectionListener; +import bisq.network.p2p.P2PService; +import bisq.network.p2p.network.CloseConnectionReason; +import bisq.network.p2p.network.Connection; +import bisq.network.p2p.network.ConnectionListener; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java index 501696a98b..80046d8d54 100644 --- a/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java +++ b/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java @@ -31,7 +31,7 @@ import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.Transitions; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; diff --git a/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java index 9281345a72..60ab04cbc9 100644 --- a/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java +++ b/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java @@ -27,7 +27,7 @@ import io.bisq.gui.components.InputTextField; import io.bisq.gui.main.overlays.Overlay; import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.scene.Scene; import javafx.scene.input.KeyCode; import org.bitcoinj.core.AddressFormatException; diff --git a/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java index 85041331fb..d6b7f8d850 100644 --- a/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java +++ b/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java @@ -26,8 +26,8 @@ import io.bisq.gui.components.AutoTooltipButton; import io.bisq.gui.components.InputTextField; import io.bisq.gui.main.overlays.Overlay; import io.bisq.gui.main.overlays.popups.Popup; -import io.bisq.network.p2p.NodeAddress; -import io.bisq.network.p2p.SendMailboxMessageListener; +import bisq.network.p2p.NodeAddress; +import bisq.network.p2p.SendMailboxMessageListener; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; diff --git a/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java index b5503873d8..c4c9be9623 100644 --- a/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java +++ b/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java @@ -48,9 +48,9 @@ import io.bisq.gui.components.AutoTooltipButton; import io.bisq.gui.main.overlays.Overlay; import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.util.Layout; -import io.bisq.network.NetworkOptionKeys; -import io.bisq.network.p2p.network.DefaultPluggableTransports; -import io.bisq.network.p2p.network.NetworkNode; +import bisq.network.NetworkOptionKeys; +import bisq.network.p2p.network.DefaultPluggableTransports; +import bisq.network.p2p.network.NetworkNode; import javafx.collections.FXCollections; import javafx.geometry.HPos; import javafx.geometry.Insets; diff --git a/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java index 4cb12fd3e6..5c7008cf23 100644 --- a/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java +++ b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java @@ -38,7 +38,7 @@ import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.ObservableList; import javafx.collections.transformation.SortedList; diff --git a/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java index 3ac380dd1f..bcb2511119 100644 --- a/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java +++ b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java @@ -27,7 +27,7 @@ import io.bisq.core.offer.OpenOffer; import io.bisq.gui.common.model.ActivatableWithDataModel; import io.bisq.gui.common.model.ViewModel; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.collections.ObservableList; class OpenOffersViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java index 5bcfb3b4ef..71d2e72012 100644 --- a/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -47,7 +47,7 @@ import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.main.overlays.windows.SelectDepositTxWindow; import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java index 541b72e358..42d88c05e4 100644 --- a/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java +++ b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java @@ -34,7 +34,7 @@ import io.bisq.gui.components.PeerInfoIcon; import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.transformation.SortedList; import javafx.event.EventHandler; diff --git a/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java index aea2a96052..c87747c59e 100644 --- a/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java +++ b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -34,7 +34,7 @@ import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.BsqFormatter; import io.bisq.gui.util.GUIUtil; import io.bisq.gui.util.validation.BtcAddressValidator; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java b/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java index 0d2bd6eee5..231876386e 100644 --- a/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java +++ b/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java @@ -37,8 +37,8 @@ import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.main.overlays.windows.TorNetworkSettingsWindow; import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.GUIUtil; -import io.bisq.network.p2p.P2PService; -import io.bisq.network.p2p.network.Statistic; +import bisq.network.p2p.P2PService; +import bisq.network.p2p.network.Statistic; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java b/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java index a1cc455dc8..2c1eb8a355 100644 --- a/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java +++ b/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java @@ -20,9 +20,9 @@ package io.bisq.gui.main.settings.network; import bisq.common.Clock; import bisq.common.locale.Res; import io.bisq.gui.util.BSFormatter; -import io.bisq.network.p2p.network.Connection; -import io.bisq.network.p2p.network.OutboundConnection; -import io.bisq.network.p2p.network.Statistic; +import bisq.network.p2p.network.Connection; +import bisq.network.p2p.network.OutboundConnection; +import bisq.network.p2p.network.Statistic; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import org.apache.commons.lang3.time.DurationFormatUtils; diff --git a/src/main/java/io/bisq/gui/util/BSFormatter.java b/src/main/java/io/bisq/gui/util/BSFormatter.java index 0908383f2d..e185db50a5 100644 --- a/src/main/java/io/bisq/gui/util/BSFormatter.java +++ b/src/main/java/io/bisq/gui/util/BSFormatter.java @@ -28,7 +28,7 @@ import bisq.common.util.MathUtils; import io.bisq.core.app.BisqEnvironment; import io.bisq.core.offer.Offer; import io.bisq.core.offer.OfferPayload; -import io.bisq.network.p2p.NodeAddress; +import bisq.network.p2p.NodeAddress; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DurationFormatUtils; diff --git a/src/main/java/io/bisq/gui/util/GUIUtil.java b/src/main/java/io/bisq/gui/util/GUIUtil.java index af5ec1ffae..a8b3e843f9 100644 --- a/src/main/java/io/bisq/gui/util/GUIUtil.java +++ b/src/main/java/io/bisq/gui/util/GUIUtil.java @@ -44,7 +44,7 @@ import io.bisq.core.user.User; import io.bisq.gui.app.BisqApp; import io.bisq.gui.components.indicator.TxConfidenceIndicator; import io.bisq.gui.main.overlays.popups.Popup; -import io.bisq.network.p2p.P2PService; +import bisq.network.p2p.P2PService; import javafx.beans.property.DoubleProperty; import javafx.geometry.Orientation; import javafx.scene.Node;