Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-18 14:55:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional logic in AccountView#activate

Browse Source
This commit is contained in:
Chris Beams 2014-11-25 01:15:49 +01:00
parent fac64807f6
commit 50046b6adc
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/io/bitsquare/gui/main/account/AccountView.java
View File

@ -57,7 +57,7 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
public void initialize() {
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(AccountView.class) == 1)
loadView(viewPath);
loadView(viewPath.tip());
};
tabChangeListener = (ov, oldValue, newValue) -> {
@ -73,16 +73,18 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
navigation.addListener(navigationListener);
root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
if (!navigation.getCurrentPath().contains(AccountView.class))
return;
if (model.getNeedRegistration())
navigation.navigateTo(MainView.class, AccountView.class, AccountSetupWizard.class);
else if (root.getSelectionModel().getSelectedItem() == accountSettingsTab)
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class);
navigation.navigateTo(MainView.class, AccountView.class, ArbitratorSettingsView.class);
if (navigation.getCurrentPath().size() == 2 &&
navigation.getCurrentPath().get(1) == AccountView.class) {
if (model.getNeedRegistration()) {
navigation.navigateTo(MainView.class, AccountView.class, AccountSetupWizard.class);
}
else {
if (root.getSelectionModel().getSelectedItem() == accountSettingsTab)
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class);
else
navigation.navigateTo(MainView.class, AccountView.class, ArbitratorSettingsView.class);
}
}
}
@Override
@ -91,9 +93,8 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
}
private void loadView(ViewPath viewPath) {
private void loadView(Class<? extends View> viewClass) {
Tab tab;
Class<? extends View> viewClass = viewPath.tip();
if (viewClass == AccountSettingsView.class) {
tab = accountSettingsTab;