From e8afdf5e2258c709af973f818ee76d497f7dffe6 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Mon, 24 Nov 2014 07:12:50 +0100
Subject: [PATCH] Move i.b.gui.ViewLoader.java =>
 viewfx.view.support.ViewLoader

---
 .../java/io/bitsquare/app/gui/BitsquareApp.java   |  2 +-
 src/main/java/io/bitsquare/gui/GuiModule.java     |  1 +
 src/main/java/io/bitsquare/gui/main/MainView.java |  2 +-
 .../bitsquare/gui/main/account/AccountView.java   |  2 +-
 .../arbitrator/ArbitratorSettingsView.java        |  2 +-
 .../arbitrator/browser/ArbitratorBrowserView.java |  2 +-
 .../content/restrictions/RestrictionsView.java    |  2 +-
 .../account/settings/AccountSettingsView.java     |  4 ++--
 .../main/account/setup/AccountSetupWizard.java    |  4 ++--
 .../io/bitsquare/gui/main/funds/FundsView.java    |  2 +-
 .../gui/main/portfolio/PortfolioView.java         |  2 +-
 .../bitsquare/gui/main/settings/SettingsView.java |  2 +-
 .../java/io/bitsquare/gui/main/trade/BuyView.java |  3 ++-
 .../io/bitsquare/gui/main/trade/SellView.java     |  3 ++-
 .../io/bitsquare/gui/main/trade/TradeView.java    |  2 +-
 .../gui => viewfx/view/support}/ViewLoader.java   | 15 ++++-----------
 .../io/bitsquare/app/gui/ViewLoaderTests.java     |  2 +-
 17 files changed, 24 insertions(+), 28 deletions(-)
 rename src/main/java/{io/bitsquare/gui => viewfx/view/support}/ViewLoader.java (76%)

diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
index d26f9c5648..066924b2b0 100644
--- a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
+++ b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
@@ -21,7 +21,6 @@ import io.bitsquare.BitsquareException;
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.SystemTray;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.persistence.Persistence;
@@ -40,6 +39,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.guice.GuiceViewFactory;
 
 import javafx.application.Application;
diff --git a/src/main/java/io/bitsquare/gui/GuiModule.java b/src/main/java/io/bitsquare/gui/GuiModule.java
index bb83f8fbd5..7abcbe8dc8 100644
--- a/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -31,6 +31,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator;
 
 import com.google.inject.name.Names;
 
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.guice.GuiceViewFactory;
 
 import javafx.stage.Stage;
diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java
index bab345282c..46d13f0166 100644
--- a/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -21,7 +21,6 @@ import io.bitsquare.BitsquareException;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.SystemNotification;
 import io.bitsquare.gui.util.Transitions;
@@ -30,6 +29,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableView;
 
 import javafx.application.Platform;
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
index a182243481..d6c20fc926 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -18,11 +18,11 @@
 package io.bitsquare.gui.main.account;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableView;
 
 import javafx.beans.value.ChangeListener;
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
index c8ca06bef3..4c73869b19 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
@@ -18,12 +18,12 @@
 package io.bitsquare.gui.main.account.arbitrator;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
 
 import javax.inject.Inject;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.AbstractView;
 
 import javafx.fxml.FXML;
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
index b676883db8..83841af4e3 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
@@ -20,7 +20,6 @@ package io.bitsquare.gui.main.account.arbitrator.browser;
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.msg.MessageService;
@@ -33,6 +32,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableView;
 
 import javafx.fxml.FXML;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
index 3a9f6d00d1..0172d37ba0 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
@@ -19,7 +19,6 @@ package io.bitsquare.gui.main.account.content.restrictions;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.util.ImageUtil;
@@ -31,6 +30,7 @@ import java.util.Locale;
 import javax.inject.Inject;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.Wizard;
 import viewfx.view.support.ActivatableViewAndModel;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
index 02790133fd..7c1716a17d 100644
--- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
@@ -18,14 +18,14 @@
 package io.bitsquare.gui.main.account.settings;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.util.Colors;
 
 import javax.inject.Inject;
 
-import viewfx.view.support.ActivatableViewAndModel;
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.Wizard;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
index c09befd3c6..0d8f34fadb 100644
--- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
+++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
@@ -18,7 +18,6 @@
 package io.bitsquare.gui.main.account.setup;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
 import io.bitsquare.gui.main.account.content.password.PasswordView;
 import io.bitsquare.gui.main.account.content.registration.RegistrationView;
@@ -27,9 +26,10 @@ import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 
 import javax.inject.Inject;
 
-import viewfx.view.support.ActivatableView;
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.Wizard;
+import viewfx.view.support.ActivatableView;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
index 428837120f..67bb318e40 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -18,12 +18,12 @@
 package io.bitsquare.gui.main.funds;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
 import viewfx.model.Activatable;
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.value.ChangeListener;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
index 6cc2f5ffa2..91c526bb4b 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
@@ -18,13 +18,13 @@
 package io.bitsquare.gui.main.portfolio;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.trade.TradeManager;
 
 import javax.inject.Inject;
 
 import viewfx.model.Activatable;
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.value.ChangeListener;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
index bf74392bd4..6e6ddc4725 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
@@ -18,13 +18,13 @@
 package io.bitsquare.gui.main.settings;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.settings.Preferences;
 
 import javax.inject.Inject;
 
 import viewfx.model.Activatable;
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.value.ChangeListener;
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 b5c62bb866..6f3a25fae9 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
@@ -18,10 +18,11 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
+import viewfx.view.support.ViewLoader;
+
 class BuyView extends TradeView {
 
     @Inject
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 86a3e8668b..807c5b3701 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/SellView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/SellView.java
@@ -18,10 +18,11 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
+import viewfx.view.support.ViewLoader;
+
 class SellView extends TradeView {
 
     @Inject
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 1337f6833f..c177a12ece 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
@@ -18,7 +18,6 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.trade.createoffer.CreateOfferView;
 import io.bitsquare.gui.main.trade.offerbook.OfferBookView;
@@ -32,6 +31,7 @@ import org.bitcoinj.utils.Fiat;
 import java.util.List;
 
 import viewfx.view.View;
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.ActivatableView;
 
 import javafx.application.Platform;
diff --git a/src/main/java/io/bitsquare/gui/ViewLoader.java b/src/main/java/viewfx/view/support/ViewLoader.java
similarity index 76%
rename from src/main/java/io/bitsquare/gui/ViewLoader.java
rename to src/main/java/viewfx/view/support/ViewLoader.java
index 6d2084c78d..a15db3c112 100644
--- a/src/main/java/io/bitsquare/gui/ViewLoader.java
+++ b/src/main/java/viewfx/view/support/ViewLoader.java
@@ -15,9 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
-
-import io.bitsquare.locale.BSResources;
+package viewfx.view.support;
 
 import java.net.URL;
 
@@ -30,17 +28,10 @@ import viewfx.view.View;
 import viewfx.view.ViewFactory;
 
 import javafx.fxml.FXMLLoader;
-import javafx.fxml.JavaFXBuilderFactory;
-import javafx.util.BuilderFactory;
 
-/**
- * Guice support for fxml controllers
- * Support caching to speed up switches between UI screens.
- */
 public class ViewLoader {
 
     private final Map<URL, View> cache = new HashMap<>();
-    private final BuilderFactory builderFactory = new JavaFXBuilderFactory();
     private final ViewFactory viewFactory;
 
     @Inject
@@ -56,7 +47,9 @@ public class ViewLoader {
         if (useCaching && cache.containsKey(url))
             return cache.get(url);
 
-        FXMLLoader loader = new FXMLLoader(url, BSResources.getResourceBundle(), builderFactory, viewFactory);
+        FXMLLoader loader = new FXMLLoader(url);
+        loader.setControllerFactory(viewFactory);
+
         View view = loader.getController();
         cache.put(url, view);
         return view;
diff --git a/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java b/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
index cf8ee461b5..841d1e73ba 100644
--- a/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
+++ b/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
@@ -20,13 +20,13 @@ package io.bitsquare.app.gui;
 import io.bitsquare.BitsquareException;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewLoader;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
 import java.net.MalformedURLException;
 
+import viewfx.view.support.ViewLoader;
 import viewfx.view.support.guice.GuiceViewFactory;
 
 import javafx.application.Application;