From f4b35ba48b2650c43355d9731c7c6809253c8634 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 22 Nov 2014 20:37:17 +0100 Subject: [PATCH] Fix compilation errors --- src/main/java/io/bitsquare/gui/main/MainView.java | 10 ++++++++-- src/main/java/io/bitsquare/gui/main/MainViewModel.java | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java index 6ff19b9856..d7774caa7a 100644 --- a/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/src/main/java/io/bitsquare/gui/main/MainView.java @@ -27,6 +27,10 @@ import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.SystemNotification; import io.bitsquare.gui.util.Transitions; +import java.net.URL; + +import java.util.ResourceBundle; + import javax.inject.Inject; import javax.inject.Named; @@ -73,7 +77,9 @@ public class MainView extends View { } @Override - public void initialize() { + public void initialize(URL url, ResourceBundle rb) { + super.initialize(url, rb); + ToggleButton homeButton = new NavButton(HOME) {{ setDisable(true); // during irc demo }}; @@ -140,7 +146,7 @@ public class MainView extends View { VBox splashScreen = createSplashScreen(); - root.getChildren().addAll(baseApplicationContainer, splashScreen); + ((StackPane) root).getChildren().addAll(baseApplicationContainer, splashScreen); Platform.runLater( () -> model.initBackend().subscribe( diff --git a/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/src/main/java/io/bitsquare/gui/main/MainViewModel.java index 667bd42043..54c447f554 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -21,7 +21,6 @@ import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.WalletService; import io.bitsquare.gui.ViewModel; -import io.bitsquare.gui.XModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.msg.MessageService; import io.bitsquare.network.BootstrapState;