From 693e95391a13d321a10b8a9d5830d253d41abe37 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sun, 23 Nov 2014 04:44:04 +0100 Subject: [PATCH] Rename Wizard.Step#useSettingsContext => hideWizardNavigation --- src/main/java/io/bitsquare/gui/Wizard.java | 2 +- .../account/content/changepassword/ChangePasswordView.java | 5 ++--- .../gui/main/account/content/fiat/FiatAccountView.java | 5 ++--- .../gui/main/account/content/irc/IrcAccountView.java | 2 +- .../gui/main/account/content/password/PasswordView.java | 5 ++--- .../main/account/content/registration/RegistrationView.java | 2 +- .../main/account/content/restrictions/RestrictionsView.java | 5 ++--- .../gui/main/account/content/seedwords/SeedWordsView.java | 5 ++--- .../gui/main/account/settings/AccountSettingsView.java | 3 +++ .../bitsquare/gui/main/account/setup/AccountSetupView.java | 4 +--- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/Wizard.java b/src/main/java/io/bitsquare/gui/Wizard.java index 235b18923d..86a34fa869 100644 --- a/src/main/java/io/bitsquare/gui/Wizard.java +++ b/src/main/java/io/bitsquare/gui/Wizard.java @@ -21,6 +21,6 @@ public interface Wizard { void nextStep(View current); public interface Step extends ChildOf { - void useSettingsContext(boolean useSettingsContext); + void hideWizardNavigation(); } } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java index 2903cd090a..59de26e897 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java @@ -70,9 +70,8 @@ public class ChangePasswordView extends InitializableView } @Override - public void useSettingsContext(boolean useSettingsContext) { + public void hideWizardNavigation() { } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java index 1bcd6042d4..775917baa7 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java @@ -75,9 +75,8 @@ public class PasswordView extends InitializableView implement } @Override - public void useSettingsContext(boolean useSettingsContext) { - if (useSettingsContext) - buttonsHBox.getChildren().remove(skipButton); + public void hideWizardNavigation() { + buttonsHBox.getChildren().remove(skipButton); } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java index b9420d1c7b..9e205dc687 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java @@ -147,7 +147,7 @@ public class RegistrationView extends InitializableView i } @Override - public void useSettingsContext(boolean useSettingsContext) { + public void hideWizardNavigation() { } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java index 7f52bb0977..951a97aa09 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java @@ -103,9 +103,8 @@ public class RestrictionsView extends ActivatableViewAndModel impleme } @Override - public void useSettingsContext(boolean useSettingsContext) { - if (useSettingsContext) - ((GridPane) root).getChildren().remove(completedButton); + public void hideWizardNavigation() { + ((GridPane) root).getChildren().remove(completedButton); } diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java index 2cf4279d1e..3277ed7c69 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java @@ -21,6 +21,7 @@ import io.bitsquare.gui.ActivatableViewAndModel; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; +import io.bitsquare.gui.Wizard; import io.bitsquare.gui.util.Colors; import javax.inject.Inject; @@ -131,6 +132,8 @@ public class AccountSettingsView extends ActivatableViewAndModel { ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl()); content.getChildren().setAll(loaded.view); View child = (View) loaded.controller; + if (child instanceof Wizard.Step) + ((Wizard.Step) child).hideWizardNavigation(); return child; } diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java index ab722ceb79..45e888c7eb 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java @@ -184,10 +184,8 @@ public class AccountSetupView extends ActivatableView implements Wizard { ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl()); content.getChildren().setAll(loaded.view); View child = (View) loaded.controller; - if (child instanceof Wizard.Step) { + if (child instanceof Wizard.Step) ((Step) child).setParent(this); - ((Step) child).useSettingsContext(false); - } return child; } }