From 604d1c128e8212533416742f14f6b17ac7848ee8 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sun, 23 Nov 2014 06:25:08 +0100 Subject: [PATCH] Specify view root node type with generic parameter --- .../java/io/bitsquare/gui/AbstractView.java | 4 ++-- .../io/bitsquare/gui/ActivatableView.java | 4 +++- .../gui/ActivatableViewAndModel.java | 4 +++- .../io/bitsquare/gui/InitializableView.java | 3 ++- .../java/io/bitsquare/gui/main/MainView.java | 4 ++-- .../gui/main/account/AccountView.java | 19 +++++++++---------- .../browser/ArbitratorBrowserView.java | 4 ++-- .../ArbitratorRegistrationView.java | 3 ++- .../changepassword/ChangePasswordView.java | 2 +- .../account/content/fiat/FiatAccountView.java | 9 ++------- .../account/content/irc/IrcAccountView.java | 2 +- .../content/password/PasswordView.java | 2 +- .../registration/RegistrationView.java | 6 +++--- .../restrictions/RestrictionsView.java | 4 ++-- .../content/seedwords/SeedWordsView.java | 4 ++-- .../bitsquare/gui/main/funds/FundsView.java | 11 ++++++----- .../gui/main/portfolio/PortfolioView.java | 9 +++++---- .../portfolio/closed/ClosedTradesView.java | 3 ++- .../gui/main/portfolio/offer/OffersView.java | 3 ++- .../portfolio/pending/PendingTradesView.java | 2 +- .../gui/main/settings/SettingsView.java | 11 ++++++----- .../settings/application/PreferencesView.java | 3 ++- .../bitsquare/gui/main/trade/TradeView.java | 6 +++--- .../trade/createoffer/CreateOfferView.java | 2 +- .../main/trade/offerbook/OfferBookView.java | 5 +++-- .../main/trade/takeoffer/TakeOfferView.java | 2 +- 26 files changed, 69 insertions(+), 62 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/AbstractView.java b/src/main/java/io/bitsquare/gui/AbstractView.java index c891ff9d32..b0c30aadc7 100644 --- a/src/main/java/io/bitsquare/gui/AbstractView.java +++ b/src/main/java/io/bitsquare/gui/AbstractView.java @@ -23,12 +23,12 @@ import javafx.scene.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractView implements View { +public abstract class AbstractView implements View { protected final Logger log = LoggerFactory.getLogger(this.getClass()); + protected @FXML R root; protected final M model; - protected @FXML Parent root; public AbstractView(M model) { this.model = model; diff --git a/src/main/java/io/bitsquare/gui/ActivatableView.java b/src/main/java/io/bitsquare/gui/ActivatableView.java index 15dad66e11..754f6618a9 100644 --- a/src/main/java/io/bitsquare/gui/ActivatableView.java +++ b/src/main/java/io/bitsquare/gui/ActivatableView.java @@ -17,7 +17,9 @@ package io.bitsquare.gui; -public abstract class ActivatableView extends InitializableView { +import javafx.scene.*; + +public abstract class ActivatableView extends InitializableView { public ActivatableView(M model) { super(model); diff --git a/src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java b/src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java index b381c9c512..3ae3e2c829 100644 --- a/src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java +++ b/src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java @@ -17,9 +17,11 @@ package io.bitsquare.gui; +import javafx.scene.*; + import static com.google.common.base.Preconditions.checkNotNull; -public abstract class ActivatableViewAndModel extends ActivatableView { +public abstract class ActivatableViewAndModel extends ActivatableView { public ActivatableViewAndModel(M model) { super(checkNotNull(model, "Model must not be null")); diff --git a/src/main/java/io/bitsquare/gui/InitializableView.java b/src/main/java/io/bitsquare/gui/InitializableView.java index 62d2c75b89..038e160212 100644 --- a/src/main/java/io/bitsquare/gui/InitializableView.java +++ b/src/main/java/io/bitsquare/gui/InitializableView.java @@ -22,8 +22,9 @@ import java.net.URL; import java.util.ResourceBundle; import javafx.fxml.Initializable; +import javafx.scene.*; -public abstract class InitializableView extends AbstractView implements Initializable { +public abstract class InitializableView extends AbstractView implements Initializable { public InitializableView(M model) { super(model); diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java index 6b88951d71..8d6909daf3 100644 --- a/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/src/main/java/io/bitsquare/gui/main/MainView.java @@ -44,7 +44,7 @@ import javafx.scene.text.*; import static io.bitsquare.gui.Navigation.Item.*; import static javafx.scene.layout.AnchorPane.*; -public class MainView extends ActivatableView { +public class MainView extends ActivatableView { public static final String TITLE_KEY = "view.title"; @@ -140,7 +140,7 @@ public class MainView extends ActivatableView { VBox splashScreen = createSplashScreen(); - ((StackPane) root).getChildren().addAll(baseApplicationContainer, splashScreen); + root.getChildren().addAll(baseApplicationContainer, splashScreen); Platform.runLater( () -> model.initBackend().subscribe( diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/src/main/java/io/bitsquare/gui/main/account/AccountView.java index 4a40f04ead..c0cb3f23c5 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.gui.ActivatableViewAndModel; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -28,21 +28,20 @@ import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.*; -public class AccountView extends ActivatableViewAndModel { +public class AccountView extends ActivatableView { private Navigation.Listener navigationListener; private ChangeListener tabChangeListener; @FXML Tab accountSettingsTab, arbitratorSettingsTab; - private final AccountViewModel model; private final ViewLoader viewLoader; private final Navigation navigation; @Inject private AccountView(AccountViewModel model, ViewLoader viewLoader, Navigation navigation) { - this.model = model; + super(model); this.viewLoader = viewLoader; this.navigation = navigation; } @@ -69,9 +68,9 @@ public class AccountView extends ActivatableViewAndModel { } @Override - public void doActivate() { + public void activate() { navigation.addListener(navigationListener); - ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener); if (navigation.getCurrentItems().length == 2 && navigation.getCurrentItems()[1] == Navigation.Item.ACCOUNT) { @@ -80,7 +79,7 @@ public class AccountView extends ActivatableViewAndModel { Navigation.Item.ACCOUNT_SETUP); } else { - if (((TabPane) root).getSelectionModel().getSelectedItem() == accountSettingsTab) + if (root.getSelectionModel().getSelectedItem() == accountSettingsTab) navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, Navigation.Item.ACCOUNT_SETTINGS); else @@ -91,9 +90,9 @@ public class AccountView extends ActivatableViewAndModel { } @Override - public void doDeactivate() { + public void deactivate() { navigation.removeListener(navigationListener); - ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); } @@ -123,7 +122,7 @@ public class AccountView extends ActivatableViewAndModel { arbitratorSettingsTab.setDisable(true); tab.setContent(loaded.view); - ((TabPane) root).getSelectionModel().select(tab); + root.getSelectionModel().select(tab); return (View) loaded.controller; } } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java index 41abf7b5a7..9bf65280bf 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java @@ -40,7 +40,7 @@ import javafx.scene.layout.*; import javafx.stage.Stage; // TODO Arbitration is very basic yet -public class ArbitratorBrowserView extends ActivatableView implements ArbitratorListener { +public class ArbitratorBrowserView extends ActivatableView implements ArbitratorListener { private final ViewLoader viewLoader; private final AccountSettings accountSettings; @@ -95,7 +95,7 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator @Override protected View loadView(Navigation.Item navigationItem) { ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl()); - ((Pane) root).getChildren().set(0, loaded.view); + root.getChildren().set(0, loaded.view); return arbitratorProfileView = (ArbitratorProfileView) loaded.controller; } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java index 9ef796ae72..fffcaea04e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java @@ -48,6 +48,7 @@ import javax.inject.Inject; import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.scene.layout.*; import javafx.stage.Stage; import javafx.util.StringConverter; @@ -55,7 +56,7 @@ import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; // TODO Arbitration is very basic yet -public class ArbitratorRegistrationView extends ActivatableView { +public class ArbitratorRegistrationView extends ActivatableView { private final Persistence persistence; private final WalletService walletService; 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 8e485229ed..516903e7cd 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 @@ -31,7 +31,7 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ChangePasswordView extends InitializableView implements Wizard.Step { +public class ChangePasswordView extends InitializableView implements Wizard.Step { private static final Logger log = LoggerFactory.getLogger(ChangePasswordView.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java index 4d7070cbf9..fe374d955e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java @@ -21,9 +21,9 @@ import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; import io.bitsquare.gui.ActivatableViewAndModel; import io.bitsquare.gui.OverlayManager; +import io.bitsquare.gui.Wizard; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.util.validation.InputValidator; @@ -47,14 +47,9 @@ import org.controlsfx.control.action.AbstractAction; import org.controlsfx.control.action.Action; import org.controlsfx.dialog.Dialog; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static javafx.beans.binding.Bindings.createBooleanBinding; -public class FiatAccountView extends ActivatableViewAndModel implements Wizard.Step { - - private static final Logger log = LoggerFactory.getLogger(FiatAccountView.class); +public class FiatAccountView extends ActivatableViewAndModel implements Wizard.Step { @FXML HBox buttonsHBox; @FXML ComboBox regionComboBox; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java index 41a629c1cb..6473d5040f 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; /* Just temporary for giving the user a possibility to test the app via simulating the bank transfer in a IRC chat. */ -public class IrcAccountView extends ActivatableViewAndModel implements Wizard.Step { +public class IrcAccountView extends ActivatableViewAndModel implements Wizard.Step { private static final Logger log = LoggerFactory.getLogger(IrcAccountView.class); 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 baff1bb151..2c8ccb7978 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 @@ -31,7 +31,7 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PasswordView extends InitializableView implements Wizard.Step { +public class PasswordView extends InitializableView implements Wizard.Step { private static final Logger log = LoggerFactory.getLogger(PasswordView.class); 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 88aecca58c..d7e58e91b8 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 @@ -35,12 +35,13 @@ import javax.inject.Inject; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.scene.layout.*; import org.controlsfx.control.action.AbstractAction; import org.controlsfx.control.action.Action; import org.controlsfx.dialog.Dialog; -public class RegistrationView extends InitializableView implements Wizard.Step { +public class RegistrationView extends InitializableView implements Wizard.Step { private final OverlayManager overlayManager; @@ -110,8 +111,7 @@ public class RegistrationView extends InitializableView i public void handle(ActionEvent actionEvent) { getProperties().put("type", "CLOSE"); try { - if (parent instanceof Wizard) - ((Wizard) parent).nextStep(RegistrationView.this); + parent.nextStep(RegistrationView.this); } catch (Exception e) { e.printStackTrace(); } 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 56d6356208..1182a5f285 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 @@ -43,7 +43,7 @@ import javafx.stage.Stage; import javafx.util.Callback; import javafx.util.StringConverter; -public class RestrictionsView extends ActivatableViewAndModel implements Wizard.Step { +public class RestrictionsView extends ActivatableViewAndModel implements Wizard.Step { @FXML ListView languagesListView; @FXML ListView countriesListView; @@ -93,7 +93,7 @@ public class RestrictionsView extends ActivatableViewAndModel implements Wizard.Step { +public class SeedWordsView extends InitializableView implements Wizard.Step { private Wizard parent; @@ -56,7 +56,7 @@ public class SeedWordsView extends InitializableView impleme @Override public void hideWizardNavigation() { - ((GridPane) root).getChildren().remove(completedButton); + root.getChildren().remove(completedButton); } diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java index 64e7c47800..ba9122b13b 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java @@ -17,6 +17,7 @@ package io.bitsquare.gui.main.funds; +import io.bitsquare.gui.Activatable; import io.bitsquare.gui.ActivatableViewAndModel; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; @@ -28,7 +29,7 @@ import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.*; -public class FundsView extends ActivatableViewAndModel { +public class FundsView extends ActivatableViewAndModel { private Navigation.Listener navigationListener; private ChangeListener tabChangeListener; @@ -67,10 +68,10 @@ public class FundsView extends ActivatableViewAndModel { @Override public void doActivate() { - ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); - if (((TabPane) root).getSelectionModel().getSelectedItem() == transactionsTab) + if (root.getSelectionModel().getSelectedItem() == transactionsTab) navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.FUNDS, Navigation.Item.TRANSACTIONS); else navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.FUNDS, Navigation.Item.WITHDRAWAL); @@ -78,7 +79,7 @@ public class FundsView extends ActivatableViewAndModel { @Override public void doDeactivate() { - ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); navigation.removeListener(navigationListener); } @@ -100,7 +101,7 @@ public class FundsView extends ActivatableViewAndModel { break; } currentTab.setContent(loaded.view); - ((TabPane) root).getSelectionModel().select(currentTab); + root.getSelectionModel().select(currentTab); return (View) loaded.controller; } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index 30715eebe7..798fad9cf4 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -17,6 +17,7 @@ package io.bitsquare.gui.main.portfolio; +import io.bitsquare.gui.Activatable; import io.bitsquare.gui.ActivatableViewAndModel; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; @@ -29,7 +30,7 @@ import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.*; -public class PortfolioView extends ActivatableViewAndModel { +public class PortfolioView extends ActivatableViewAndModel { private Tab currentTab; private Navigation.Listener navigationListener; @@ -73,7 +74,7 @@ public class PortfolioView extends ActivatableViewAndModel { @Override public void doActivate() { - ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); if (tradeManager.getPendingTrades().size() == 0) @@ -84,7 +85,7 @@ public class PortfolioView extends ActivatableViewAndModel { @Override public void doDeactivate() { - ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); navigation.removeListener(navigationListener); currentTab = null; } @@ -111,7 +112,7 @@ public class PortfolioView extends ActivatableViewAndModel { break; } currentTab.setContent(loaded.view); - ((TabPane) root).getSelectionModel().select(currentTab); + root.getSelectionModel().select(currentTab); return (View) loaded.controller; } } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java index 4959b14618..e1b014f675 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java @@ -25,9 +25,10 @@ import javax.inject.Inject; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.scene.layout.*; import javafx.util.Callback; -public class ClosedTradesView extends ActivatableViewAndModel { +public class ClosedTradesView extends ActivatableViewAndModel { @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, dateColumn, tradeIdColumn; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java index e6a29e3a45..580b029803 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java @@ -27,9 +27,10 @@ import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.fxml.FXML; import javafx.scene.control.*; import javafx.scene.image.*; +import javafx.scene.layout.*; import javafx.util.Callback; -public class OffersView extends ActivatableViewAndModel { +public class OffersView extends ActivatableViewAndModel { @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, dateColumn, offerIdColumn, removeItemColumn; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java index 4e269851f6..5546ba547e 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java @@ -52,7 +52,7 @@ import javafx.scene.layout.*; import javafx.util.Callback; import javafx.util.StringConverter; -public class PendingTradesView extends ActivatableViewAndModel { +public class PendingTradesView extends ActivatableViewAndModel { private ChangeListener selectedItemChangeListener; private ListChangeListener listChangeListener; diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java index fdf2530e03..1a545fc7e3 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java @@ -17,6 +17,7 @@ package io.bitsquare.gui.main.settings; +import io.bitsquare.gui.Activatable; import io.bitsquare.gui.ActivatableViewAndModel; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; @@ -29,7 +30,7 @@ import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.*; -public class SettingsView extends ActivatableViewAndModel { +public class SettingsView extends ActivatableViewAndModel { private final ViewLoader viewLoader; private final Navigation navigation; @@ -71,10 +72,10 @@ public class SettingsView extends ActivatableViewAndModel { @Override public void doActivate() { - ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); - if (((TabPane) root).getSelectionModel().getSelectedItem() == preferencesTab) + if (root.getSelectionModel().getSelectedItem() == preferencesTab) navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.SETTINGS, Navigation.Item.PREFERENCES); @@ -86,7 +87,7 @@ public class SettingsView extends ActivatableViewAndModel { @Override public void doDeactivate() { - ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); + root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); navigation.removeListener(navigationListener); } @@ -107,7 +108,7 @@ public class SettingsView extends ActivatableViewAndModel { throw new IllegalArgumentException("navigation item of type " + navigationItem + " is not allowed"); } tab.setContent(loaded.view); - ((TabPane) root).getSelectionModel().select(tab); + root.getSelectionModel().select(tab); return (View) loaded.controller; } diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java index 621d1a9fb5..642bacc28f 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java +++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java @@ -23,11 +23,12 @@ import javax.inject.Inject; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.scene.layout.*; /** * This UI is not cached as it is normally only needed once. */ -public class PreferencesView extends ActivatableViewAndModel { +public class PreferencesView extends ActivatableViewAndModel { @FXML ComboBox btcDenominationComboBox; @FXML CheckBox useAnimationsCheckBox, useEffectsCheckBox; diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java index f9ae037a51..ab46227eb6 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java @@ -38,7 +38,7 @@ import javafx.collections.ListChangeListener; import javafx.scene.*; import javafx.scene.control.*; -public class TradeView extends ActivatableView { +public class TradeView extends ActivatableView { private OfferBookView offerBookView; private CreateOfferView createOfferView; @@ -81,7 +81,7 @@ public class TradeView extends ActivatableView { // We need to remove open validation error popups // Platform.runLater needed as focus-out event is called after selectedIndexProperty changed // TODO Find a way to do that in the InputTextField directly, but a tab change does not trigger any event... - TabPane tabPane = (TabPane) root; + TabPane tabPane = root; tabPane.getSelectionModel().selectedIndexProperty() .addListener((observableValue, oldValue, newValue) -> Platform.runLater(InputTextField::hideErrorMessageDisplay)); @@ -125,7 +125,7 @@ public class TradeView extends ActivatableView { @Override protected View loadView(Navigation.Item navigationItem) { - TabPane tabPane = (TabPane) root; + TabPane tabPane = root; if (navigationItem == Navigation.Item.OFFER_BOOK && offerBookView == null) { // Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens. ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false); diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java index c788a0c243..7e4cf403b4 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java @@ -65,7 +65,7 @@ import static javafx.beans.binding.Bindings.createStringBinding; // TODO Implement other positioning method in InoutTextField to display it over the field instead of right side // priceAmountHBox is too large after redesign as to be used as layoutReference. -public class CreateOfferView extends ActivatableViewAndModel { +public class CreateOfferView extends ActivatableViewAndModel { private final Navigation navigation; private final OverlayManager overlayManager; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java index e64c588c15..f309783f33 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java @@ -57,7 +57,8 @@ import static javafx.beans.binding.Bindings.createStringBinding; * TODO: The advanced filters are not impl. yet * The restrictions handling is open from the concept and is only implemented for countries yet. */ -public class OfferBookView extends ActivatableViewAndModel implements ChildView { +public class OfferBookView extends ActivatableViewAndModel implements + ChildView { private final Navigation navigation; private final OverlayManager overlayManager; @@ -287,7 +288,7 @@ public class OfferBookView extends ActivatableViewAndModel i } private void toggleDetailsScreen(boolean visible) { - ((GridPane) root).setVgap(visible ? 5 : 0); + root.setVgap(visible ? 5 : 0); extendedButton1Label.setVisible(visible); extendedButton1Label.setManaged(visible); diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java index 81728d087c..2b9e0e569d 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java @@ -62,7 +62,7 @@ import org.controlsfx.control.action.AbstractAction; import org.controlsfx.control.action.Action; import org.controlsfx.dialog.Dialog; -public class TakeOfferView extends ActivatableViewAndModel { +public class TakeOfferView extends ActivatableViewAndModel { private final Navigation navigation; private final OverlayManager overlayManager;