From ffd7188534190e31f4fe92ede2d0056aa61f41e1 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 11 Sep 2014 01:35:11 +0200 Subject: [PATCH] Change account packages --- .../java/io/bitsquare/gui/NavigationItem.java | 16 ++++++++-------- .../gui/main/account/AccountViewCB.java | 1 + .../ChangePasswordModel.java | 2 +- .../{ => changepassword}/ChangePasswordPM.java | 2 +- .../{ => changepassword}/ChangePasswordView.fxml | 3 ++- .../ChangePasswordViewCB.java | 5 +++-- .../content/{ => fiat}/FiatAccountModel.java | 2 +- .../content/{ => fiat}/FiatAccountPm.java | 2 +- .../content/{ => fiat}/FiatAccountView.fxml | 3 ++- .../content/{ => fiat}/FiatAccountViewCB.java | 5 +++-- .../content/{ => password}/PasswordModel.java | 2 +- .../content/{ => password}/PasswordPM.java | 2 +- .../content/{ => password}/PasswordView.fxml | 3 ++- .../content/{ => password}/PasswordViewCB.java | 5 +++-- .../{ => registration}/RegistrationModel.java | 2 +- .../{ => registration}/RegistrationPM.java | 2 +- .../{ => registration}/RegistrationView.fxml | 3 ++- .../{ => registration}/RegistrationViewCB.java | 5 +++-- .../{ => restrictions}/RestrictionsModel.java | 2 +- .../{ => restrictions}/RestrictionsPM.java | 2 +- .../{ => restrictions}/RestrictionsView.fxml | 3 ++- .../{ => restrictions}/RestrictionsViewCB.java | 5 +++-- .../content/{ => seedwords}/SeedWordsModel.java | 2 +- .../content/{ => seedwords}/SeedWordsPM.java | 2 +- .../content/{ => seedwords}/SeedWordsView.fxml | 3 ++- .../content/{ => seedwords}/SeedWordsViewCB.java | 5 +++-- .../{ => settings}/AccountSettingsModel.java | 2 +- .../{ => settings}/AccountSettingsPM.java | 2 +- .../{ => settings}/AccountSettingsView.fxml | 2 +- .../{ => settings}/AccountSettingsViewCB.java | 2 +- .../account/{ => setup}/AccountSetupModel.java | 2 +- .../main/account/{ => setup}/AccountSetupPM.java | 2 +- .../account/{ => setup}/AccountSetupView.fxml | 2 +- .../account/{ => setup}/AccountSetupViewCB.java | 12 ++++++------ 34 files changed, 64 insertions(+), 51 deletions(-) rename src/main/java/io/bitsquare/gui/main/account/content/{ => changepassword}/ChangePasswordModel.java (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => changepassword}/ChangePasswordPM.java (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => changepassword}/ChangePasswordView.fxml (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => changepassword}/ChangePasswordViewCB.java (95%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => fiat}/FiatAccountModel.java (99%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => fiat}/FiatAccountPm.java (99%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => fiat}/FiatAccountView.fxml (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => fiat}/FiatAccountViewCB.java (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => password}/PasswordModel.java (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => password}/PasswordPM.java (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => password}/PasswordView.fxml (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => password}/PasswordViewCB.java (95%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => registration}/RegistrationModel.java (99%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => registration}/RegistrationPM.java (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => registration}/RegistrationView.fxml (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => registration}/RegistrationViewCB.java (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => restrictions}/RestrictionsModel.java (99%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => restrictions}/RestrictionsPM.java (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => restrictions}/RestrictionsView.fxml (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => restrictions}/RestrictionsViewCB.java (98%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => seedwords}/SeedWordsModel.java (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => seedwords}/SeedWordsPM.java (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => seedwords}/SeedWordsView.fxml (97%) rename src/main/java/io/bitsquare/gui/main/account/content/{ => seedwords}/SeedWordsViewCB.java (94%) rename src/main/java/io/bitsquare/gui/main/account/{ => settings}/AccountSettingsModel.java (97%) rename src/main/java/io/bitsquare/gui/main/account/{ => settings}/AccountSettingsPM.java (97%) rename src/main/java/io/bitsquare/gui/main/account/{ => settings}/AccountSettingsView.fxml (97%) rename src/main/java/io/bitsquare/gui/main/account/{ => settings}/AccountSettingsViewCB.java (99%) rename src/main/java/io/bitsquare/gui/main/account/{ => setup}/AccountSetupModel.java (97%) rename src/main/java/io/bitsquare/gui/main/account/{ => setup}/AccountSetupPM.java (97%) rename src/main/java/io/bitsquare/gui/main/account/{ => setup}/AccountSetupView.fxml (97%) rename src/main/java/io/bitsquare/gui/main/account/{ => setup}/AccountSetupViewCB.java (95%) diff --git a/src/main/java/io/bitsquare/gui/NavigationItem.java b/src/main/java/io/bitsquare/gui/NavigationItem.java index 2b5d2a4709..b2c45641be 100644 --- a/src/main/java/io/bitsquare/gui/NavigationItem.java +++ b/src/main/java/io/bitsquare/gui/NavigationItem.java @@ -62,8 +62,8 @@ public enum NavigationItem { TRANSACTIONS(2, "/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"), // account - ACCOUNT_SETUP(2, "/io/bitsquare/gui/main/account/AccountSetupView.fxml"), - ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/main/account/AccountSettingsView.fxml"), + ACCOUNT_SETUP(2, "/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml"), + ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml"), /////////////////////////////////////////////////////////////////////////////////////////// @@ -71,12 +71,12 @@ public enum NavigationItem { /////////////////////////////////////////////////////////////////////////////////////////// // account content - 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"), + SEED_WORDS(3, "/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml"), + ADD_PASSWORD(3, "/io/bitsquare/gui/main/account/content/password/PasswordView.fxml"), + CHANGE_PASSWORD(3, "/io/bitsquare/gui/main/account/content/password/PasswordView.fxml"), + RESTRICTIONS(3, "/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml"), + REGISTRATION(3, "/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml"), + FIAT_ACCOUNT(3, "/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml"), /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java index 1de9e436fe..29b536da14 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java @@ -21,6 +21,7 @@ import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationController; import io.bitsquare.gui.NavigationItem; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java index 5edc614ef7..422fb16d3c 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.changepassword; import io.bitsquare.gui.UIModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java index 0cb1598f0e..ebfe2605bf 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.changepassword; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.validation.InputValidator; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml index 72066656de..9c5c736ca2 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml @@ -21,7 +21,8 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java similarity index 95% rename from src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java index 990488ee13..3d1d1d2e97 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.changepassword; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java index 7735fcf797..a8e51dd647 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.fiat; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java rename to src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java index 67d8829795..723c513eae 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.fiat; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml index a97e511867..0518190e89 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml @@ -23,7 +23,8 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java index 4f18a33b83..8f96c986bc 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java @@ -15,14 +15,15 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.fiat; 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.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.validation.InputValidator; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java index 3b83ac5f63..2b12e09e6d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.password; import io.bitsquare.gui.UIModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java index c8cd7b5255..8a729ad1bb 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.password; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.validation.InputValidator; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml index 1b1d0b98c6..ebce467627 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml @@ -21,7 +21,8 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java similarity index 95% rename from src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java index b91e180f2d..d5b81af2d4 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.password; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java index 889edce2b9..df7a414e2f 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.registration; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java index d007e8ce19..6a69cffa49 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.registration; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.PresentationModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml index 842c0800d3..7375cd88a4 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml @@ -23,7 +23,8 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java index 8b11552ac4..032b86c8bc 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java @@ -15,14 +15,15 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.registration; 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.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.locale.BSResources; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java index 21e9f03645..f2ecaa8edd 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Reputation; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java index 6f010273dc..55e44e25d2 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.PresentationModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml index 1060d5ddea..7656111ea9 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml @@ -20,7 +20,8 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java index da93f15ad7..867cf78d5a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.BitSquare; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.ImageUtil; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java rename to src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java index 5a09546adf..f48b223f3f 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.seedwords; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.UIModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java rename to src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java index d8a92ef764..a53f211ac4 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.seedwords; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml rename to src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml index 7e406607d2..6e6c86fcfb 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml @@ -22,7 +22,8 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java similarity index 94% rename from src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java index 6159f3cf8a..fee6354b6e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account.content; +package io.bitsquare.gui.main.account.content.seedwords; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.main.account.AccountSetupViewCB; +import io.bitsquare.gui.main.account.content.ContextAware; +import io.bitsquare.gui.main.account.setup.AccountSetupViewCB; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java rename to src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java index af17a8b7d0..69551cff68 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account; +package io.bitsquare.gui.main.account.settings; import io.bitsquare.gui.UIModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java rename to src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java index 7c0df9e80e..66aea0e435 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account; +package io.bitsquare.gui.main.account.settings; import io.bitsquare.gui.PresentationModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml rename to src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml index be34a20c81..561f27253d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java index 52a5b6eecd..54df35e240 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account; +package io.bitsquare.gui.main.account.settings; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.CodeBehind; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java rename to src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java index a4994778c5..0df969c715 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account; +package io.bitsquare.gui.main.account.setup; import io.bitsquare.gui.UIModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java rename to src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java index 275d31a118..98f56599de 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.account; +package io.bitsquare.gui.main.account.setup; import io.bitsquare.gui.PresentationModel; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml rename to src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml index ef7d22a280..36b83281e8 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml @@ -19,7 +19,7 @@ - . */ -package io.bitsquare.gui.main.account; +package io.bitsquare.gui.main.account.setup; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationItem; 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.main.account.content.fiat.FiatAccountViewCB; +import io.bitsquare.gui.main.account.content.password.PasswordViewCB; +import io.bitsquare.gui.main.account.content.registration.RegistrationViewCB; +import io.bitsquare.gui.main.account.content.restrictions.RestrictionsViewCB; +import io.bitsquare.gui.main.account.content.seedwords.SeedWordsViewCB; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.util.BSFXMLLoader;