From ba66845c74b1cf81bcb26f0a341c5a99d1432e49 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 22 Nov 2014 15:17:21 +0100 Subject: [PATCH] Apply template methods to CachedViewCB's Activatable methods ... and remove empty lifecycle methods in view classes --- .../java/io/bitsquare/gui/CachedViewCB.java | 22 ++++++++++----- .../gui/main/account/AccountViewCB.java | 8 ++---- .../arbitrator/ArbitratorSettingsViewCB.java | 28 ------------------- .../browser/ArbitratorBrowserViewCB.java | 19 ------------- .../profile/ArbitratorProfileViewCB.java | 28 ------------------- .../ArbitratorRegistrationViewCB.java | 18 ------------ .../content/fiat/FiatAccountViewCB.java | 17 +---------- .../account/content/irc/IrcAccountViewCB.java | 16 +---------- .../restrictions/RestrictionsViewCB.java | 16 +---------- .../settings/AccountSettingsViewCB.java | 14 ++-------- .../bitsquare/gui/main/funds/FundsViewCB.java | 8 ++---- .../transactions/TransactionsViewCB.java | 8 ++---- .../funds/withdrawal/WithdrawalViewCB.java | 14 ++-------- .../bitsquare/gui/main/home/HomeViewCB.java | 28 ------------------- .../io/bitsquare/gui/main/msg/MsgViewCB.java | 28 ------------------- .../gui/main/portfolio/PortfolioViewCB.java | 14 ++-------- .../portfolio/closed/ClosedTradesViewCB.java | 16 +---------- .../main/portfolio/offer/OffersViewCB.java | 17 +---------- .../pending/PendingTradesViewCB.java | 8 ++---- .../gui/main/settings/SettingsViewCB.java | 8 ++---- .../application/PreferencesViewCB.java | 14 ++-------- .../bitsquare/gui/main/trade/TradeViewCB.java | 15 ++-------- .../trade/createoffer/CreateOfferViewCB.java | 11 ++------ .../main/trade/offerbook/OfferBookViewCB.java | 16 ++--------- .../main/trade/takeoffer/TakeOfferViewCB.java | 10 ------- 25 files changed, 44 insertions(+), 357 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedViewCB.java index 43e40c7aa5..4807c5f9e0 100644 --- a/src/main/java/io/bitsquare/gui/CachedViewCB.java +++ b/src/main/java/io/bitsquare/gui/CachedViewCB.java @@ -30,7 +30,7 @@ import static com.google.common.base.Preconditions.checkNotNull; * If caching is used for loader we use the CachedViewController for turning the controller into sleep mode if not * active and awake it at reactivation. */ -public class CachedViewCB extends ViewCB { +public class CachedViewCB extends ViewCB implements Activatable { private static final Logger log = LoggerFactory.getLogger(CachedViewCB.class); protected static final Activatable EMPTY_MODEL = new Activatable() { @@ -81,21 +81,29 @@ public class CachedViewCB extends ViewCB { /** * Used to activate resources (adding listeners, starting timers or animations,...) */ - public void activate() { - log.trace("Lifecycle: activate " + this.getClass().getSimpleName()); - + @Override + public final void activate() { if (model != null) model.activate(); + + doActivate(); + } + + protected void doActivate() { } /** * Used for deactivating resources (removing listeners, stopping timers or animations,...) */ - public void deactivate() { - log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName()); - + @Override + public final void deactivate() { if (model != null) model.deactivate(); + + doDeactivate(); + } + + protected void doDeactivate() { } /** 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 6a628a8894..99b8af1c55 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java @@ -90,9 +90,7 @@ public class AccountViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { navigation.addListener(navigationListener); ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); @@ -114,9 +112,7 @@ public class AccountViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { navigation.removeListener(navigationListener); ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java index 33c80f9513..5de922210a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java @@ -57,34 +57,6 @@ public class ArbitratorSettingsViewCB extends CachedViewCB { } - /////////////////////////////////////////////////////////////////////////////////////////// - // Lifecycle - /////////////////////////////////////////////////////////////////////////////////////////// - - @SuppressWarnings("EmptyMethod") - @Override - public void initialize(URL url, ResourceBundle rb) { - super.initialize(url, rb); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void activate() { - super.activate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Navigation diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java index 7988c1a619..0022774123 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java @@ -91,25 +91,6 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL } - @SuppressWarnings("EmptyMethod") - @Override - public void activate() { - super.activate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - - /////////////////////////////////////////////////////////////////////////////////////////// // Navigation /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java index 1721573c05..b3828b17fc 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java @@ -65,34 +65,6 @@ public class ArbitratorProfileViewCB extends CachedViewCB { } - /////////////////////////////////////////////////////////////////////////////////////////// - // Lifecycle - /////////////////////////////////////////////////////////////////////////////////////////// - - @SuppressWarnings("EmptyMethod") - @Override - public void initialize(URL url, ResourceBundle rb) { - super.initialize(url, rb); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void activate() { - super.activate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Public Methods diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java index cab1461cf3..ddc85a468d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java @@ -194,24 +194,6 @@ public class ArbitratorRegistrationViewCB extends CachedViewCB { }); } - @SuppressWarnings("EmptyMethod") - @Override - public void activate() { - super.activate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Public Methods /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java index c9b08bf94e..479602633f 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java @@ -107,28 +107,13 @@ public class FiatAccountViewCB extends CachedViewCB implements Co } @Override - public void activate() { - super.activate(); - + public void doActivate() { setupListeners(); setupBindings(); selectionComboBox.setItems(model.getAllBankAccounts()); } - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - - /////////////////////////////////////////////////////////////////////////////////////////// // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java index fcd466eeb1..07fdefcc4c 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java @@ -136,9 +136,7 @@ public class IrcAccountViewCB extends CachedViewCB implements Cont } @Override - public void activate() { - super.activate(); - + public void doActivate() { setupListeners(); setupBindings(); @@ -153,18 +151,6 @@ public class IrcAccountViewCB extends CachedViewCB implements Cont "bank transfer.")); } - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // ContextAware implementation diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java index b96151a3f8..8713cbc9e0 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java @@ -94,26 +94,12 @@ public class RestrictionsViewCB extends CachedViewCB implements } @Override - public void activate() { - super.activate(); - + public void doActivate() { languagesListView.setItems(model.getLanguageList()); countriesListView.setItems(model.getCountryList()); arbitratorsListView.setItems(model.getArbitratorList()); } - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // ContextAware implementation diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java index d1b4760518..651daf70a3 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java @@ -108,9 +108,7 @@ public class AccountSettingsViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { navigation.addListener(listener); Navigation.Item[] items = navigation.getCurrentItems(); if (items.length == 3 && @@ -128,18 +126,10 @@ public class AccountSettingsViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { navigation.removeListener(listener); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Public Methods diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java index 3d7610c4e7..437d13db75 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java @@ -79,9 +79,7 @@ public class FundsViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); @@ -92,9 +90,7 @@ public class FundsViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); navigation.removeListener(navigationListener); } diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java index f36dfa2440..fbed15b6cf 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java @@ -81,9 +81,7 @@ public class TransactionsViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { List transactions = walletService.getWallet().getRecentTransactions(10000, true); transactionsListItems = FXCollections.observableArrayList(); transactionsListItems.addAll(transactions.stream().map(transaction -> @@ -93,9 +91,7 @@ public class TransactionsViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { for (TransactionsListItem transactionsListItem : transactionsListItems) transactionsListItem.cleanup(); } diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java index f943cd0d00..beb77db420 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java @@ -102,9 +102,7 @@ public class WithdrawalViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { table.getSelectionModel().selectedItemProperty().addListener((observableValue, oldValue, newValue) -> { if (newValue != null) { @@ -133,19 +131,11 @@ public class WithdrawalViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { for (WithdrawalListItem item : addressList) item.cleanup(); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // UI handlers diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java b/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java index 372d558b52..b126702328 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java @@ -31,34 +31,6 @@ import org.slf4j.LoggerFactory; public class HomeViewCB extends CachedViewCB { private static final Logger log = LoggerFactory.getLogger(HomeViewCB.class); - /////////////////////////////////////////////////////////////////////////////////////////// - // Lifecycle - /////////////////////////////////////////////////////////////////////////////////////////// - - @SuppressWarnings("EmptyMethod") - @Override - public void initialize(URL url, ResourceBundle rb) { - super.initialize(url, rb); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void activate() { - super.activate(); - } - } diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java b/src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java index 7d169e08e6..b2ea6420f7 100644 --- a/src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java @@ -46,34 +46,6 @@ public class MsgViewCB extends CachedViewCB { private MsgViewCB() { } - /////////////////////////////////////////////////////////////////////////////////////////// - // Lifecycle - /////////////////////////////////////////////////////////////////////////////////////////// - - @SuppressWarnings("EmptyMethod") - @Override - public void initialize(URL url, ResourceBundle rb) { - super.initialize(url, rb); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void activate() { - super.activate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Navigation diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java index cf0440d6bc..8075d02902 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java @@ -86,9 +86,7 @@ public class PortfolioViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); @@ -99,20 +97,12 @@ public class PortfolioViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); navigation.removeListener(navigationListener); currentTab = null; } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Navigation diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java index 85f1a3b114..8584bbe048 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java @@ -72,24 +72,10 @@ public class ClosedTradesViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { table.setItems(model.getList()); } - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Private Methods diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java index 32b54bbf0f..d92936f297 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java @@ -75,25 +75,10 @@ public class OffersViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { table.setItems(model.getList()); } - @SuppressWarnings("EmptyMethod") - @Override - public void deactivate() { - super.deactivate(); - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - - /////////////////////////////////////////////////////////////////////////////////////////// // Private Methods /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java index a63e160f12..fa882621e9 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java @@ -149,9 +149,7 @@ public class PendingTradesViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { table.setItems(model.getList()); model.getList().addListener(listChangeListener); @@ -174,9 +172,7 @@ public class PendingTradesViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { table.getSelectionModel().selectedItemProperty().removeListener(selectedItemChangeListener); model.getList().removeListener(listChangeListener); model.txId.removeListener(txIdChangeListener); diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java index 25d285245c..25f4d9fb54 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java @@ -84,9 +84,7 @@ public class SettingsViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); @@ -101,9 +99,7 @@ public class SettingsViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); navigation.removeListener(navigationListener); } diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewCB.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewCB.java index 7aa0b3108c..b75fba8b30 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewCB.java @@ -62,9 +62,7 @@ public class PreferencesViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { btcDenominationComboBox.setItems(model.getBtcDenominationItems()); btcDenominationComboBox.getSelectionModel().select(model.btcDenomination().get()); @@ -74,19 +72,11 @@ public class PreferencesViewCB extends CachedViewCB { } @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { useAnimationsCheckBox.selectedProperty().unbind(); useEffectsCheckBox.selectedProperty().unbind(); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // UI Handlers diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java index 2daba92d4f..98cce8cd69 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java @@ -93,9 +93,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { } @Override - public void activate() { - super.activate(); - + public void doActivate() { // 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... @@ -120,20 +118,11 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); } - @SuppressWarnings("EmptyMethod") @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { navigation.removeListener(listener); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // TradeNavigator implementation diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index 144793e60b..8b0fe0ff2d 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -140,15 +140,8 @@ public class CreateOfferViewCB extends CachedViewCB { volumeTextField.setPromptText(BSResources.get("createOffer.volume.prompt", model.fiatCode.get())); } - @SuppressWarnings("EmptyMethod") - public void activate() { - super.activate(); - } - - @SuppressWarnings("EmptyMethod") - public void deactivate() { - super.deactivate(); - + @Override + public void doDeactivate() { tabIsClosable.unbind(); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java index 05d29403b7..594053b7a3 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java @@ -140,9 +140,7 @@ public class OfferBookViewCB extends CachedViewCB { } @Override - public void activate() { - super.activate(); - + public void doActivate() { amountTextField.setText(""); priceTextField.setText(""); volumeTextField.setText(""); @@ -158,19 +156,9 @@ public class OfferBookViewCB extends CachedViewCB { table.sort(); } - @SuppressWarnings("EmptyMethod") @Override - public void deactivate() { - super.deactivate(); - + public void doDeactivate() { removeBindings(); - - } - - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java index 1bbb44e762..242758c7b2 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java @@ -133,16 +133,6 @@ public class TakeOfferViewCB extends CachedViewCB { setupBindings(); } - @SuppressWarnings("EmptyMethod") - public void activate() { - super.activate(); - } - - @SuppressWarnings("EmptyMethod") - public void deactivate() { - super.deactivate(); - } - @Override public void terminate() { super.terminate();