From a7fe05de003523f45ddedbbaee48cd5766fa2626 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 22 Nov 2014 16:07:49 +0100 Subject: [PATCH] Rename CachedView => ActivatableView --- .../gui/{CachedView.java => ActivatableView.java} | 8 ++++---- .../java/io/bitsquare/gui/main/account/AccountView.java | 4 ++-- .../main/account/arbitrator/ArbitratorSettingsView.java | 4 ++-- .../account/arbitrator/browser/ArbitratorBrowserView.java | 4 ++-- .../account/arbitrator/profile/ArbitratorProfileView.java | 4 ++-- .../registration/ArbitratorRegistrationView.java | 4 ++-- .../gui/main/account/content/fiat/FiatAccountView.java | 4 ++-- .../gui/main/account/content/irc/IrcAccountView.java | 4 ++-- .../account/content/restrictions/RestrictionsView.java | 4 ++-- .../gui/main/account/settings/AccountSettingsView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/funds/FundsView.java | 4 ++-- .../gui/main/funds/transactions/TransactionsView.java | 4 ++-- .../gui/main/funds/withdrawal/WithdrawalView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/home/HomeView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/msg/MsgView.java | 4 ++-- .../io/bitsquare/gui/main/portfolio/PortfolioView.java | 4 ++-- .../gui/main/portfolio/closed/ClosedTradesView.java | 4 ++-- .../io/bitsquare/gui/main/portfolio/offer/OffersView.java | 4 ++-- .../gui/main/portfolio/pending/PendingTradesView.java | 4 ++-- .../java/io/bitsquare/gui/main/settings/SettingsView.java | 4 ++-- .../gui/main/settings/application/PreferencesView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/trade/TradeView.java | 4 ++-- .../gui/main/trade/createoffer/CreateOfferView.java | 4 ++-- .../bitsquare/gui/main/trade/offerbook/OfferBookView.java | 4 ++-- .../bitsquare/gui/main/trade/takeoffer/TakeOfferView.java | 4 ++-- src/main/resources/logback.xml | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) rename src/main/java/io/bitsquare/gui/{CachedView.java => ActivatableView.java} (91%) diff --git a/src/main/java/io/bitsquare/gui/CachedView.java b/src/main/java/io/bitsquare/gui/ActivatableView.java similarity index 91% rename from src/main/java/io/bitsquare/gui/CachedView.java rename to src/main/java/io/bitsquare/gui/ActivatableView.java index 212efc3bda..c290226793 100644 --- a/src/main/java/io/bitsquare/gui/CachedView.java +++ b/src/main/java/io/bitsquare/gui/ActivatableView.java @@ -30,14 +30,14 @@ 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 abstract class CachedView extends View implements Activatable { - private static final Logger log = LoggerFactory.getLogger(CachedView.class); +public abstract class ActivatableView extends View implements Activatable { + private static final Logger log = LoggerFactory.getLogger(ActivatableView.class); - public CachedView(M model) { + public ActivatableView(M model) { super(checkNotNull(model, "Model must not be null")); } - public CachedView() { + public ActivatableView() { this((M) Activatable.NOOP_INSTANCE); } 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 21df11aa67..cdc9c46649 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.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -36,7 +36,7 @@ import javafx.scene.control.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountView extends CachedView { +public class AccountView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(AccountView.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java index bc927de52a..3ff0aa7d71 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.arbitrator; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView; @@ -31,7 +31,7 @@ import javafx.stage.Modality; import javafx.stage.Stage; // TODO Arbitration is very basic yet -public class ArbitratorSettingsView extends CachedView { +public class ArbitratorSettingsView extends ActivatableView { private final ViewLoader viewLoader; private final Navigation navigation; 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 40d464059d..a0f7fc399b 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 @@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.arbitrator.browser; import io.bitsquare.account.AccountSettings; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -44,7 +44,7 @@ import javafx.scene.layout.*; import javafx.stage.Stage; // TODO Arbitration is very basic yet -public class ArbitratorBrowserView extends CachedView implements ArbitratorListener { +public class ArbitratorBrowserView extends ActivatableView implements ArbitratorListener { private final ViewLoader viewLoader; private final AccountSettings accountSettings; diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java index 54d0151e83..a3a13ef864 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.account.arbitrator.profile; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.persistence.Persistence; import io.bitsquare.settings.Preferences; @@ -29,7 +29,7 @@ import javafx.fxml.FXML; import javafx.scene.control.*; // TODO Arbitration is very basic yet -public class ArbitratorProfileView extends CachedView { +public class ArbitratorProfileView extends ActivatableView { private final Preferences preferences; 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 57a84a8b53..522bd55b16 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 @@ -20,7 +20,7 @@ package io.bitsquare.gui.main.account.arbitrator.registration; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Reputation; import io.bitsquare.btc.WalletService; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.BSResources; @@ -61,7 +61,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; // TODO Arbitration is very basic yet -public class ArbitratorRegistrationView extends CachedView { +public class ArbitratorRegistrationView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(ArbitratorRegistrationView.class); private final Persistence persistence; 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 661591fff5..5f8cdca246 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 @@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.fiat; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; import static javafx.beans.binding.Bindings.createBooleanBinding; -public class FiatAccountView extends CachedView implements ContextAware { +public class FiatAccountView extends ActivatableView implements ContextAware { private static final Logger log = LoggerFactory.getLogger(FiatAccountView.class); 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 4405f0fd00..0b8f9b3aec 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 @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.account.content.irc; import io.bitsquare.bank.BankAccountType; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.account.MultiStepNavigation; @@ -47,7 +47,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 CachedView implements ContextAware { +public class IrcAccountView extends ActivatableView implements ContextAware { private static final Logger log = LoggerFactory.getLogger(IrcAccountView.class); 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 ba23e6227c..86bcf1fb47 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 @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.main.account.MultiStepNavigation; @@ -50,7 +50,7 @@ import javafx.util.StringConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RestrictionsView extends CachedView implements ContextAware { +public class RestrictionsView extends ActivatableView implements ContextAware { private static final Logger log = LoggerFactory.getLogger(RestrictionsView.class); 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 4857313b7c..0b0c44f9ca 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.settings; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -43,7 +43,7 @@ import de.jensd.fx.fontawesome.AwesomeIcon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSettingsView extends CachedView { +public class AccountSettingsView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(AccountSettingsView.class); 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 9da3da0331..c6af869619 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.funds; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -33,7 +33,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; -public class FundsView extends CachedView { +public class FundsView extends ActivatableView { private Navigation.Listener navigationListener; private ChangeListener tabChangeListener; diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java index 0076afbb49..716cdfc112 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.funds.transactions; import io.bitsquare.btc.WalletService; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; @@ -42,7 +42,7 @@ import javafx.util.Callback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TransactionsView extends CachedView { +public class TransactionsView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(TransactionsView.class); private final WalletService walletService; diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index a6de8f48c3..7e6fb391eb 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java @@ -22,7 +22,7 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.Restrictions; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.util.Utilities; @@ -59,7 +59,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class WithdrawalView extends CachedView { +public class WithdrawalView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(WithdrawalView.class); diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/src/main/java/io/bitsquare/gui/main/home/HomeView.java index cfbf27f929..bb0a4a3ebf 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeView.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.java @@ -17,14 +17,14 @@ package io.bitsquare.gui.main.home; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, // probably overview, event history, news, charts,... -> low prio -public class HomeView extends CachedView { +public class HomeView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(HomeView.class); diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java index 2745974a2e..444cef19b6 100644 --- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.msg; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import javax.inject.Inject; @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; // will be probably only used for arbitration communication, will be renamed and the icon changed -public class MsgView extends CachedView { +public class MsgView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(MsgView.class); 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 5fb11cefc2..637361255b 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -34,7 +34,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; -public class PortfolioView extends CachedView { +public class PortfolioView extends ActivatableView { private Tab currentTab; private Navigation.Listener navigationListener; 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 87a38b7813..5163d5d43d 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio.closed; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.components.Popups; import java.net.URL; @@ -34,7 +34,7 @@ import javafx.util.Callback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ClosedTradesView extends CachedView { +public class ClosedTradesView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(ClosedTradesView.class); @FXML TableColumn priceColumn, amountColumn, volumeColumn, 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 7cb9f45493..2016ef6ec5 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio.offer; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.components.Popups; import io.bitsquare.util.Utilities; @@ -36,7 +36,7 @@ import javafx.util.Callback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffersView extends CachedView { +public class OffersView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(OffersView.class); @FXML TableColumn priceColumn, amountColumn, volumeColumn, 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 abd33fb037..24f7cce05e 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio.pending; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.InputTextField; @@ -58,7 +58,7 @@ import javafx.util.StringConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PendingTradesView extends CachedView { +public class PendingTradesView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(PendingTradesView.class); 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 deb1299672..392316c58e 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -34,7 +34,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; -public class SettingsView extends CachedView { +public class SettingsView extends ActivatableView { private final ViewLoader viewLoader; private final Navigation navigation; 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 c9653d834a..b52c2be09d 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings.application; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import java.net.URL; @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; /** * This UI is not cached as it is normally only needed once. */ -public class PreferencesView extends CachedView { +public class PreferencesView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(PreferencesView.class); 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 166d584aff..53acded3b9 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.trade; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.components.InputTextField; @@ -44,7 +44,7 @@ import javafx.scene.control.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TradeView extends CachedView implements TradeNavigator { +public class TradeView extends ActivatableView implements TradeNavigator { private static final Logger log = LoggerFactory.getLogger(TradeView.class); private OfferBookView offerBookViewCB; 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 0bc51c811d..3ae7c389c5 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.trade.createoffer; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.CloseListener; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; @@ -73,7 +73,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 CachedView { +public class CreateOfferView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(CreateOfferView.class); 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 58d18bdef7..4579e4ee37 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 @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.trade.offerbook; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.InputTextField; @@ -62,7 +62,7 @@ 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 CachedView { +public class OfferBookView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(OfferBookView.class); private final Navigation navigation; 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 9440d8627b..404e49fb5a 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 @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.trade.takeoffer; -import io.bitsquare.gui.CachedView; +import io.bitsquare.gui.ActivatableView; import io.bitsquare.gui.CloseListener; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; @@ -69,7 +69,7 @@ import org.controlsfx.dialog.Dialog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakeOfferView extends CachedView { +public class TakeOfferView extends ActivatableView { private static final Logger log = LoggerFactory.getLogger(TakeOfferView.class); private final Navigation navigation; diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index b24a2b6d3e..1e297c9136 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -42,7 +42,7 @@ - +