From 75a41ee7bc3acb9c34aa2d519d86046451f058c2 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 26 Nov 2014 22:51:58 +0100 Subject: [PATCH] Fix problem caching of OrderBook, but not Buy/Sell views --- src/main/java/io/bitsquare/gui/main/MainView.java | 4 +++- src/main/java/io/bitsquare/gui/main/trade/BuyView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/trade/SellView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/trade/TradeView.java | 3 +-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java index fe05d762e4..b6bb648822 100644 --- a/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/src/main/java/io/bitsquare/gui/main/MainView.java @@ -40,6 +40,7 @@ import viewfx.view.FxmlView; import viewfx.view.View; import viewfx.view.ViewLoader; import viewfx.view.support.ActivatableView; +import viewfx.view.support.CachingViewLoader; import javafx.application.Platform; import javafx.geometry.Insets; @@ -68,7 +69,8 @@ public class MainView extends ActivatableView { private final String title; @Inject - public MainView(MainViewModel model, ViewLoader viewLoader, Navigation navigation, OverlayManager overlayManager, + public MainView(MainViewModel model, CachingViewLoader viewLoader, Navigation navigation, OverlayManager + overlayManager, Transitions transitions, @Named(MainView.TITLE_KEY) String title) { super(model); this.viewLoader = viewLoader; diff --git a/src/main/java/io/bitsquare/gui/main/trade/BuyView.java b/src/main/java/io/bitsquare/gui/main/trade/BuyView.java index b85f5f218d..2667694893 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/BuyView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/BuyView.java @@ -22,13 +22,13 @@ import io.bitsquare.gui.Navigation; import javax.inject.Inject; import viewfx.view.FxmlView; -import viewfx.view.support.CachingViewLoader; +import viewfx.view.ViewLoader; @FxmlView public class BuyView extends TradeView { @Inject - public BuyView(CachingViewLoader viewLoader, Navigation navigation) { + public BuyView(ViewLoader viewLoader, Navigation navigation) { super(viewLoader, navigation); } } diff --git a/src/main/java/io/bitsquare/gui/main/trade/SellView.java b/src/main/java/io/bitsquare/gui/main/trade/SellView.java index e22d620275..d664b075cc 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/SellView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/SellView.java @@ -22,13 +22,13 @@ import io.bitsquare.gui.Navigation; import javax.inject.Inject; import viewfx.view.FxmlView; -import viewfx.view.support.CachingViewLoader; +import viewfx.view.ViewLoader; @FxmlView public class SellView extends TradeView { @Inject - public SellView(CachingViewLoader viewLoader, Navigation navigation) { + public SellView(ViewLoader viewLoader, Navigation navigation) { super(viewLoader, navigation); } } 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 fca4ef0d2d..fda199dd53 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java @@ -35,7 +35,6 @@ import java.util.List; import viewfx.view.View; import viewfx.view.ViewLoader; import viewfx.view.support.ActivatableView; -import viewfx.view.support.CachingViewLoader; import javafx.application.Platform; import javafx.collections.ListChangeListener; @@ -58,7 +57,7 @@ public abstract class TradeView extends ActivatableView { private final Navigation navigation; private final Direction direction; - protected TradeView(CachingViewLoader viewLoader, Navigation navigation) { + protected TradeView(ViewLoader viewLoader, Navigation navigation) { this.viewLoader = viewLoader; this.navigation = navigation; this.direction = (this instanceof BuyView) ? Direction.BUY : Direction.SELL;