From 78d939f1812e5020e9d6bea5ba489ee6580c4675 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 11 Sep 2014 01:08:34 +0200 Subject: [PATCH] Change package structure --- .../gui/{view => }/CachedCodeBehind.java | 4 +- .../bitsquare/gui/{view => }/CodeBehind.java | 5 +- .../java/io/bitsquare/gui/NavigationItem.java | 58 +++++++++---------- .../gui/{pm => }/PresentationModel.java | 4 +- .../io/bitsquare/gui/{model => }/UIModel.java | 2 +- .../java/io/bitsquare/gui/ViewController.java | 2 - .../gui/{model => main}/MainModel.java | 3 +- .../io/bitsquare/gui/{pm => main}/MainPM.java | 4 +- .../gui/{view => main}/MainView.fxml | 2 +- .../gui/{view => main}/MainViewCB.java | 4 +- .../{model => main/account}/AccountModel.java | 3 +- .../gui/{pm => main/account}/AccountPM.java | 4 +- .../account/AccountSettingsModel.java | 4 +- .../account/AccountSettingsPM.java | 5 +- .../account/AccountSettingsView.fxml | 2 +- .../account/AccountSettingsViewCB.java | 11 ++-- .../account/AccountSetupModel.java | 4 +- .../{pm => main}/account/AccountSetupPM.java | 5 +- .../account/AccountSetupView.fxml | 2 +- .../account/AccountSetupViewCB.java | 21 ++++--- .../{view => main/account}/AccountView.fxml | 2 +- .../{view => main/account}/AccountViewCB.java | 6 +- .../account/content/ChangePasswordModel.java | 4 +- .../account/content/ChangePasswordPM.java | 5 +- .../account/content/ChangePasswordView.fxml | 2 +- .../account/content/ChangePasswordViewCB.java | 11 ++-- .../account/content/ContextAware.java | 2 +- .../account/content/FiatAccountModel.java | 4 +- .../account/content/FiatAccountPm.java | 5 +- .../account/content/FiatAccountView.fxml | 2 +- .../account/content/FiatAccountViewCB.java | 11 ++-- .../account/content/PasswordModel.java | 4 +- .../account/content/PasswordPM.java | 5 +- .../account/content/PasswordView.fxml | 2 +- .../account/content/PasswordViewCB.java | 11 ++-- .../account/content/RegistrationModel.java | 4 +- .../account/content/RegistrationPM.java | 5 +- .../account/content/RegistrationView.fxml | 2 +- .../account/content/RegistrationViewCB.java | 13 ++--- .../account/content/RestrictionsModel.java | 4 +- .../account/content/RestrictionsPM.java | 5 +- .../account/content/RestrictionsView.fxml | 2 +- .../account/content/RestrictionsViewCB.java | 11 ++-- .../account/content/SeedWordsModel.java | 4 +- .../account/content/SeedWordsPM.java | 5 +- .../account/content/SeedWordsView.fxml | 2 +- .../account/content/SeedWordsViewCB.java | 11 ++-- .../browser/ArbitratorBrowserController.java | 4 +- .../browser/ArbitratorBrowserView.fxml | 2 +- .../profile/ArbitratorProfileController.java | 2 +- .../profile/ArbitratorProfileView.fxml | 2 +- .../ArbitratorRegistrationController.java | 4 +- .../ArbitratorRegistrationView.fxml | 2 +- .../gui/{ => main}/funds/FundsController.java | 2 +- .../gui/{ => main}/funds/FundsView.fxml | 2 +- .../funds/deposit/DepositController.java | 2 +- .../funds/deposit/DepositListItem.java | 4 +- .../{ => main}/funds/deposit/DepositView.fxml | 2 +- .../transactions/TransactionsController.java | 2 +- .../transactions/TransactionsListItem.java | 2 +- .../funds/transactions/TransactionsView.fxml | 2 +- .../withdrawal/WithdrawalController.java | 2 +- .../funds/withdrawal/WithdrawalListItem.java | 2 +- .../funds/withdrawal/WithdrawalView.fxml | 2 +- .../bitsquare/gui/{ => main}/help/Help.java | 2 +- .../bitsquare/gui/{ => main}/help/HelpId.java | 2 +- .../gui/{ => main}/home/HomeController.java | 4 +- .../gui/{ => main}/home/HomeView.fxml | 2 +- .../gui/{ => main}/msg/MsgController.java | 2 +- .../bitsquare/gui/{ => main}/msg/MsgView.fxml | 2 +- .../{ => main}/orders/OrdersController.java | 2 +- .../gui/{ => main}/orders/OrdersView.fxml | 2 +- .../orders/closed/ClosedTradeController.java | 2 +- .../orders/closed/ClosedTradeView.fxml | 2 +- .../orders/offer/OfferController.java | 2 +- .../orders/offer/OfferListItem.java | 2 +- .../{ => main}/orders/offer/OfferView.fxml | 2 +- .../pending/PendingTradeController.java | 2 +- .../orders/pending/PendingTradeView.fxml | 2 +- .../orders/pending/PendingTradesListItem.java | 4 +- .../settings/SettingsController.java | 2 +- .../gui/{ => main}/settings/SettingsView.fxml | 2 +- .../gui/{ => main}/trade/BuyController.java | 2 +- .../gui/{ => main}/trade/BuyView.fxml | 2 +- .../gui/{ => main}/trade/SellController.java | 2 +- .../gui/{ => main}/trade/SellView.fxml | 2 +- .../gui/{ => main}/trade/TradeController.java | 8 +-- .../trade/createoffer}/CreateOfferModel.java | 4 +- .../trade/createoffer}/CreateOfferPM.java | 5 +- .../trade/createoffer}/CreateOfferView.fxml | 2 +- .../trade/createoffer}/CreateOfferViewCB.java | 9 ++- .../trade/orderbook/OrderBookController.java | 8 +-- .../trade/orderbook/OrderBookListItem.java | 2 +- .../trade/orderbook/OrderBookView.fxml | 2 +- .../trade/takeoffer/TakeOfferController.java | 4 +- .../trade/takeoffer/TakeOfferView.fxml | 2 +- .../bitsquare/trade/orderbook/OrderBook.java | 2 +- .../java/io/bitsquare/BitSquareTestSuite.java | 2 +- .../account/AccountSettingsUITestRunner.java | 4 +- .../account/AccountUITestRunner.java | 4 +- .../account/RegistrationUITestRunner.java | 4 +- .../{ => main}/account/SetupUITestRunner.java | 2 +- ...undRegistrationWalletControllerUIMock.java | 2 +- .../FundRegistrationWalletUIMockRunner.java | 2 +- .../FundRegistrationWalletViewUIMock.fxml | 2 +- .../uimock/RegistrationControllerUIMock.java | 2 +- .../uimock/RegistrationUIMockRunner.java | 2 +- .../uimock/RegistrationViewUIMock.fxml | 2 +- .../settings/FiatAccountUITestRunner.java | 4 +- .../settings/PasswordUITestRunner.java | 4 +- .../settings/RegistrationUITestRunner.java | 4 +- .../settings/RestrictionsUITestRunner.java | 4 +- .../settings/SeedWordsUITestRunner.java | 4 +- .../BankAccountSettingsControllerUIMock.java | 2 +- .../BankAccountSettingsUIMockRunner.java | 2 +- .../uimock/BankAccountSettingsViewUIMock.fxml | 2 +- .../RestrictionSettingsControllerUIMock.java | 2 +- .../RestrictionSettingsUIMockRunner.java | 2 +- .../uimock/RestrictionSettingsViewUIMock.fxml | 2 +- .../uimock/SeedWordsControllerUIMock.java | 2 +- .../uimock/SeedWordsUIMockRunner.java | 2 +- .../settings/uimock/SeedWordsViewUIMock.fxml | 2 +- .../uimock/SetPasswordControllerUIMock.java | 2 +- .../uimock/SetPasswordUIMockRunner.java | 2 +- .../uimock/SetPasswordViewUIMock.fxml | 2 +- .../trade/createoffer}/CreateOfferPMTest.java | 3 +- .../createoffer/CreateOfferUITestRunner.java | 4 +- .../uimock/CreateOfferControllerUIMock.java | 2 +- .../uimock/CreateOfferUIMockRunner.java | 2 +- .../uimock/CreateOfferViewUIMock.fxml | 2 +- 130 files changed, 244 insertions(+), 270 deletions(-) rename src/main/java/io/bitsquare/gui/{view => }/CachedCodeBehind.java (97%) rename src/main/java/io/bitsquare/gui/{view => }/CodeBehind.java (96%) rename src/main/java/io/bitsquare/gui/{pm => }/PresentationModel.java (87%) rename src/main/java/io/bitsquare/gui/{model => }/UIModel.java (91%) rename src/main/java/io/bitsquare/gui/{model => main}/MainModel.java (99%) rename src/main/java/io/bitsquare/gui/{pm => main}/MainPM.java (98%) rename src/main/java/io/bitsquare/gui/{view => main}/MainView.fxml (93%) rename src/main/java/io/bitsquare/gui/{view => main}/MainViewCB.java (99%) rename src/main/java/io/bitsquare/gui/{model => main/account}/AccountModel.java (96%) rename src/main/java/io/bitsquare/gui/{pm => main/account}/AccountPM.java (96%) rename src/main/java/io/bitsquare/gui/{model => main}/account/AccountSettingsModel.java (95%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/AccountSettingsPM.java (93%) rename src/main/java/io/bitsquare/gui/{view => main}/account/AccountSettingsView.fxml (95%) rename src/main/java/io/bitsquare/gui/{view => main}/account/AccountSettingsViewCB.java (96%) rename src/main/java/io/bitsquare/gui/{model => main}/account/AccountSetupModel.java (95%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/AccountSetupPM.java (93%) rename src/main/java/io/bitsquare/gui/{view => main}/account/AccountSetupView.fxml (94%) rename src/main/java/io/bitsquare/gui/{view => main}/account/AccountSetupViewCB.java (93%) rename src/main/java/io/bitsquare/gui/{view => main/account}/AccountView.fxml (93%) rename src/main/java/io/bitsquare/gui/{view => main/account}/AccountViewCB.java (97%) rename src/main/java/io/bitsquare/gui/{model => main}/account/content/ChangePasswordModel.java (96%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/content/ChangePasswordPM.java (96%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/ChangePasswordView.fxml (98%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/ChangePasswordViewCB.java (93%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/ContextAware.java (94%) rename src/main/java/io/bitsquare/gui/{model => main}/account/content/FiatAccountModel.java (98%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/content/FiatAccountPm.java (98%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/FiatAccountView.fxml (98%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/FiatAccountViewCB.java (97%) rename src/main/java/io/bitsquare/gui/{model => main}/account/content/PasswordModel.java (96%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/content/PasswordPM.java (96%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/PasswordView.fxml (98%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/PasswordViewCB.java (93%) rename src/main/java/io/bitsquare/gui/{model => main}/account/content/RegistrationModel.java (98%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/content/RegistrationPM.java (96%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/RegistrationView.fxml (98%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/RegistrationViewCB.java (95%) rename src/main/java/io/bitsquare/gui/{model => main}/account/content/RestrictionsModel.java (98%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/content/RestrictionsPM.java (96%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/RestrictionsView.fxml (98%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/RestrictionsViewCB.java (97%) rename src/main/java/io/bitsquare/gui/{model => main}/account/content/SeedWordsModel.java (96%) rename src/main/java/io/bitsquare/gui/{pm => main}/account/content/SeedWordsPM.java (93%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/SeedWordsView.fxml (97%) rename src/main/java/io/bitsquare/gui/{view => main}/account/content/SeedWordsViewCB.java (91%) rename src/main/java/io/bitsquare/gui/{ => main}/arbitrators/browser/ArbitratorBrowserController.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/arbitrators/browser/ArbitratorBrowserView.fxml (93%) rename src/main/java/io/bitsquare/gui/{ => main}/arbitrators/profile/ArbitratorProfileController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/arbitrators/profile/ArbitratorProfileView.fxml (97%) rename src/main/java/io/bitsquare/gui/{ => main}/arbitrators/registration/ArbitratorRegistrationController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/arbitrators/registration/ArbitratorRegistrationView.fxml (98%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/FundsController.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/FundsView.fxml (93%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/deposit/DepositController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/deposit/DepositListItem.java (89%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/deposit/DepositView.fxml (95%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/transactions/TransactionsController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/transactions/TransactionsListItem.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/transactions/TransactionsView.fxml (95%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/withdrawal/WithdrawalController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/withdrawal/WithdrawalListItem.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/funds/withdrawal/WithdrawalView.fxml (97%) rename src/main/java/io/bitsquare/gui/{ => main}/help/Help.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/help/HelpId.java (96%) rename src/main/java/io/bitsquare/gui/{ => main}/home/HomeController.java (97%) rename src/main/java/io/bitsquare/gui/{ => main}/home/HomeView.fxml (94%) rename src/main/java/io/bitsquare/gui/{ => main}/msg/MsgController.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/msg/MsgView.fxml (93%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/OrdersController.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/OrdersView.fxml (93%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/closed/ClosedTradeController.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/closed/ClosedTradeView.fxml (92%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/offer/OfferController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/offer/OfferListItem.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/offer/OfferView.fxml (96%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/pending/PendingTradeController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/pending/PendingTradeView.fxml (98%) rename src/main/java/io/bitsquare/gui/{ => main}/orders/pending/PendingTradesListItem.java (91%) rename src/main/java/io/bitsquare/gui/{ => main}/settings/SettingsController.java (98%) rename src/main/java/io/bitsquare/gui/{ => main}/settings/SettingsView.fxml (92%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/BuyController.java (96%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/BuyView.fxml (92%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/SellController.java (96%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/SellView.fxml (92%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/TradeController.java (96%) rename src/main/java/io/bitsquare/gui/{model/trade => main/trade/createoffer}/CreateOfferModel.java (99%) rename src/main/java/io/bitsquare/gui/{pm/trade => main/trade/createoffer}/CreateOfferPM.java (99%) rename src/main/java/io/bitsquare/gui/{view/trade => main/trade/createoffer}/CreateOfferView.fxml (99%) rename src/main/java/io/bitsquare/gui/{view/trade => main/trade/createoffer}/CreateOfferViewCB.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/orderbook/OrderBookController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/orderbook/OrderBookListItem.java (97%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/orderbook/OrderBookView.fxml (97%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/takeoffer/TakeOfferController.java (99%) rename src/main/java/io/bitsquare/gui/{ => main}/trade/takeoffer/TakeOfferView.fxml (99%) rename src/test/java/io/bitsquare/gui/{ => main}/account/AccountSettingsUITestRunner.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/account/AccountUITestRunner.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/account/RegistrationUITestRunner.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/account/SetupUITestRunner.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/account/registration/uimock/FundRegistrationWalletControllerUIMock.java (95%) rename src/test/java/io/bitsquare/gui/{ => main}/account/registration/uimock/FundRegistrationWalletUIMockRunner.java (97%) rename src/test/java/io/bitsquare/gui/{ => main}/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml (97%) rename src/test/java/io/bitsquare/gui/{ => main}/account/registration/uimock/RegistrationControllerUIMock.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/account/registration/uimock/RegistrationUIMockRunner.java (97%) rename src/test/java/io/bitsquare/gui/{ => main}/account/registration/uimock/RegistrationViewUIMock.fxml (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/FiatAccountUITestRunner.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/PasswordUITestRunner.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/RegistrationUITestRunner.java (95%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/RestrictionsUITestRunner.java (95%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/SeedWordsUITestRunner.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/BankAccountSettingsControllerUIMock.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/BankAccountSettingsUIMockRunner.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/BankAccountSettingsViewUIMock.fxml (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/RestrictionSettingsControllerUIMock.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/RestrictionSettingsUIMockRunner.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/RestrictionSettingsViewUIMock.fxml (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/SeedWordsControllerUIMock.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/SeedWordsUIMockRunner.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/SeedWordsViewUIMock.fxml (97%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/SetPasswordControllerUIMock.java (96%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/SetPasswordUIMockRunner.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/settings/uimock/SetPasswordViewUIMock.fxml (97%) rename src/test/java/io/bitsquare/gui/{pm/trade => main/trade/createoffer}/CreateOfferPMTest.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/trade/createoffer/CreateOfferUITestRunner.java (95%) rename src/test/java/io/bitsquare/gui/{ => main}/trade/createoffer/uimock/CreateOfferControllerUIMock.java (99%) rename src/test/java/io/bitsquare/gui/{ => main}/trade/createoffer/uimock/CreateOfferUIMockRunner.java (98%) rename src/test/java/io/bitsquare/gui/{ => main}/trade/createoffer/uimock/CreateOfferViewUIMock.fxml (99%) diff --git a/src/main/java/io/bitsquare/gui/view/CachedCodeBehind.java b/src/main/java/io/bitsquare/gui/CachedCodeBehind.java similarity index 97% rename from src/main/java/io/bitsquare/gui/view/CachedCodeBehind.java rename to src/main/java/io/bitsquare/gui/CachedCodeBehind.java index e84b80e695..6538388f4a 100644 --- a/src/main/java/io/bitsquare/gui/view/CachedCodeBehind.java +++ b/src/main/java/io/bitsquare/gui/CachedCodeBehind.java @@ -1,6 +1,4 @@ -package io.bitsquare.gui.view; - -import io.bitsquare.gui.pm.PresentationModel; +package io.bitsquare.gui; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/view/CodeBehind.java b/src/main/java/io/bitsquare/gui/CodeBehind.java similarity index 96% rename from src/main/java/io/bitsquare/gui/view/CodeBehind.java rename to src/main/java/io/bitsquare/gui/CodeBehind.java index a8e919a245..74330f994c 100644 --- a/src/main/java/io/bitsquare/gui/view/CodeBehind.java +++ b/src/main/java/io/bitsquare/gui/CodeBehind.java @@ -1,7 +1,4 @@ -package io.bitsquare.gui.view; - -import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.pm.PresentationModel; +package io.bitsquare.gui; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/NavigationItem.java b/src/main/java/io/bitsquare/gui/NavigationItem.java index e7d60232a1..2b5d2a4709 100644 --- a/src/main/java/io/bitsquare/gui/NavigationItem.java +++ b/src/main/java/io/bitsquare/gui/NavigationItem.java @@ -25,21 +25,21 @@ public enum NavigationItem { // Application /////////////////////////////////////////////////////////////////////////////////////////// - MAIN(0, "/io/bitsquare/gui/view/MainView.fxml"), + MAIN(0, "/io/bitsquare/gui/main/MainView.fxml"), /////////////////////////////////////////////////////////////////////////////////////////// // Main menu screens /////////////////////////////////////////////////////////////////////////////////////////// - HOME(1, "/io/bitsquare/gui/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE), - BUY(1, "/io/bitsquare/gui/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE), - SELL(1, "/io/bitsquare/gui/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE), - ORDERS(1, "/io/bitsquare/gui/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE), - FUNDS(1, "/io/bitsquare/gui/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE), - MSG(1, "/io/bitsquare/gui/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE), - SETTINGS(1, "/io/bitsquare/gui/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE), - ACCOUNT(1, "/io/bitsquare/gui/view/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE), + HOME(1, "/io/bitsquare/gui/main/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE), + BUY(1, "/io/bitsquare/gui/main/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE), + SELL(1, "/io/bitsquare/gui/main/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE), + ORDERS(1, "/io/bitsquare/gui/main/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE), + FUNDS(1, "/io/bitsquare/gui/main/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE), + MSG(1, "/io/bitsquare/gui/main/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE), + SETTINGS(1, "/io/bitsquare/gui/main/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE), + ACCOUNT(1, "/io/bitsquare/gui/main/account/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE), /////////////////////////////////////////////////////////////////////////////////////////// @@ -47,23 +47,23 @@ public enum NavigationItem { /////////////////////////////////////////////////////////////////////////////////////////// // buy/sell (trade) - ORDER_BOOK(2, "/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml"), - CREATE_OFFER(2, "/io/bitsquare/gui/view/trade/CreateOfferView.fxml"), - TAKE_OFFER(2, "/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml"), + ORDER_BOOK(2, "/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml"), + CREATE_OFFER(2, "/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml"), + TAKE_OFFER(2, "/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml"), // orders - OFFER(2, "/io/bitsquare/gui/orders/offer/OfferView.fxml"), - PENDING_TRADE(2, "/io/bitsquare/gui/orders/pending/PendingTradeView.fxml"), - CLOSED_TRADE(2, "/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml"), + OFFER(2, "/io/bitsquare/gui/main/orders/offer/OfferView.fxml"), + PENDING_TRADE(2, "/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml"), + CLOSED_TRADE(2, "/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml"), // funds - DEPOSIT(2, "/io/bitsquare/gui/funds/deposit/DepositView.fxml"), - WITHDRAWAL(2, "/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml"), - TRANSACTIONS(2, "/io/bitsquare/gui/funds/transactions/TransactionsView.fxml"), + DEPOSIT(2, "/io/bitsquare/gui/main/funds/deposit/DepositView.fxml"), + WITHDRAWAL(2, "/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"), + TRANSACTIONS(2, "/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"), // account - ACCOUNT_SETUP(2, "/io/bitsquare/gui/view/account/AccountSetupView.fxml"), - ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), + ACCOUNT_SETUP(2, "/io/bitsquare/gui/main/account/AccountSetupView.fxml"), + ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/main/account/AccountSettingsView.fxml"), /////////////////////////////////////////////////////////////////////////////////////////// @@ -71,12 +71,12 @@ public enum NavigationItem { /////////////////////////////////////////////////////////////////////////////////////////// // account content - SEED_WORDS(3, "/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"), - ADD_PASSWORD(3, "/io/bitsquare/gui/view/account/content/PasswordView.fxml"), - CHANGE_PASSWORD(3, "/io/bitsquare/gui/view/account/content/PasswordView.fxml"), - RESTRICTIONS(3, "/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"), - REGISTRATION(3, "/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), - FIAT_ACCOUNT(3, "/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"), + SEED_WORDS(3, "/io/bitsquare/gui/main/account/content/SeedWordsView.fxml"), + ADD_PASSWORD(3, "/io/bitsquare/gui/main/account/content/PasswordView.fxml"), + CHANGE_PASSWORD(3, "/io/bitsquare/gui/main/account/content/PasswordView.fxml"), + RESTRICTIONS(3, "/io/bitsquare/gui/main/account/content/RestrictionsView.fxml"), + REGISTRATION(3, "/io/bitsquare/gui/main/account/content/RegistrationView.fxml"), + FIAT_ACCOUNT(3, "/io/bitsquare/gui/main/account/content/FiatAccountView.fxml"), /////////////////////////////////////////////////////////////////////////////////////////// @@ -84,9 +84,9 @@ public enum NavigationItem { /////////////////////////////////////////////////////////////////////////////////////////// // arbitrator - ARBITRATOR_PROFILE(2, "/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml"), - ARBITRATOR_BROWSER(-1, "/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml"), - ARBITRATOR_REGISTRATION(-1, "/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml"); + ARBITRATOR_PROFILE(2, "/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml"), + ARBITRATOR_BROWSER(-1, "/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml"), + ARBITRATOR_REGISTRATION(-1, "/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml"); private int level; diff --git a/src/main/java/io/bitsquare/gui/pm/PresentationModel.java b/src/main/java/io/bitsquare/gui/PresentationModel.java similarity index 87% rename from src/main/java/io/bitsquare/gui/pm/PresentationModel.java rename to src/main/java/io/bitsquare/gui/PresentationModel.java index a81e0eb26a..75c2bf2db7 100644 --- a/src/main/java/io/bitsquare/gui/pm/PresentationModel.java +++ b/src/main/java/io/bitsquare/gui/PresentationModel.java @@ -1,6 +1,4 @@ -package io.bitsquare.gui.pm; - -import io.bitsquare.gui.model.UIModel; +package io.bitsquare.gui; public class PresentationModel { diff --git a/src/main/java/io/bitsquare/gui/model/UIModel.java b/src/main/java/io/bitsquare/gui/UIModel.java similarity index 91% rename from src/main/java/io/bitsquare/gui/model/UIModel.java rename to src/main/java/io/bitsquare/gui/UIModel.java index 31f80234c0..43143b39b9 100644 --- a/src/main/java/io/bitsquare/gui/model/UIModel.java +++ b/src/main/java/io/bitsquare/gui/UIModel.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.model; +package io.bitsquare.gui; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/bitsquare/gui/ViewController.java b/src/main/java/io/bitsquare/gui/ViewController.java index eebd3fdc64..27ed4d019c 100644 --- a/src/main/java/io/bitsquare/gui/ViewController.java +++ b/src/main/java/io/bitsquare/gui/ViewController.java @@ -17,8 +17,6 @@ package io.bitsquare.gui; -import io.bitsquare.gui.view.CodeBehind; - import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/io/bitsquare/gui/model/MainModel.java b/src/main/java/io/bitsquare/gui/main/MainModel.java similarity index 99% rename from src/main/java/io/bitsquare/gui/model/MainModel.java rename to src/main/java/io/bitsquare/gui/main/MainModel.java index 320523fd5b..5dfbabe3ed 100644 --- a/src/main/java/io/bitsquare/gui/model/MainModel.java +++ b/src/main/java/io/bitsquare/gui/main/MainModel.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model; +package io.bitsquare.gui.main; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.gui.NavigationItem; +import io.bitsquare.gui.UIModel; import io.bitsquare.gui.util.Profiler; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.BootstrapListener; diff --git a/src/main/java/io/bitsquare/gui/pm/MainPM.java b/src/main/java/io/bitsquare/gui/main/MainPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/pm/MainPM.java rename to src/main/java/io/bitsquare/gui/main/MainPM.java index ef93de6af5..5c5bed9ae5 100644 --- a/src/main/java/io/bitsquare/gui/pm/MainPM.java +++ b/src/main/java/io/bitsquare/gui/main/MainPM.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm; +package io.bitsquare.gui.main; import io.bitsquare.bank.BankAccount; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.model.MainModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/view/MainView.fxml b/src/main/java/io/bitsquare/gui/main/MainView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/view/MainView.fxml rename to src/main/java/io/bitsquare/gui/main/MainView.fxml index 5de676b874..3fb9970585 100644 --- a/src/main/java/io/bitsquare/gui/view/MainView.fxml +++ b/src/main/java/io/bitsquare/gui/main/MainView.fxml @@ -17,7 +17,7 @@ --> - \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/view/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java similarity index 99% rename from src/main/java/io/bitsquare/gui/view/MainViewCB.java rename to src/main/java/io/bitsquare/gui/main/MainViewCB.java index f9efbce80c..1abd938f9d 100644 --- a/src/main/java/io/bitsquare/gui/view/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -15,15 +15,15 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view; +package io.bitsquare.gui.main; import io.bitsquare.bank.BankAccount; +import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.OverlayController; import io.bitsquare.gui.components.NetworkSyncPane; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.pm.MainPM; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.Profiler; import io.bitsquare.gui.util.Transitions; diff --git a/src/main/java/io/bitsquare/gui/model/AccountModel.java b/src/main/java/io/bitsquare/gui/main/account/AccountModel.java similarity index 96% rename from src/main/java/io/bitsquare/gui/model/AccountModel.java rename to src/main/java/io/bitsquare/gui/main/account/AccountModel.java index 3469801385..5943f78b63 100644 --- a/src/main/java/io/bitsquare/gui/model/AccountModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountModel.java @@ -15,8 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model; +package io.bitsquare.gui.main.account; +import io.bitsquare.gui.UIModel; import io.bitsquare.user.User; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/pm/AccountPM.java b/src/main/java/io/bitsquare/gui/main/account/AccountPM.java similarity index 96% rename from src/main/java/io/bitsquare/gui/pm/AccountPM.java rename to src/main/java/io/bitsquare/gui/main/account/AccountPM.java index 5a96c2b708..584301732c 100644 --- a/src/main/java/io/bitsquare/gui/pm/AccountPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountPM.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm; +package io.bitsquare.gui.main.account; -import io.bitsquare.gui.model.AccountModel; +import io.bitsquare.gui.PresentationModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java similarity index 95% rename from src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java rename to src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java index 62b0c0f7b9..af17a8b7d0 100644 --- a/src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account; +package io.bitsquare.gui.main.account; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java similarity index 93% rename from src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java rename to src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java index 8f6d2e05f4..7c0df9e80e 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java @@ -15,10 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account; +package io.bitsquare.gui.main.account; -import io.bitsquare.gui.model.account.AccountSettingsModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml similarity index 95% rename from src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml rename to src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml index e2d022d48d..be34a20c81 100644 --- a/src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/AccountSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java similarity index 96% rename from src/main/java/io/bitsquare/gui/view/account/AccountSettingsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java index 7726400bc1..52a5b6eecd 100644 --- a/src/main/java/io/bitsquare/gui/view/account/AccountSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java @@ -15,15 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account; +package io.bitsquare.gui.main.account; +import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationController; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.pm.PresentationModel; -import io.bitsquare.gui.pm.account.AccountSettingsPM; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.CodeBehind; -import io.bitsquare.gui.view.account.content.ContextAware; +import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.main.account.content.ContextAware; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; diff --git a/src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java b/src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java similarity index 95% rename from src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java rename to src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java index 9db73d1593..a4994778c5 100644 --- a/src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account; +package io.bitsquare.gui.main.account; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java b/src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java similarity index 93% rename from src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java rename to src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java index 4c39c9b262..275d31a118 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java @@ -15,10 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account; +package io.bitsquare.gui.main.account; -import io.bitsquare.gui.model.account.AccountSetupModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml b/src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml similarity index 94% rename from src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml rename to src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml index 7a081bc336..ef7d22a280 100644 --- a/src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml @@ -19,7 +19,7 @@ - . */ -package io.bitsquare.gui.view.account; +package io.bitsquare.gui.main.account; +import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.pm.PresentationModel; -import io.bitsquare.gui.pm.account.AccountSetupPM; +import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.content.FiatAccountViewCB; +import io.bitsquare.gui.main.account.content.PasswordViewCB; +import io.bitsquare.gui.main.account.content.RegistrationViewCB; +import io.bitsquare.gui.main.account.content.RestrictionsViewCB; +import io.bitsquare.gui.main.account.content.SeedWordsViewCB; import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.CodeBehind; -import io.bitsquare.gui.view.account.content.ContextAware; -import io.bitsquare.gui.view.account.content.FiatAccountViewCB; -import io.bitsquare.gui.view.account.content.PasswordViewCB; -import io.bitsquare.gui.view.account.content.RegistrationViewCB; -import io.bitsquare.gui.view.account.content.RestrictionsViewCB; -import io.bitsquare.gui.view.account.content.SeedWordsViewCB; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; diff --git a/src/main/java/io/bitsquare/gui/view/AccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/view/AccountView.fxml rename to src/main/java/io/bitsquare/gui/main/account/AccountView.fxml index 9966dc3c12..f776441a9a 100644 --- a/src/main/java/io/bitsquare/gui/view/AccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.view; +package io.bitsquare.gui.main.account; +import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationController; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.pm.AccountPM; -import io.bitsquare.gui.view.account.AccountSetupViewCB; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; diff --git a/src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java similarity index 96% rename from src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java index 90d57e5d04..5edc614ef7 100644 --- a/src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java similarity index 96% rename from src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java index 0c8517dbc5..0cb1598f0e 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java @@ -15,10 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.model.account.content.ChangePasswordModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml index f11978bb7a..72066656de 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java similarity index 93% rename from src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java index 8aaf7f74ca..990488ee13 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java @@ -15,13 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.account.content.ChangePasswordPM; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.account.AccountSetupViewCB; +import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/ContextAware.java b/src/main/java/io/bitsquare/gui/main/account/content/ContextAware.java similarity index 94% rename from src/main/java/io/bitsquare/gui/view/account/content/ContextAware.java rename to src/main/java/io/bitsquare/gui/main/account/content/ContextAware.java index bacb45ed86..712eaddef9 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/ContextAware.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/ContextAware.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; public interface ContextAware { void useSettingsContext(boolean useSettingsContext); diff --git a/src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java similarity index 98% rename from src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java index 70781856bc..7735fcf797 100644 --- a/src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CurrencyUtil; diff --git a/src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java similarity index 98% rename from src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java rename to src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java index 2bda8af514..67d8829795 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java @@ -15,12 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; -import io.bitsquare.gui.model.account.content.FiatAccountModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml index 17f914fc47..a97e511867 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml @@ -23,7 +23,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java similarity index 97% rename from src/main/java/io/bitsquare/gui/view/account/content/FiatAccountViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java index 300e65061b..4f18a33b83 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java @@ -15,18 +15,17 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; +import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.account.content.FiatAccountPm; +import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.validation.InputValidator; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.account.AccountSetupViewCB; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; diff --git a/src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java b/src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java similarity index 96% rename from src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java index c7c7d0ca3a..3b83ac5f63 100644 --- a/src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java similarity index 96% rename from src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java index c183e3999a..c8cd7b5255 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java @@ -15,10 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.model.account.content.PasswordModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml index 976f31ec1f..1b1d0b98c6 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/content/PasswordViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java similarity index 93% rename from src/main/java/io/bitsquare/gui/view/account/content/PasswordViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java index b1bb864090..b91e180f2d 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/PasswordViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java @@ -15,13 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.account.content.PasswordPM; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.account.AccountSetupViewCB; +import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java similarity index 98% rename from src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java index deba7573c1..889edce2b9 100644 --- a/src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import io.bitsquare.persistence.Persistence; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java similarity index 96% rename from src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java index 8aad7ccc25..d007e8ce19 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java @@ -15,11 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.btc.WalletFacade; -import io.bitsquare.gui.model.account.content.RegistrationModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.locale.BSResources; import com.google.bitcoin.core.Address; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml index 4851af9885..842c0800d3 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml @@ -23,7 +23,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/content/RegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java similarity index 95% rename from src/main/java/io/bitsquare/gui/view/account/content/RegistrationViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java index d136f2fb35..8b11552ac4 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/RegistrationViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java @@ -15,17 +15,16 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; +import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.OverlayController; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.btc.AddressTextField; import io.bitsquare.gui.components.btc.BalanceTextField; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.account.content.RegistrationPM; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.locale.BSResources; import java.net.URL; @@ -86,7 +85,7 @@ public class RegistrationViewCB extends CachedCodeBehind impleme // TODO find better solution addressTextField.setOverlayController(overlayController); - + balanceTextField.setup(presentationModel.getWalletFacade(), presentationModel.address.get()); payButton.disableProperty().bind(presentationModel.isPayButtonDisabled); diff --git a/src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java similarity index 98% rename from src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java index 5cc56ac285..21e9f03645 100644 --- a/src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Reputation; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.LanguageUtil; diff --git a/src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java similarity index 96% rename from src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java index 60f84698e9..6f010273dc 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java @@ -15,11 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.model.account.content.RestrictionsModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml index 0908924b55..1060d5ddea 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml @@ -20,7 +20,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java similarity index 97% rename from src/main/java/io/bitsquare/gui/view/account/content/RestrictionsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java index 1249580ab7..da93f15ad7 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java @@ -15,17 +15,16 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.BitSquare; import io.bitsquare.arbitrator.Arbitrator; +import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.account.content.RestrictionsPM; +import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.account.AccountSetupViewCB; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java similarity index 96% rename from src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java index 71a8625729..5a09546adf 100644 --- a/src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java @@ -15,10 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.account.content; +package io.bitsquare.gui.main.account.content; import io.bitsquare.btc.WalletFacade; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java similarity index 93% rename from src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java index 660effba06..d8a92ef764 100644 --- a/src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java @@ -15,10 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.model.account.content.SeedWordsModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; diff --git a/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml index 293237e4f2..7e406607d2 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml @@ -22,7 +22,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java similarity index 91% rename from src/main/java/io/bitsquare/gui/view/account/content/SeedWordsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java index eb9b5e1867..6159f3cf8a 100644 --- a/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java @@ -15,13 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.account.content; +package io.bitsquare.gui.main.account.content; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.account.content.SeedWordsPM; -import io.bitsquare.gui.view.CachedCodeBehind; -import io.bitsquare.gui.view.account.AccountSetupViewCB; +import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java b/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java rename to src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserController.java index fea27d1a43..7bbde97e15 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java +++ b/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserController.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.arbitrators.browser; +package io.bitsquare.gui.main.arbitrators.browser; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.ViewController; -import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController; +import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController; import io.bitsquare.locale.LanguageUtil; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.ArbitratorListener; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml b/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml rename to src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml index 764083fa37..98e995b04b 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml +++ b/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml @@ -18,7 +18,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java b/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java rename to src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileController.java index d7eff7abd9..403da21583 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java +++ b/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.arbitrators.profile; +package io.bitsquare.gui.main.arbitrators.profile; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.CachedViewController; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml b/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml rename to src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml index ce876a3720..fe29d14cad 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml +++ b/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java b/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java rename to src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationController.java index 5076ac3e9d..079c80809a 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java +++ b/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.arbitrators.registration; +package io.bitsquare.gui.main.arbitrators.registration; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Reputation; @@ -23,9 +23,9 @@ import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.ViewController; -import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController; import io.bitsquare.gui.components.ConfidenceDisplay; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; +import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BitSquareValidator; import io.bitsquare.locale.BSResources; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml b/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml rename to src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml index 42f039771e..ef747a1430 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml +++ b/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml @@ -20,7 +20,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/funds/FundsController.java b/src/main/java/io/bitsquare/gui/main/funds/FundsController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/funds/FundsController.java rename to src/main/java/io/bitsquare/gui/main/funds/FundsController.java index 85bd05a314..048f573409 100644 --- a/src/main/java/io/bitsquare/gui/funds/FundsController.java +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds; +package io.bitsquare.gui.main.funds; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; diff --git a/src/main/java/io/bitsquare/gui/funds/FundsView.fxml b/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/funds/FundsView.fxml rename to src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml index d9acc082c2..daf8bffcb8 100644 --- a/src/main/java/io/bitsquare/gui/funds/FundsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java b/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java rename to src/main/java/io/bitsquare/gui/main/funds/deposit/DepositController.java index e14f8f2371..88a3db36ed 100644 --- a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java +++ b/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds.deposit; +package io.bitsquare.gui.main.funds.deposit; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.WalletFacade; diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java b/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java similarity index 89% rename from src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java rename to src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java index 9f443f97de..a01b8755bc 100644 --- a/src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java +++ b/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds.deposit; +package io.bitsquare.gui.main.funds.deposit; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.WalletFacade; -import io.bitsquare.gui.funds.withdrawal.WithdrawalListItem; +import io.bitsquare.gui.main.funds.withdrawal.WithdrawalListItem; public class DepositListItem extends WithdrawalListItem { public DepositListItem(AddressEntry addressEntry, WalletFacade walletFacade) { diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml b/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml similarity index 95% rename from src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml rename to src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml index 98030250a2..21116fe20d 100644 --- a/src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java rename to src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsController.java index c6f288f943..69fe39e211 100644 --- a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds.transactions; +package io.bitsquare.gui.main.funds.transactions; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.CachedViewController; diff --git a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java similarity index 99% rename from src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java rename to src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java index 92a97d3ca7..dae7901bf9 100644 --- a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds.transactions; +package io.bitsquare.gui.main.funds.transactions; import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.listeners.ConfidenceListener; diff --git a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsView.fxml b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml similarity index 95% rename from src/main/java/io/bitsquare/gui/funds/transactions/TransactionsView.fxml rename to src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml index 9c3e660f73..ab492d6a7e 100644 --- a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java rename to src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalController.java index 5f27591313..eb518a4149 100644 --- a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds.withdrawal; +package io.bitsquare.gui.main.funds.withdrawal; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; diff --git a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java similarity index 99% rename from src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java rename to src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java index 71c585bafa..2450e3b1b6 100644 --- a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.funds.withdrawal; +package io.bitsquare.gui.main.funds.withdrawal; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.WalletFacade; diff --git a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml rename to src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml index 8891ab834f..29e041021f 100644 --- a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/help/Help.java b/src/main/java/io/bitsquare/gui/main/help/Help.java similarity index 98% rename from src/main/java/io/bitsquare/gui/help/Help.java rename to src/main/java/io/bitsquare/gui/main/help/Help.java index c027b75dd3..365b722dd2 100644 --- a/src/main/java/io/bitsquare/gui/help/Help.java +++ b/src/main/java/io/bitsquare/gui/main/help/Help.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.help; +package io.bitsquare.gui.main.help; import io.bitsquare.BitSquare; diff --git a/src/main/java/io/bitsquare/gui/help/HelpId.java b/src/main/java/io/bitsquare/gui/main/help/HelpId.java similarity index 96% rename from src/main/java/io/bitsquare/gui/help/HelpId.java rename to src/main/java/io/bitsquare/gui/main/help/HelpId.java index 65f8641b0a..902d8cb9f3 100644 --- a/src/main/java/io/bitsquare/gui/help/HelpId.java +++ b/src/main/java/io/bitsquare/gui/main/help/HelpId.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.help; +package io.bitsquare.gui.main.help; public enum HelpId { CREATE_OFFER_GENERAL, diff --git a/src/main/java/io/bitsquare/gui/home/HomeController.java b/src/main/java/io/bitsquare/gui/main/home/HomeController.java similarity index 97% rename from src/main/java/io/bitsquare/gui/home/HomeController.java rename to src/main/java/io/bitsquare/gui/main/home/HomeController.java index ed6bdf5dd2..a277b95347 100644 --- a/src/main/java/io/bitsquare/gui/home/HomeController.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeController.java @@ -15,12 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.home; +package io.bitsquare.gui.main.home; import io.bitsquare.BitSquare; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.arbitrators.registration.ArbitratorRegistrationController; +import io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationController; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; diff --git a/src/main/java/io/bitsquare/gui/home/HomeView.fxml b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml similarity index 94% rename from src/main/java/io/bitsquare/gui/home/HomeView.fxml rename to src/main/java/io/bitsquare/gui/main/home/HomeView.fxml index aee5180f0d..6ef6d8d1b6 100644 --- a/src/main/java/io/bitsquare/gui/home/HomeView.fxml +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/msg/MsgController.java b/src/main/java/io/bitsquare/gui/main/msg/MsgController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/msg/MsgController.java rename to src/main/java/io/bitsquare/gui/main/msg/MsgController.java index c2ba0f5366..fe70900cf6 100644 --- a/src/main/java/io/bitsquare/gui/msg/MsgController.java +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.msg; +package io.bitsquare.gui.main.msg; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; diff --git a/src/main/java/io/bitsquare/gui/msg/MsgView.fxml b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/msg/MsgView.fxml rename to src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml index c8a2b1520e..089c6ea406 100644 --- a/src/main/java/io/bitsquare/gui/msg/MsgView.fxml +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/orders/OrdersController.java b/src/main/java/io/bitsquare/gui/main/orders/OrdersController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/orders/OrdersController.java rename to src/main/java/io/bitsquare/gui/main/orders/OrdersController.java index 5af41c48bd..5bef8188af 100644 --- a/src/main/java/io/bitsquare/gui/orders/OrdersController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/OrdersController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.orders; +package io.bitsquare.gui.main.orders; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; diff --git a/src/main/java/io/bitsquare/gui/orders/OrdersView.fxml b/src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/orders/OrdersView.fxml rename to src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml index d592449c44..3e8799c918 100644 --- a/src/main/java/io/bitsquare/gui/orders/OrdersView.fxml +++ b/src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml @@ -20,7 +20,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java rename to src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeController.java index 6ef005ba8a..263bdb198e 100644 --- a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.orders.closed; +package io.bitsquare.gui.main.orders.closed; import io.bitsquare.gui.CachedViewController; diff --git a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml similarity index 92% rename from src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml rename to src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml index 914f8109d9..c7205c39a6 100644 --- a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml +++ b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml @@ -19,7 +19,7 @@ - . */ -package io.bitsquare.gui.orders.offer; +package io.bitsquare.gui.main.orders.offer; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.util.ImageUtil; diff --git a/src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java similarity index 98% rename from src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java rename to src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java index a43887be23..912ec21825 100644 --- a/src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java +++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.orders.offer; +package io.bitsquare.gui.main.orders.offer; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.trade.Offer; diff --git a/src/main/java/io/bitsquare/gui/orders/offer/OfferView.fxml b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferView.fxml similarity index 96% rename from src/main/java/io/bitsquare/gui/orders/offer/OfferView.fxml rename to src/main/java/io/bitsquare/gui/main/orders/offer/OfferView.fxml index 5c6f0485f2..ca1b4e5b79 100644 --- a/src/main/java/io/bitsquare/gui/orders/offer/OfferView.fxml +++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java rename to src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java index fff44f8af0..98a62b2fa2 100644 --- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.orders.pending; +package io.bitsquare.gui.main.orders.pending; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml rename to src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml index 9da07ccbb1..9d090d3d47 100644 --- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml @@ -22,7 +22,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java similarity index 91% rename from src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java rename to src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java index 3722688ae2..2e8840af15 100644 --- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.orders.pending; +package io.bitsquare.gui.main.orders.pending; -import io.bitsquare.gui.trade.orderbook.OrderBookListItem; +import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem; import io.bitsquare.trade.Trade; import org.slf4j.Logger; diff --git a/src/main/java/io/bitsquare/gui/settings/SettingsController.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/settings/SettingsController.java rename to src/main/java/io/bitsquare/gui/main/settings/SettingsController.java index 606e91f0f2..2335c599fb 100644 --- a/src/main/java/io/bitsquare/gui/settings/SettingsController.java +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings; +package io.bitsquare.gui.main.settings; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; diff --git a/src/main/java/io/bitsquare/gui/settings/SettingsView.fxml b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml similarity index 92% rename from src/main/java/io/bitsquare/gui/settings/SettingsView.fxml rename to src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml index 4ec4120bc1..0d49eee939 100644 --- a/src/main/java/io/bitsquare/gui/settings/SettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/trade/BuyController.java b/src/main/java/io/bitsquare/gui/main/trade/BuyController.java similarity index 96% rename from src/main/java/io/bitsquare/gui/trade/BuyController.java rename to src/main/java/io/bitsquare/gui/main/trade/BuyController.java index e7cc405114..653e017047 100644 --- a/src/main/java/io/bitsquare/gui/trade/BuyController.java +++ b/src/main/java/io/bitsquare/gui/main/trade/BuyController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade; +package io.bitsquare.gui.main.trade; import io.bitsquare.trade.Direction; diff --git a/src/main/java/io/bitsquare/gui/trade/BuyView.fxml b/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml similarity index 92% rename from src/main/java/io/bitsquare/gui/trade/BuyView.fxml rename to src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml index acd81cfe9b..5f95619822 100644 --- a/src/main/java/io/bitsquare/gui/trade/BuyView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/trade/SellController.java b/src/main/java/io/bitsquare/gui/main/trade/SellController.java similarity index 96% rename from src/main/java/io/bitsquare/gui/trade/SellController.java rename to src/main/java/io/bitsquare/gui/main/trade/SellController.java index e48b8450c2..d9286c4f3b 100644 --- a/src/main/java/io/bitsquare/gui/trade/SellController.java +++ b/src/main/java/io/bitsquare/gui/main/trade/SellController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade; +package io.bitsquare.gui.main.trade; import io.bitsquare.trade.Direction; diff --git a/src/main/java/io/bitsquare/gui/trade/SellView.fxml b/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml similarity index 92% rename from src/main/java/io/bitsquare/gui/trade/SellView.fxml rename to src/main/java/io/bitsquare/gui/main/trade/SellView.fxml index 40cfbd6e36..61b2a99035 100644 --- a/src/main/java/io/bitsquare/gui/trade/SellView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/trade/TradeController.java b/src/main/java/io/bitsquare/gui/main/trade/TradeController.java similarity index 96% rename from src/main/java/io/bitsquare/gui/trade/TradeController.java rename to src/main/java/io/bitsquare/gui/main/trade/TradeController.java index c9ce548ec7..ef94bd66f7 100644 --- a/src/main/java/io/bitsquare/gui/trade/TradeController.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeController.java @@ -15,14 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade; +package io.bitsquare.gui.main.trade; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.trade.orderbook.OrderBookController; -import io.bitsquare.gui.trade.takeoffer.TakeOfferController; -import io.bitsquare.gui.view.trade.CreateOfferViewCB; +import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB; +import io.bitsquare.gui.main.trade.orderbook.OrderBookController; +import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController; import io.bitsquare.trade.Direction; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/main/java/io/bitsquare/gui/model/trade/CreateOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java similarity index 99% rename from src/main/java/io/bitsquare/gui/model/trade/CreateOfferModel.java rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java index fed5378149..692d890446 100644 --- a/src/main/java/io/bitsquare/gui/model/trade/CreateOfferModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.model.trade; +package io.bitsquare.gui.main.trade.createoffer; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.bank.BankAccount; @@ -23,7 +23,7 @@ import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.gui.model.UIModel; +import io.bitsquare.gui.UIModel; import io.bitsquare.locale.Country; import io.bitsquare.settings.Settings; import io.bitsquare.trade.Direction; diff --git a/src/main/java/io/bitsquare/gui/pm/trade/CreateOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java similarity index 99% rename from src/main/java/io/bitsquare/gui/pm/trade/CreateOfferPM.java rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java index d346abdd6b..71c59fd8b5 100644 --- a/src/main/java/io/bitsquare/gui/pm/trade/CreateOfferPM.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java @@ -15,11 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.trade; +package io.bitsquare.gui.main.trade.createoffer; import io.bitsquare.btc.WalletFacade; -import io.bitsquare.gui.model.trade.CreateOfferModel; -import io.bitsquare.gui.pm.PresentationModel; +import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcValidator; import io.bitsquare.gui.util.validation.FiatValidator; diff --git a/src/main/java/io/bitsquare/gui/view/trade/CreateOfferView.fxml b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml similarity index 99% rename from src/main/java/io/bitsquare/gui/view/trade/CreateOfferView.fxml rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml index 8e5fb15801..59de20ab8d 100644 --- a/src/main/java/io/bitsquare/gui/view/trade/CreateOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml @@ -26,7 +26,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/view/trade/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java similarity index 99% rename from src/main/java/io/bitsquare/gui/view/trade/CreateOfferViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index f2cd6abd17..a01c8992ed 100644 --- a/src/main/java/io/bitsquare/gui/view/trade/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -15,8 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.view.trade; +package io.bitsquare.gui.main.trade.createoffer; +import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.NavigationController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.OverlayController; @@ -25,11 +26,9 @@ import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.btc.AddressTextField; import io.bitsquare.gui.components.btc.BalanceTextField; -import io.bitsquare.gui.help.Help; -import io.bitsquare.gui.help.HelpId; -import io.bitsquare.gui.pm.trade.CreateOfferPM; +import io.bitsquare.gui.main.help.Help; +import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.view.CachedCodeBehind; import io.bitsquare.locale.BSResources; import io.bitsquare.trade.orderbook.OrderBookFilter; diff --git a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java rename to src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java index 963d4569b8..407d2edc68 100644 --- a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java +++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java @@ -15,21 +15,21 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade.orderbook; +package io.bitsquare.gui.main.trade.orderbook; import io.bitsquare.bank.BankAccountType; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.CachedViewController; +import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.OverlayController; import io.bitsquare.gui.ViewController; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.trade.takeoffer.TakeOfferController; +import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB; +import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.view.CodeBehind; -import io.bitsquare.gui.view.trade.CreateOfferViewCB; import io.bitsquare.locale.BSResources; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; diff --git a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java similarity index 97% rename from src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java rename to src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java index c25eb2853e..1c95c5044b 100644 --- a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java +++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade.orderbook; +package io.bitsquare.gui.main.trade.orderbook; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.trade.Offer; diff --git a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml rename to src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml index b65868dd86..d55df7770a 100644 --- a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferController.java similarity index 99% rename from src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java rename to src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferController.java index 5b4a3394fd..e2c36a7d4f 100644 --- a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade.takeoffer; +package io.bitsquare.gui.main.trade.takeoffer; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; @@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.ValidatedTextField; -import io.bitsquare.gui.trade.TradeController; +import io.bitsquare.gui.main.trade.TradeController; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BitSquareValidator; import io.bitsquare.trade.Offer; diff --git a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml similarity index 99% rename from src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml rename to src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml index 6def44d4e3..ce26e9c245 100644 --- a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java index 7a283a4977..e726b0fc8a 100644 --- a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java +++ b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.orderbook; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.bank.BankAccount; -import io.bitsquare.gui.trade.orderbook.OrderBookListItem; +import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.msg.MessageFacade; diff --git a/src/test/java/io/bitsquare/BitSquareTestSuite.java b/src/test/java/io/bitsquare/BitSquareTestSuite.java index 93ef8f0f14..e254c1e106 100644 --- a/src/test/java/io/bitsquare/BitSquareTestSuite.java +++ b/src/test/java/io/bitsquare/BitSquareTestSuite.java @@ -18,7 +18,7 @@ package io.bitsquare; import io.bitsquare.btc.RestrictionsTest; -import io.bitsquare.gui.pm.trade.CreateOfferPMTest; +import io.bitsquare.gui.main.trade.createoffer.CreateOfferPMTest; import io.bitsquare.gui.util.BSFormatterTest; import io.bitsquare.gui.util.BitSquareConverterTest; import io.bitsquare.gui.util.BitSquareNumberValidatorTest; diff --git a/src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java similarity index 96% rename from src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java index 5701930954..a4e75b5e97 100644 --- a/src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.main.account; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class AccountSettingsUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), false); + getUrl("/io/bitsquare/gui/account/AccountSettingsView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java similarity index 96% rename from src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java index 7e23577de7..27a0a18938 100644 --- a/src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.main.account; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class AccountUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/AccountView.fxml"), false); + getUrl("/io/bitsquare/gui/account/AccountView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java similarity index 96% rename from src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java index 5654aad996..491916af23 100644 --- a/src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.main.account; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class RegistrationUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), false); + getUrl("/io/bitsquare/gui/account/content/RegistrationView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/account/SetupUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java similarity index 98% rename from src/test/java/io/bitsquare/gui/account/SetupUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java index 3dd84ef5ce..7496460ddd 100644 --- a/src/test/java/io/bitsquare/gui/account/SetupUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.main.account; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletControllerUIMock.java similarity index 95% rename from src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletControllerUIMock.java index dd01c878ef..ae97379c20 100644 --- a/src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.registration.uimock; +package io.bitsquare.gui.main.account.registration.uimock; import java.net.URL; diff --git a/src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java similarity index 97% rename from src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java index 30e730ef7f..85cbf75c02 100644 --- a/src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.account.registration.uimock; +package io.bitsquare.gui.main.account.registration.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml similarity index 97% rename from src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml index 25205d1a73..5d58857483 100644 --- a/src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml @@ -24,7 +24,7 @@ + fx:controller="io.bitsquare.gui.main.account.registration.uimock.FundRegistrationWalletControllerUIMock"> diff --git a/src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationControllerUIMock.java similarity index 96% rename from src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationControllerUIMock.java index be9ccd4f31..8156aa7690 100644 --- a/src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.registration.uimock; +package io.bitsquare.gui.main.account.registration.uimock; import java.net.URL; diff --git a/src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java similarity index 97% rename from src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java index 73f5596a1a..16516e7ee6 100644 --- a/src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.account.registration.uimock; +package io.bitsquare.gui.main.account.registration.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationViewUIMock.fxml similarity index 98% rename from src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationViewUIMock.fxml index 1a682e07f3..37255ce77c 100644 --- a/src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationViewUIMock.fxml @@ -24,7 +24,7 @@ + fx:controller="io.bitsquare.gui.main.account.registration.uimock.RegistrationControllerUIMock"> diff --git a/src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java similarity index 96% rename from src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java index 4fa1892642..494d550685 100644 --- a/src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings; +package io.bitsquare.gui.main.settings; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class FiatAccountUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"), false); + getUrl("/io/bitsquare/gui/account/content/FiatAccountView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java similarity index 96% rename from src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java index 18121298e0..55da3ebc8b 100644 --- a/src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings; +package io.bitsquare.gui.main.settings; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class PasswordUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/content/PasswordView.fxml"), false); + getUrl("/io/bitsquare/gui/account/content/PasswordView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java similarity index 95% rename from src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java index 82aaec664d..28206168a0 100644 --- a/src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings; +package io.bitsquare.gui.main.settings; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class RegistrationUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), false); + getUrl("/io/bitsquare/gui/account/content/RegistrationView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java similarity index 95% rename from src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java index 7787691772..63a4c58e77 100644 --- a/src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings; +package io.bitsquare.gui.main.settings; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class RestrictionsUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"), false); + getUrl("/io/bitsquare/gui/account/content/RestrictionsView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java similarity index 96% rename from src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java index 0947f54831..4a28822e1f 100644 --- a/src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings; +package io.bitsquare.gui.main.settings; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class SeedWordsUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"), false); + getUrl("/io/bitsquare/gui/account/content/SeedWordsView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsControllerUIMock.java similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsControllerUIMock.java index f9e6dd7918..870a08c475 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java index cdbaccd31d..da6818ac18 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsViewUIMock.fxml similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsViewUIMock.fxml index e2b9abb88e..1cd9e6e044 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsViewUIMock.fxml @@ -22,7 +22,7 @@ . */ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import java.net.URL; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java index bff4148671..4bae1c9340 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsViewUIMock.fxml similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsViewUIMock.fxml index 72cbb76341..af1abcef8a 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsViewUIMock.fxml @@ -23,7 +23,7 @@ + fx:controller="io.bitsquare.gui.main.settings.uimock.RestrictionSettingsControllerUIMock"> diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsControllerUIMock.java similarity index 96% rename from src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsControllerUIMock.java index 4a4fcf8f21..89e9356833 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import java.net.URL; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java index 75320e5570..68a92f9999 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsViewUIMock.fxml similarity index 97% rename from src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsViewUIMock.fxml index 33abc249a8..8f6487ecf5 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsViewUIMock.fxml @@ -26,7 +26,7 @@ stylesheets="@../../../../../../../main/java/io/bitsquare/gui/bitsquare.css" vgap="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" - fx:controller="io.bitsquare.gui.settings.uimock.SeedWordsControllerUIMock"> + fx:controller="io.bitsquare.gui.main.settings.uimock.SeedWordsControllerUIMock"> diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordControllerUIMock.java similarity index 96% rename from src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordControllerUIMock.java index 9b36bfddad..6c0fd429f1 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import java.net.URL; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java similarity index 98% rename from src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java index 84f1e18b0c..f7f6920a9c 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.settings.uimock; +package io.bitsquare.gui.main.settings.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordViewUIMock.fxml similarity index 97% rename from src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordViewUIMock.fxml index 3fadfb2fde..992a01b5df 100644 --- a/src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordViewUIMock.fxml @@ -24,7 +24,7 @@ + fx:controller="io.bitsquare.gui.main.settings.uimock.SetPasswordControllerUIMock"> diff --git a/src/test/java/io/bitsquare/gui/pm/trade/CreateOfferPMTest.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java similarity index 98% rename from src/test/java/io/bitsquare/gui/pm/trade/CreateOfferPMTest.java rename to src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java index 06ab56be4f..726ead9399 100644 --- a/src/test/java/io/bitsquare/gui/pm/trade/CreateOfferPMTest.java +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java @@ -15,10 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.pm.trade; +package io.bitsquare.gui.main.trade.createoffer; import io.bitsquare.bank.BankAccountType; -import io.bitsquare.gui.model.trade.CreateOfferModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; diff --git a/src/test/java/io/bitsquare/gui/trade/createoffer/CreateOfferUITestRunner.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java similarity index 95% rename from src/test/java/io/bitsquare/gui/trade/createoffer/CreateOfferUITestRunner.java rename to src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java index efce0dc5d8..18166e031d 100644 --- a/src/test/java/io/bitsquare/gui/trade/createoffer/CreateOfferUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade.createoffer; +package io.bitsquare.gui.main.trade.createoffer; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; @@ -68,7 +68,7 @@ public class CreateOfferUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/view/trade/CreateOfferView.fxml"), false); + getUrl("/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferControllerUIMock.java similarity index 99% rename from src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferControllerUIMock.java index f743f7e1d3..014ff3e521 100644 --- a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade.createoffer.uimock; +package io.bitsquare.gui.main.trade.createoffer.uimock; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; diff --git a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java similarity index 98% rename from src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java index 94c8886d95..caaf875129 100644 --- a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.trade.createoffer.uimock; +package io.bitsquare.gui.main.trade.createoffer.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.BSFXMLLoader; diff --git a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferViewUIMock.fxml similarity index 99% rename from src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferViewUIMock.fxml index 96aab5572e..3c07361e6b 100644 --- a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferViewUIMock.fxml @@ -26,7 +26,7 @@ stylesheets="@../../../../../../../../main/java/io/bitsquare/gui/bitsquare.css" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" - fx:controller="io.bitsquare.gui.trade.createoffer.uimock.CreateOfferControllerUIMock"> + fx:controller="io.bitsquare.gui.main.trade.createoffer.uimock.CreateOfferControllerUIMock">