diff --git a/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/src/main/java/io/bitsquare/app/BitsquareEnvironment.java index 97a01c221b..b00f26f955 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.View; +import io.bitsquare.gui.main.MainView; 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(View.TITLE_KEY, appName); + setProperty(MainView.TITLE_KEY, appName); }}); } diff --git a/src/main/java/io/bitsquare/gui/GuiModule.java b/src/main/java/io/bitsquare/gui/GuiModule.java index fe7ca3eece..0ac6592988 100644 --- a/src/main/java/io/bitsquare/gui/GuiModule.java +++ b/src/main/java/io/bitsquare/gui/GuiModule.java @@ -19,6 +19,7 @@ package io.bitsquare.gui; import io.bitsquare.BitsquareModule; import io.bitsquare.gui.components.Popups; +import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.trade.offerbook.OfferBook; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.Transitions; @@ -63,6 +64,6 @@ public class GuiModule extends BitsquareModule { bind(Stage.class).toInstance(primaryStage); Popups.primaryStage = primaryStage; - bindConstant().annotatedWith(Names.named(View.TITLE_KEY)).to(env.getRequiredProperty(View.TITLE_KEY)); + bindConstant().annotatedWith(Names.named(MainView.TITLE_KEY)).to(env.getRequiredProperty(MainView.TITLE_KEY)); } } diff --git a/src/main/java/io/bitsquare/gui/View.java b/src/main/java/io/bitsquare/gui/View.java index f706e6a63a..361a0b23ca 100644 --- a/src/main/java/io/bitsquare/gui/View.java +++ b/src/main/java/io/bitsquare/gui/View.java @@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory; public class View { - public static final String TITLE_KEY = "view.title"; - protected final Logger log = LoggerFactory.getLogger(this.getClass()); protected final M model; diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java index 25ea4724b2..903b2b0c25 100644 --- a/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/src/main/java/io/bitsquare/gui/main/MainView.java @@ -47,6 +47,8 @@ import static javafx.scene.layout.AnchorPane.*; public class MainView extends ActivatableView { + public static final String TITLE_KEY = "view.title"; + private final ToggleGroup navButtons = new ToggleGroup(); private final ViewLoader viewLoader; @@ -57,7 +59,7 @@ public class MainView extends ActivatableView { @Inject public MainView(MainViewModel model, ViewLoader viewLoader, Navigation navigation, OverlayManager overlayManager, - Transitions transitions, @Named(TITLE_KEY) String title) { + Transitions transitions, @Named(MainView.TITLE_KEY) String title) { super(model); this.viewLoader = viewLoader; this.navigation = navigation;