From 71e2010a87225d4d155d9049903d6e15fcbd1ebb Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 22 Nov 2014 15:42:16 +0100 Subject: [PATCH] Rename *ViewCB => *View --- .../bitsquare/app/BitsquareEnvironment.java | 4 +- .../{CachedViewCB.java => CachedView.java} | 8 ++-- src/main/java/io/bitsquare/gui/GuiModule.java | 2 +- .../bitsquare/gui/{ViewCB.java => View.java} | 8 ++-- .../io/bitsquare/gui/main/MainViewCB.java | 6 +-- .../gui/main/account/AccountView.fxml | 2 +- .../{AccountViewCB.java => AccountView.java} | 12 +++--- .../gui/main/account/MultiStepNavigation.java | 4 +- .../arbitrator/ArbitratorSettingsView.fxml | 2 +- ...iewCB.java => ArbitratorSettingsView.java} | 16 +++----- .../browser/ArbitratorBrowserView.fxml | 2 +- ...ViewCB.java => ArbitratorBrowserView.java} | 18 ++++---- .../profile/ArbitratorProfileView.fxml | 2 +- ...ViewCB.java => ArbitratorProfileView.java} | 12 ++---- .../ArbitratorRegistrationView.fxml | 2 +- ...B.java => ArbitratorRegistrationView.java} | 10 ++--- .../changepassword/ChangePasswordView.fxml | 2 +- ...ordViewCB.java => ChangePasswordView.java} | 8 ++-- .../account/content/fiat/FiatAccountView.fxml | 2 +- ...ccountViewCB.java => FiatAccountView.java} | 8 ++-- .../account/content/irc/IrcAccountView.fxml | 2 +- ...AccountViewCB.java => IrcAccountView.java} | 8 ++-- .../content/password/PasswordView.fxml | 2 +- ...{PasswordViewCB.java => PasswordView.java} | 8 ++-- .../registration/RegistrationView.fxml | 2 +- ...ationViewCB.java => RegistrationView.java} | 10 ++--- .../restrictions/RestrictionsView.fxml | 8 ++-- ...tionsViewCB.java => RestrictionsView.java} | 8 ++-- .../content/seedwords/SeedWordsView.fxml | 2 +- ...eedWordsViewCB.java => SeedWordsView.java} | 8 ++-- .../account/settings/AccountSettingsView.fxml | 2 +- ...gsViewCB.java => AccountSettingsView.java} | 12 +++--- .../main/account/setup/AccountSetupView.fxml | 2 +- ...SetupViewCB.java => AccountSetupView.java} | 41 +++++++++---------- .../bitsquare/gui/main/funds/FundsView.fxml | 2 +- .../{FundsViewCB.java => FundsView.java} | 10 ++--- .../funds/transactions/TransactionsView.fxml | 2 +- ...tionsViewCB.java => TransactionsView.java} | 8 ++-- .../main/funds/withdrawal/WithdrawalView.fxml | 2 +- ...hdrawalViewCB.java => WithdrawalView.java} | 8 ++-- .../io/bitsquare/gui/main/home/HomeView.fxml | 2 +- .../home/{HomeViewCB.java => HomeView.java} | 10 ++--- .../io/bitsquare/gui/main/msg/MsgView.fxml | 2 +- .../main/msg/{MsgViewCB.java => MsgView.java} | 12 ++---- .../gui/main/portfolio/PortfolioView.fxml | 2 +- ...ortfolioViewCB.java => PortfolioView.java} | 10 ++--- .../portfolio/closed/ClosedTradesView.fxml | 2 +- ...radesViewCB.java => ClosedTradesView.java} | 8 ++-- .../gui/main/portfolio/offer/OffersView.fxml | 2 +- .../{OffersViewCB.java => OffersView.java} | 8 ++-- .../portfolio/pending/PendingTradesView.fxml | 9 ++-- ...adesViewCB.java => PendingTradesView.java} | 8 ++-- .../gui/main/settings/SettingsView.fxml | 2 +- ...{SettingsViewCB.java => SettingsView.java} | 12 +++--- .../settings/application/PreferencesView.fxml | 2 +- ...rencesViewCB.java => PreferencesView.java} | 8 ++-- .../io/bitsquare/gui/main/trade/BuyView.fxml | 2 +- .../trade/{BuyViewCB.java => BuyView.java} | 4 +- .../io/bitsquare/gui/main/trade/SellView.fxml | 2 +- .../trade/{SellViewCB.java => SellView.java} | 4 +- .../{TradeViewCB.java => TradeView.java} | 28 ++++++------- .../trade/createoffer/CreateOfferView.fxml | 11 +++-- ...eOfferViewCB.java => CreateOfferView.java} | 10 ++--- .../main/trade/offerbook/OfferBookView.fxml | 2 +- ...fferBookViewCB.java => OfferBookView.java} | 16 ++++---- .../main/trade/takeoffer/TakeOfferView.fxml | 11 +++-- ...akeOfferViewCB.java => TakeOfferView.java} | 10 ++--- src/main/resources/logback.xml | 4 +- 68 files changed, 230 insertions(+), 250 deletions(-) rename src/main/java/io/bitsquare/gui/{CachedViewCB.java => CachedView.java} (94%) rename src/main/java/io/bitsquare/gui/{ViewCB.java => View.java} (95%) rename src/main/java/io/bitsquare/gui/main/account/{AccountViewCB.java => AccountView.java} (95%) rename src/main/java/io/bitsquare/gui/main/account/arbitrator/{ArbitratorSettingsViewCB.java => ArbitratorSettingsView.java} (88%) rename src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/{ArbitratorBrowserViewCB.java => ArbitratorBrowserView.java} (92%) rename src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/{ArbitratorProfileViewCB.java => ArbitratorProfileView.java} (92%) rename src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/{ArbitratorRegistrationViewCB.java => ArbitratorRegistrationView.java} (97%) rename src/main/java/io/bitsquare/gui/main/account/content/changepassword/{ChangePasswordViewCB.java => ChangePasswordView.java} (94%) rename src/main/java/io/bitsquare/gui/main/account/content/fiat/{FiatAccountViewCB.java => FiatAccountView.java} (97%) rename src/main/java/io/bitsquare/gui/main/account/content/irc/{IrcAccountViewCB.java => IrcAccountView.java} (97%) rename src/main/java/io/bitsquare/gui/main/account/content/password/{PasswordViewCB.java => PasswordView.java} (95%) rename src/main/java/io/bitsquare/gui/main/account/content/registration/{RegistrationViewCB.java => RegistrationView.java} (95%) rename src/main/java/io/bitsquare/gui/main/account/content/restrictions/{RestrictionsViewCB.java => RestrictionsView.java} (98%) rename src/main/java/io/bitsquare/gui/main/account/content/seedwords/{SeedWordsViewCB.java => SeedWordsView.java} (93%) rename src/main/java/io/bitsquare/gui/main/account/settings/{AccountSettingsViewCB.java => AccountSettingsView.java} (96%) rename src/main/java/io/bitsquare/gui/main/account/setup/{AccountSetupViewCB.java => AccountSetupView.java} (90%) rename src/main/java/io/bitsquare/gui/main/funds/{FundsViewCB.java => FundsView.java} (94%) rename src/main/java/io/bitsquare/gui/main/funds/transactions/{TransactionsViewCB.java => TransactionsView.java} (97%) rename src/main/java/io/bitsquare/gui/main/funds/withdrawal/{WithdrawalViewCB.java => WithdrawalView.java} (98%) rename src/main/java/io/bitsquare/gui/main/home/{HomeViewCB.java => HomeView.java} (86%) rename src/main/java/io/bitsquare/gui/main/msg/{MsgViewCB.java => MsgView.java} (91%) rename src/main/java/io/bitsquare/gui/main/portfolio/{PortfolioViewCB.java => PortfolioView.java} (94%) rename src/main/java/io/bitsquare/gui/main/portfolio/closed/{ClosedTradesViewCB.java => ClosedTradesView.java} (98%) rename src/main/java/io/bitsquare/gui/main/portfolio/offer/{OffersViewCB.java => OffersView.java} (98%) rename src/main/java/io/bitsquare/gui/main/portfolio/pending/{PendingTradesViewCB.java => PendingTradesView.java} (99%) rename src/main/java/io/bitsquare/gui/main/settings/{SettingsViewCB.java => SettingsView.java} (93%) rename src/main/java/io/bitsquare/gui/main/settings/application/{PreferencesViewCB.java => PreferencesView.java} (93%) rename src/main/java/io/bitsquare/gui/main/trade/{BuyViewCB.java => BuyView.java} (88%) rename src/main/java/io/bitsquare/gui/main/trade/{SellViewCB.java => SellView.java} (88%) rename src/main/java/io/bitsquare/gui/main/trade/{TradeViewCB.java => TradeView.java} (91%) rename src/main/java/io/bitsquare/gui/main/trade/createoffer/{CreateOfferViewCB.java => CreateOfferView.java} (98%) rename src/main/java/io/bitsquare/gui/main/trade/offerbook/{OfferBookViewCB.java => OfferBookView.java} (98%) rename src/main/java/io/bitsquare/gui/main/trade/takeoffer/{TakeOfferViewCB.java => TakeOfferView.java} (98%) diff --git a/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/src/main/java/io/bitsquare/app/BitsquareEnvironment.java index 20c62bb5a3..97a01c221b 100644 --- a/src/main/java/io/bitsquare/app/BitsquareEnvironment.java +++ b/src/main/java/io/bitsquare/app/BitsquareEnvironment.java @@ -20,7 +20,7 @@ package io.bitsquare.app; import io.bitsquare.BitsquareException; import io.bitsquare.btc.UserAgent; import io.bitsquare.btc.WalletService; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.persistence.Persistence; import io.bitsquare.util.Utilities; import io.bitsquare.util.spring.JOptCommandLinePropertySource; @@ -122,7 +122,7 @@ public class BitsquareEnvironment extends StandardEnvironment { setProperty(Persistence.DIR_KEY, appDataDir); setProperty(Persistence.PREFIX_KEY, appName + "_pref"); - setProperty(ViewCB.TITLE_KEY, appName); + setProperty(View.TITLE_KEY, appName); }}); } diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedView.java similarity index 94% rename from src/main/java/io/bitsquare/gui/CachedViewCB.java rename to src/main/java/io/bitsquare/gui/CachedView.java index 434d0aa4fa..212efc3bda 100644 --- a/src/main/java/io/bitsquare/gui/CachedViewCB.java +++ b/src/main/java/io/bitsquare/gui/CachedView.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 CachedViewCB extends ViewCB implements Activatable { - private static final Logger log = LoggerFactory.getLogger(CachedViewCB.class); +public abstract class CachedView extends View implements Activatable { + private static final Logger log = LoggerFactory.getLogger(CachedView.class); - public CachedViewCB(M model) { + public CachedView(M model) { super(checkNotNull(model, "Model must not be null")); } - public CachedViewCB() { + public CachedView() { this((M) Activatable.NOOP_INSTANCE); } diff --git a/src/main/java/io/bitsquare/gui/GuiModule.java b/src/main/java/io/bitsquare/gui/GuiModule.java index 58ac357bbb..fe7ca3eece 100644 --- a/src/main/java/io/bitsquare/gui/GuiModule.java +++ b/src/main/java/io/bitsquare/gui/GuiModule.java @@ -63,6 +63,6 @@ public class GuiModule extends BitsquareModule { bind(Stage.class).toInstance(primaryStage); Popups.primaryStage = primaryStage; - bindConstant().annotatedWith(Names.named(ViewCB.TITLE_KEY)).to(env.getRequiredProperty(ViewCB.TITLE_KEY)); + bindConstant().annotatedWith(Names.named(View.TITLE_KEY)).to(env.getRequiredProperty(View.TITLE_KEY)); } } diff --git a/src/main/java/io/bitsquare/gui/ViewCB.java b/src/main/java/io/bitsquare/gui/View.java similarity index 95% rename from src/main/java/io/bitsquare/gui/ViewCB.java rename to src/main/java/io/bitsquare/gui/View.java index d72be3528f..911e1b40c0 100644 --- a/src/main/java/io/bitsquare/gui/ViewCB.java +++ b/src/main/java/io/bitsquare/gui/View.java @@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory; /** * Non caching version for code behind classes using the PM pattern */ -public abstract class ViewCB implements Initializable { +public abstract class View implements Initializable { - private static final Logger log = LoggerFactory.getLogger(ViewCB.class); + private static final Logger log = LoggerFactory.getLogger(View.class); public static final String TITLE_KEY = "view.title"; @@ -44,11 +44,11 @@ public abstract class ViewCB implements Initializable { @FXML protected Parent root; - public ViewCB(M model) { + public View(M model) { this.model = model; } - public ViewCB() { + public View() { this(null); } diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index ce1252071c..f0152de2e1 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -22,7 +22,7 @@ import io.bitsquare.bank.BankAccount; import io.bitsquare.gui.FxmlController; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.SystemNotification; @@ -125,8 +125,8 @@ public class MainViewCB extends FxmlController { ViewLoader.Item loaded = viewLoader.load(navItems[1].getFxmlUrl()); contentContainer.getChildren().setAll(loaded.view); - if (loaded.controller instanceof ViewCB) - ((ViewCB) loaded.controller).setParent(this); + if (loaded.controller instanceof View) + ((View) loaded.controller).setParent(this); navButtons.getToggles().stream() .filter(toggle -> toggle instanceof ToggleButton) diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml index 3bbf71e899..5187d4a2c9 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml @@ -19,7 +19,7 @@ - tabChangeListener; @@ -55,7 +55,7 @@ public class AccountViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private AccountViewCB(AccountPM model, ViewLoader viewLoader, Navigation navigation) { + private AccountView(AccountPM model, ViewLoader viewLoader, Navigation navigation) { this.model = model; this.viewLoader = viewLoader; this.navigation = navigation; @@ -157,7 +157,7 @@ public class AccountViewCB extends CachedViewCB { tab.setContent(loaded.view); ((TabPane) root).getSelectionModel().select(tab); Initializable childController = loaded.controller; - ((ViewCB) childController).setParent(this); + ((View) childController).setParent(this); return childController; } diff --git a/src/main/java/io/bitsquare/gui/main/account/MultiStepNavigation.java b/src/main/java/io/bitsquare/gui/main/account/MultiStepNavigation.java index 874d729fd7..236890e4f8 100644 --- a/src/main/java/io/bitsquare/gui/main/account/MultiStepNavigation.java +++ b/src/main/java/io/bitsquare/gui/main/account/MultiStepNavigation.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; public interface MultiStepNavigation { - void nextStep(ViewCB useSettingsContext); + void nextStep(View useSettingsContext); } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml index 1948c0a4ee..99e13f1f47 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java similarity index 88% rename from src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java index 2e857b5050..bc927de52a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java @@ -17,14 +17,10 @@ package io.bitsquare.gui.main.account.arbitrator; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.ViewLoader; -import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationViewCB; - -import java.net.URL; - -import java.util.ResourceBundle; +import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView; import javax.inject.Inject; @@ -35,13 +31,13 @@ import javafx.stage.Modality; import javafx.stage.Stage; // TODO Arbitration is very basic yet -public class ArbitratorSettingsViewCB extends CachedViewCB { +public class ArbitratorSettingsView extends CachedView { private final ViewLoader viewLoader; private final Navigation navigation; private final Stage primaryStage; - private ArbitratorRegistrationViewCB arbitratorRegistrationViewCB; + private ArbitratorRegistrationView arbitratorRegistrationViewCB; /////////////////////////////////////////////////////////////////////////////////////////// @@ -49,7 +45,7 @@ public class ArbitratorSettingsViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private ArbitratorSettingsViewCB(ViewLoader viewLoader, Navigation navigation, Stage primaryStage) { + private ArbitratorSettingsView(ViewLoader viewLoader, Navigation navigation, Stage primaryStage) { this.viewLoader = viewLoader; this.navigation = navigation; this.primaryStage = primaryStage; @@ -64,7 +60,7 @@ public class ArbitratorSettingsViewCB extends CachedViewCB { @Override protected Initializable loadView(Navigation.Item navigationItem) { ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false); - arbitratorRegistrationViewCB = (ArbitratorRegistrationViewCB) loaded.controller; + arbitratorRegistrationViewCB = (ArbitratorRegistrationView) loaded.controller; final Stage stage = new Stage(); stage.setTitle("Arbitrator"); diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml index 6e29b0e11b..74cd7b669a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml @@ -18,7 +18,7 @@ - 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/ArbitratorBrowserView.java similarity index 92% rename from src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java index 0022774123..40d464059d 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/ArbitratorBrowserView.java @@ -19,11 +19,11 @@ package io.bitsquare.gui.main.account.arbitrator.browser; import io.bitsquare.account.AccountSettings; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; -import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileViewCB; +import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView; import io.bitsquare.locale.LanguageUtil; import io.bitsquare.msg.MessageService; import io.bitsquare.msg.listeners.ArbitratorListener; @@ -44,7 +44,7 @@ import javafx.scene.layout.*; import javafx.stage.Stage; // TODO Arbitration is very basic yet -public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorListener { +public class ArbitratorBrowserView extends CachedView implements ArbitratorListener { private final ViewLoader viewLoader; private final AccountSettings accountSettings; @@ -54,7 +54,7 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL private final List allArbitrators = new ArrayList<>(); private Arbitrator currentArbitrator; - private ArbitratorProfileViewCB arbitratorProfileViewCB; + private ArbitratorProfileView arbitratorProfileViewCB; private int index = -1; @FXML Button prevButton, nextButton, selectButton, closeButton; @@ -66,8 +66,8 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public ArbitratorBrowserViewCB(ViewLoader viewLoader, AccountSettings accountSettings, Persistence persistence, - MessageService messageService) { + public ArbitratorBrowserView(ViewLoader viewLoader, AccountSettings accountSettings, Persistence persistence, + MessageService messageService) { this.viewLoader = viewLoader; this.accountSettings = accountSettings; this.persistence = persistence; @@ -121,8 +121,8 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl()); ((Pane) root).getChildren().set(0, loaded.view); - Initializable childController = arbitratorProfileViewCB = (ArbitratorProfileViewCB) loaded.controller; - ((ViewCB) childController).setParent(this); + Initializable childController = arbitratorProfileViewCB = (ArbitratorProfileView) loaded.controller; + ((View) childController).setParent(this); return childController; } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml index 04484df0f5..4e816828a9 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml @@ -19,7 +19,7 @@ - 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/ArbitratorProfileView.java similarity index 92% rename from src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java index b3828b17fc..54d0151e83 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/ArbitratorProfileView.java @@ -18,22 +18,18 @@ package io.bitsquare.gui.main.account.arbitrator.profile; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.persistence.Persistence; import io.bitsquare.settings.Preferences; -import java.net.URL; - -import java.util.ResourceBundle; - import javax.inject.Inject; import javafx.fxml.FXML; import javafx.scene.control.*; // TODO Arbitration is very basic yet -public class ArbitratorProfileViewCB extends CachedViewCB { +public class ArbitratorProfileView extends CachedView { private final Preferences preferences; @@ -53,8 +49,8 @@ public class ArbitratorProfileViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public ArbitratorProfileViewCB(Preferences preferences, Persistence persistence, - BSFormatter formatter) { + public ArbitratorProfileView(Preferences preferences, Persistence persistence, + BSFormatter formatter) { this.preferences = preferences; this.persistence = persistence; diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml index 199a54b8d5..fd7d993400 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml @@ -21,7 +21,7 @@ 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/ArbitratorRegistrationView.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java index 9007888b4e..57a84a8b53 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/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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.BSResources; @@ -61,8 +61,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; // TODO Arbitration is very basic yet -public class ArbitratorRegistrationViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(ArbitratorRegistrationViewCB.class); +public class ArbitratorRegistrationView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(ArbitratorRegistrationView.class); private final Persistence persistence; private final WalletService walletService; @@ -100,8 +100,8 @@ public class ArbitratorRegistrationViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private ArbitratorRegistrationViewCB(Persistence persistence, WalletService walletService, - MessageService messageService, User user, BSFormatter formatter) { + private ArbitratorRegistrationView(Persistence persistence, WalletService walletService, + MessageService messageService, User user, BSFormatter formatter) { this.persistence = persistence; this.walletService = walletService; this.messageService = messageService; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml index a796afdda6..1b95321a87 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml @@ -22,7 +22,7 @@ - implements ContextAware { +public class ChangePasswordView extends View implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(ChangePasswordViewCB.class); + private static final Logger log = LoggerFactory.getLogger(ChangePasswordView.class); @FXML HBox buttonsHBox; @FXML Button saveButton, skipButton; @@ -50,7 +50,7 @@ public class ChangePasswordViewCB extends ViewCB implements Co /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private ChangePasswordViewCB(ChangePasswordPM model) { + private ChangePasswordView(ChangePasswordPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml index 83de5b0519..f4be515544 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml @@ -24,7 +24,7 @@ - implements ContextAware { +public class FiatAccountView extends CachedView implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(FiatAccountViewCB.class); + private static final Logger log = LoggerFactory.getLogger(FiatAccountView.class); @FXML HBox buttonsHBox; @FXML ComboBox regionComboBox; @@ -76,7 +76,7 @@ public class FiatAccountViewCB extends CachedViewCB implements Co /////////////////////////////////////////////////////////////////////////////////////////// @Inject - FiatAccountViewCB(FiatAccountPM model, OverlayManager overlayManager) { + FiatAccountView(FiatAccountPM model, OverlayManager overlayManager) { super(model); this.overlayManager = overlayManager; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml index cb312a63fa..a0286b0183 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml @@ -24,7 +24,7 @@ - implements ContextAware { +public class IrcAccountView extends CachedView implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(IrcAccountViewCB.class); + private static final Logger log = LoggerFactory.getLogger(IrcAccountView.class); @FXML HBox buttonsHBox; @FXML InputTextField ircNickNameTextField; @@ -63,7 +63,7 @@ public class IrcAccountViewCB extends CachedViewCB implements Cont /////////////////////////////////////////////////////////////////////////////////////////// @Inject - IrcAccountViewCB(IrcAccountPM model) { + IrcAccountView(IrcAccountPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml index 8d64f9ebbc..102c5c7e7c 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml @@ -22,7 +22,7 @@ - implements ContextAware { +public class PasswordView extends View implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(PasswordViewCB.class); + private static final Logger log = LoggerFactory.getLogger(PasswordView.class); @FXML HBox buttonsHBox; @FXML Button saveButton, skipButton; @@ -50,7 +50,7 @@ public class PasswordViewCB extends ViewCB implements ContextAware { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private PasswordViewCB(PasswordPM model) { + private PasswordView(PasswordPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml index 517f2d8449..00144dac5a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml @@ -24,7 +24,7 @@ - implements ContextAware { +public class RegistrationView extends View implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(RegistrationViewCB.class); + private static final Logger log = LoggerFactory.getLogger(RegistrationView.class); private final OverlayManager overlayManager; @@ -67,7 +67,7 @@ public class RegistrationViewCB extends ViewCB implements Contex /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private RegistrationViewCB(RegistrationPM model, OverlayManager overlayManager) { + private RegistrationView(RegistrationPM model, OverlayManager overlayManager) { super(model); this.overlayManager = overlayManager; } @@ -127,7 +127,7 @@ public class RegistrationViewCB extends ViewCB implements Contex getProperties().put("type", "CLOSE"); try { if (parent instanceof MultiStepNavigation) - ((MultiStepNavigation) parent).nextStep(RegistrationViewCB.this); + ((MultiStepNavigation) parent).nextStep(RegistrationView.this); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml index 45a20051b7..2f7ab786b9 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml @@ -22,13 +22,13 @@ - - @@ -47,7 +47,7 @@ - @@ -84,7 +84,7 @@ text="Restrict trades with these payments account countries."/> - 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/RestrictionsView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java index 8713cbc9e0..ba23e6227c 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/RestrictionsView.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.main.account.MultiStepNavigation; @@ -50,9 +50,9 @@ import javafx.util.StringConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RestrictionsViewCB extends CachedViewCB implements ContextAware { +public class RestrictionsView extends CachedView implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(RestrictionsViewCB.class); + private static final Logger log = LoggerFactory.getLogger(RestrictionsView.class); @FXML ListView languagesListView; @FXML ListView countriesListView; @@ -71,7 +71,7 @@ public class RestrictionsViewCB extends CachedViewCB implements /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private RestrictionsViewCB(RestrictionsPM model, ViewLoader viewLoader, Stage primaryStage) { + private RestrictionsView(RestrictionsPM model, ViewLoader viewLoader, Stage primaryStage) { super(model); this.viewLoader = viewLoader; this.primaryStage = primaryStage; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml index 8f3e1d2ba6..86df0e6cd1 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml @@ -23,7 +23,7 @@ - implements ContextAware { +public class SeedWordsView extends View implements ContextAware { - private static final Logger log = LoggerFactory.getLogger(SeedWordsViewCB.class); + private static final Logger log = LoggerFactory.getLogger(SeedWordsView.class); @FXML Button completedButton; @FXML TextArea seedWordsTextArea; @@ -49,7 +49,7 @@ public class SeedWordsViewCB extends ViewCB implements ContextAware /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private SeedWordsViewCB(SeedWordsPM model) { + private SeedWordsView(SeedWordsPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml index 0b4a469c11..683c04db27 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java similarity index 96% rename from src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java rename to src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java index 3372d3d7d7..4857313b7c 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.settings; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.main.account.content.ContextAware; import io.bitsquare.gui.util.Colors; @@ -43,9 +43,9 @@ import de.jensd.fx.fontawesome.AwesomeIcon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSettingsViewCB extends CachedViewCB { +public class AccountSettingsView extends CachedView { - private static final Logger log = LoggerFactory.getLogger(AccountSettingsViewCB.class); + private static final Logger log = LoggerFactory.getLogger(AccountSettingsView.class); private final ViewLoader viewLoader; private final Navigation navigation; @@ -62,7 +62,7 @@ public class AccountSettingsViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private AccountSettingsViewCB(ViewLoader viewLoader, Navigation navigation) { + private AccountSettingsView(ViewLoader viewLoader, Navigation navigation) { this.viewLoader = viewLoader; this.navigation = navigation; } @@ -139,7 +139,7 @@ public class AccountSettingsViewCB extends CachedViewCB { ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl()); content.getChildren().setAll(loaded.view); childController = loaded.controller; - ((ViewCB) childController).setParent(this); + ((View) childController).setParent(this); ((ContextAware) childController).useSettingsContext(true); return childController; } diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml index 705ee213fb..7f2219fdc3 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml @@ -19,7 +19,7 @@ - - diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java similarity index 94% rename from src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java rename to src/main/java/io/bitsquare/gui/main/funds/FundsView.java index 437d13db75..9da3da0331 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/FundsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.funds; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; import java.net.URL; @@ -33,7 +33,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; -public class FundsViewCB extends CachedViewCB { +public class FundsView extends CachedView { private Navigation.Listener navigationListener; private ChangeListener tabChangeListener; @@ -50,7 +50,7 @@ public class FundsViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - FundsViewCB(ViewLoader viewLoader, Navigation navigation) { + FundsView(ViewLoader viewLoader, Navigation navigation) { this.viewLoader = viewLoader; this.navigation = navigation; } @@ -120,7 +120,7 @@ public class FundsViewCB extends CachedViewCB { currentTab.setContent(loaded.view); ((TabPane) root).getSelectionModel().select(currentTab); Initializable childController = loaded.controller; - ((ViewCB) childController).setParent(this); + ((View) childController).setParent(this); return childController; } diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml index e2f915467b..e0dc1aba6d 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java rename to src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java index fbed15b6cf..0076afbb49 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; @@ -42,8 +42,8 @@ import javafx.util.Callback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TransactionsViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(TransactionsViewCB.class); +public class TransactionsView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(TransactionsView.class); private final WalletService walletService; private final BSFormatter formatter; @@ -59,7 +59,7 @@ public class TransactionsViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private TransactionsViewCB(WalletService walletService, BSFormatter formatter) { + private TransactionsView(WalletService walletService, BSFormatter formatter) { this.walletService = walletService; this.formatter = formatter; } diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml index 0dc3ce78e6..ce7b6b9590 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java rename to src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index beb77db420..a6de8f48c3 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.util.Utilities; @@ -59,8 +59,8 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class WithdrawalViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(WithdrawalViewCB.class); +public class WithdrawalView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(WithdrawalView.class); private final WalletService walletService; @@ -79,7 +79,7 @@ public class WithdrawalViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private WithdrawalViewCB(WalletService walletService, BSFormatter formatter) { + private WithdrawalView(WalletService walletService, BSFormatter formatter) { this.walletService = walletService; this.formatter = formatter; } diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml index 4744673368..692da362df 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml @@ -20,7 +20,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java b/src/main/java/io/bitsquare/gui/main/home/HomeView.java similarity index 86% rename from src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java rename to src/main/java/io/bitsquare/gui/main/home/HomeView.java index b126702328..cfbf27f929 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.java @@ -17,19 +17,15 @@ package io.bitsquare.gui.main.home; -import io.bitsquare.gui.CachedViewCB; - -import java.net.URL; - -import java.util.ResourceBundle; +import io.bitsquare.gui.CachedView; 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 HomeViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(HomeViewCB.class); +public class HomeView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(HomeView.class); } diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml index 1236c50eef..493a586df2 100644 --- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml @@ -20,7 +20,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java similarity index 91% rename from src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java rename to src/main/java/io/bitsquare/gui/main/msg/MsgView.java index b2ea6420f7..2745974a2e 100644 --- a/src/main/java/io/bitsquare/gui/main/msg/MsgViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java @@ -17,13 +17,9 @@ package io.bitsquare.gui.main.msg; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; -import java.net.URL; - -import java.util.ResourceBundle; - import javax.inject.Inject; import javafx.fxml.Initializable; @@ -34,8 +30,8 @@ import org.slf4j.LoggerFactory; // will be probably only used for arbitration communication, will be renamed and the icon changed -public class MsgViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(MsgViewCB.class); +public class MsgView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(MsgView.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -43,7 +39,7 @@ public class MsgViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private MsgViewCB() { + private MsgView() { } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml index d1821d98a4..446e89d0fb 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java similarity index 94% rename from src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index a10948d204..5fb11cefc2 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.portfolio; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; import io.bitsquare.trade.TradeManager; @@ -34,7 +34,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; -public class PortfolioViewCB extends CachedViewCB { +public class PortfolioView extends CachedView { private Tab currentTab; private Navigation.Listener navigationListener; @@ -52,7 +52,7 @@ public class PortfolioViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - PortfolioViewCB(ViewLoader viewLoader, Navigation navigation, TradeManager tradeManager) { + PortfolioView(ViewLoader viewLoader, Navigation navigation, TradeManager tradeManager) { this.viewLoader = viewLoader; this.navigation = navigation; this.tradeManager = tradeManager; @@ -130,7 +130,7 @@ public class PortfolioViewCB extends CachedViewCB { currentTab.setContent(loaded.view); ((TabPane) root).getSelectionModel().select(currentTab); Initializable childController = loaded.controller; - ((ViewCB) childController).setParent(this); + ((View) childController).setParent(this); return childController; } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml index f2c2ac0ee1..2adf2485dd 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java index 8584bbe048..87a38b7813 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.components.Popups; import java.net.URL; @@ -34,8 +34,8 @@ import javafx.util.Callback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ClosedTradesViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(ClosedTradesViewCB.class); +public class ClosedTradesView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(ClosedTradesView.class); @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, dateColumn, tradeIdColumn; @@ -47,7 +47,7 @@ public class ClosedTradesViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private ClosedTradesViewCB(ClosedTradesPM model) { + private ClosedTradesView(ClosedTradesPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml index df765c3cf3..aeb8b60a95 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java index d92936f297..7cb9f45493 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.components.Popups; import io.bitsquare.util.Utilities; @@ -36,8 +36,8 @@ import javafx.util.Callback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffersViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(OffersViewCB.class); +public class OffersView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(OffersView.class); @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, dateColumn, offerIdColumn, removeItemColumn; @@ -49,7 +49,7 @@ public class OffersViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private OffersViewCB(OffersPM model) { + private OffersView(OffersPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml index 3227a0c4e5..1fa33d8cd3 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml @@ -28,7 +28,7 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java index fa882621e9..abd33fb037 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.InputTextField; @@ -58,8 +58,8 @@ import javafx.util.StringConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PendingTradesViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(PendingTradesViewCB.class); +public class PendingTradesView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(PendingTradesView.class); private ChangeListener selectedItemChangeListener; @@ -99,7 +99,7 @@ public class PendingTradesViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - PendingTradesViewCB(PendingTradesPM model, Navigation navigation) { + PendingTradesView(PendingTradesPM model, Navigation navigation) { super(model); this.navigation = navigation; diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml index 97e9492375..59ade893e4 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java similarity index 93% rename from src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java rename to src/main/java/io/bitsquare/gui/main/settings/SettingsView.java index 3c99d544d8..deb1299672 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.ViewCB; +import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; import io.bitsquare.settings.Preferences; @@ -34,7 +34,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; -public class SettingsViewCB extends CachedViewCB { +public class SettingsView extends CachedView { private final ViewLoader viewLoader; private final Navigation navigation; @@ -51,7 +51,7 @@ public class SettingsViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - SettingsViewCB(ViewLoader viewLoader, Navigation navigation, Preferences preferences) { + SettingsView(ViewLoader viewLoader, Navigation navigation, Preferences preferences) { this.viewLoader = viewLoader; this.navigation = navigation; this.preferences = preferences; @@ -127,8 +127,8 @@ public class SettingsViewCB extends CachedViewCB { tab.setContent(loaded.view); ((TabPane) root).getSelectionModel().select(tab); Initializable childController = loaded.controller; - if (childController instanceof ViewCB) - ((ViewCB) childController).setParent(this); + if (childController instanceof View) + ((View) childController).setParent(this); return childController; } diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml index cb6bab8bb3..ec443a4fa4 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml +++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml @@ -22,7 +22,7 @@ - { +public class PreferencesView extends CachedView { - private static final Logger log = LoggerFactory.getLogger(PreferencesViewCB.class); + private static final Logger log = LoggerFactory.getLogger(PreferencesView.class); @FXML ComboBox btcDenominationComboBox; @FXML CheckBox useAnimationsCheckBox, useEffectsCheckBox; @@ -47,7 +47,7 @@ public class PreferencesViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private PreferencesViewCB(PreferencesPM model) { + private PreferencesView(PreferencesPM model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml b/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml index 21f0ac1778..dfda5c151a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/trade/BuyViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/BuyView.java similarity index 88% rename from src/main/java/io/bitsquare/gui/main/trade/BuyViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/BuyView.java index 929c36702a..56018eeb36 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/BuyViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/BuyView.java @@ -22,10 +22,10 @@ import io.bitsquare.gui.ViewLoader; import javax.inject.Inject; -public class BuyViewCB extends TradeViewCB { +public class BuyView extends TradeView { @Inject - public BuyViewCB(ViewLoader viewLoader, Navigation navigation) { + public BuyView(ViewLoader viewLoader, Navigation navigation) { super(viewLoader, navigation); } } diff --git a/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml b/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml index 1fda938055..74e3a7078a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/trade/SellViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/SellView.java similarity index 88% rename from src/main/java/io/bitsquare/gui/main/trade/SellViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/SellView.java index 36be3dbf36..d1d591dd1e 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/SellViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/SellView.java @@ -22,10 +22,10 @@ import io.bitsquare.gui.ViewLoader; import javax.inject.Inject; -public class SellViewCB extends TradeViewCB { +public class SellView extends TradeView { @Inject - public SellViewCB(ViewLoader viewLoader, Navigation navigation) { + public SellView(ViewLoader viewLoader, Navigation navigation) { super(viewLoader, navigation); } } diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java similarity index 91% rename from src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/TradeView.java index 6dd1b15628..166d584aff 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java @@ -17,13 +17,13 @@ package io.bitsquare.gui.main.trade; -import io.bitsquare.gui.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.ViewLoader; import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB; -import io.bitsquare.gui.main.trade.offerbook.OfferBookViewCB; -import io.bitsquare.gui.main.trade.takeoffer.TakeOfferViewCB; +import io.bitsquare.gui.main.trade.createoffer.CreateOfferView; +import io.bitsquare.gui.main.trade.offerbook.OfferBookView; +import io.bitsquare.gui.main.trade.takeoffer.TakeOfferView; import io.bitsquare.offer.Direction; import io.bitsquare.offer.Offer; @@ -44,12 +44,12 @@ import javafx.scene.control.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TradeViewCB extends CachedViewCB implements TradeNavigator { - private static final Logger log = LoggerFactory.getLogger(TradeViewCB.class); +public class TradeView extends CachedView implements TradeNavigator { + private static final Logger log = LoggerFactory.getLogger(TradeView.class); - private OfferBookViewCB offerBookViewCB; - private CreateOfferViewCB createOfferViewCB; - private TakeOfferViewCB takeOfferViewCB; + private OfferBookView offerBookViewCB; + private CreateOfferView createOfferViewCB; + private TakeOfferView takeOfferViewCB; private Node createOfferView; private Node takeOfferView; private Navigation.Listener listener; @@ -67,7 +67,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - protected TradeViewCB(ViewLoader viewLoader, Navigation navigation) { + protected TradeView(ViewLoader viewLoader, Navigation navigation) { this.viewLoader = viewLoader; this.navigation = navigation; } @@ -79,7 +79,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { @Override public void initialize(URL url, ResourceBundle rb) { - direction = (this instanceof BuyViewCB) ? Direction.BUY : Direction.SELL; + direction = (this instanceof BuyView) ? Direction.BUY : Direction.SELL; navigationItem = (direction == Direction.BUY) ? Navigation.Item.BUY : Navigation.Item.SELL; listener = navigationItems -> { @@ -160,7 +160,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { tab.setClosable(false); tab.setContent(loaded.view); tabPane.getTabs().add(tab); - offerBookViewCB = (OfferBookViewCB) loaded.controller; + offerBookViewCB = (OfferBookView) loaded.controller; offerBookViewCB.setParent(this); offerBookViewCB.setDirection(direction); @@ -173,7 +173,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { // in different graphs ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false); createOfferView = loaded.view; - createOfferViewCB = (CreateOfferViewCB) loaded.controller; + createOfferViewCB = (CreateOfferView) loaded.controller; createOfferViewCB.setParent(this); createOfferViewCB.initWithData(direction, amount, price); final Tab tab = new Tab("Create offer"); @@ -189,7 +189,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { // in different graphs ViewLoader.Item loaded = viewLoader.load(Navigation.Item.TAKE_OFFER.getFxmlUrl(), false); takeOfferView = loaded.view; - takeOfferViewCB = (TakeOfferViewCB) loaded.controller; + takeOfferViewCB = (TakeOfferView) loaded.controller; takeOfferViewCB.setParent(this); takeOfferViewCB.initWithData(direction, amount, offer); final Tab tab = new Tab("Take offer"); diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml index f0c53fe828..4e7edc018a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml @@ -27,7 +27,7 @@ - - - @@ -195,7 +195,7 @@ - - \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java index 8b0fe0ff2d..0bc51c811d 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.CloseListener; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; @@ -73,8 +73,8 @@ 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 CreateOfferViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(CreateOfferViewCB.class); +public class CreateOfferView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(CreateOfferView.class); private final Navigation navigation; @@ -117,8 +117,8 @@ public class CreateOfferViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private CreateOfferViewCB(CreateOfferPM model, Navigation navigation, - OverlayManager overlayManager) { + private CreateOfferView(CreateOfferPM model, Navigation navigation, + OverlayManager overlayManager) { super(model); this.navigation = navigation; this.overlayManager = overlayManager; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml index a78420e904..90b541e73f 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml @@ -24,7 +24,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java index 594053b7a3..58d18bdef7 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.InputTextField; @@ -62,8 +62,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 OfferBookViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(OfferBookViewCB.class); +public class OfferBookView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(OfferBookView.class); private final Navigation navigation; private final OverlayManager overlayManager; @@ -90,11 +90,11 @@ public class OfferBookViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - OfferBookViewCB(OfferBookPM model, - Navigation navigation, - OverlayManager overlayManager, - OptionalBtcValidator optionalBtcValidator, - OptionalFiatValidator optionalFiatValidator) { + OfferBookView(OfferBookPM model, + Navigation navigation, + OverlayManager overlayManager, + OptionalBtcValidator optionalBtcValidator, + OptionalFiatValidator optionalFiatValidator) { super(model); this.navigation = navigation; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml index c4bef3dcd8..86732a5f01 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml @@ -27,7 +27,7 @@ - @@ -42,7 +42,7 @@ - - @@ -188,7 +188,7 @@ - - \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java index 242758c7b2..9440d8627b 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.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.CachedViewCB; +import io.bitsquare.gui.CachedView; import io.bitsquare.gui.CloseListener; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; @@ -69,8 +69,8 @@ import org.controlsfx.dialog.Dialog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakeOfferViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(TakeOfferViewCB.class); +public class TakeOfferView extends CachedView { + private static final Logger log = LoggerFactory.getLogger(TakeOfferView.class); private final Navigation navigation; private final OverlayManager overlayManager; @@ -112,8 +112,8 @@ public class TakeOfferViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private TakeOfferViewCB(TakeOfferPM model, Navigation navigation, - OverlayManager overlayManager) { + private TakeOfferView(TakeOfferPM model, Navigation navigation, + OverlayManager overlayManager) { super(model); this.navigation = navigation; diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 6d4b652b60..b24a2b6d3e 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -41,8 +41,8 @@ - - + +