Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-18 14:55:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move View#TITLE_KEY to MainView

Browse Source
This commit is contained in:
Chris Beams 2014-11-23 02:36:54 +01:00
parent d02ddd6946
commit 4ae9868ee5
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/bitsquare/app/BitsquareEnvironment.java
View File

@ -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);
}});
}

3
src/main/java/io/bitsquare/gui/GuiModule.java
View File

@ -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));
}
}

2
src/main/java/io/bitsquare/gui/View.java
View File

@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
public class View<M> {
public static final String TITLE_KEY = "view.title";
protected final Logger log = LoggerFactory.getLogger(this.getClass());
protected final M model;

4
src/main/java/io/bitsquare/gui/main/MainView.java
View File

@ -47,6 +47,8 @@ import static javafx.scene.layout.AnchorPane.*;
public class MainView extends ActivatableView<MainViewModel> {
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<MainViewModel> {
@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;