From 02bf6f673dcef71971b3262a5984993cca278471 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Sun, 23 Nov 2014 02:05:00 +0100
Subject: [PATCH] Fix compilation failure--return View from loadView

---
 src/main/java/io/bitsquare/gui/View.java               |  5 +++--
 .../io/bitsquare/gui/main/account/AccountView.java     |  6 +++---
 .../account/arbitrator/ArbitratorSettingsView.java     |  2 +-
 .../arbitrator/browser/ArbitratorBrowserView.java      |  8 +++-----
 .../account/content/restrictions/RestrictionsView.java |  5 +++--
 .../gui/main/account/settings/AccountSettingsView.java |  6 +++---
 .../gui/main/account/setup/AccountSetupView.java       | 10 +++++-----
 .../java/io/bitsquare/gui/main/funds/FundsView.java    |  8 +++-----
 src/main/java/io/bitsquare/gui/main/msg/MsgView.java   |  5 -----
 .../io/bitsquare/gui/main/portfolio/PortfolioView.java |  7 +++----
 .../io/bitsquare/gui/main/settings/SettingsView.java   |  9 +++------
 .../java/io/bitsquare/gui/main/trade/TradeView.java    |  5 ++---
 12 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/View.java b/src/main/java/io/bitsquare/gui/View.java
index a3a5ae31ae..280af70384 100644
--- a/src/main/java/io/bitsquare/gui/View.java
+++ b/src/main/java/io/bitsquare/gui/View.java
@@ -33,7 +33,7 @@ public class View<M> {
     protected final M model;
     protected @FXML Parent root;
 
-    protected Initializable childController;
+    protected View childController;
     protected Initializable parent;
 
 
@@ -49,6 +49,7 @@ public class View<M> {
         this.parent = parent;
     }
 
-    protected Initializable loadView(Navigation.Item navigationItem) {
+    protected View loadView(Navigation.Item navigationItem) {
+        throw new UnsupportedOperationException("loadView not implemented");
     }
 }
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 4fc2831664..20adb6c2c4 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -115,7 +115,7 @@ public class AccountView extends ActivatableViewAndModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         final Tab tab;
         switch (navigationItem) {
@@ -141,8 +141,8 @@ public class AccountView extends ActivatableViewAndModel {
 
         tab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(tab);
-        Initializable childController = loaded.controller;
-        ((View) childController).setParent(this);
+        View childController = (View) loaded.controller;
+        childController.setParent(this);
 
         return childController;
     }
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 affbd4d9b8..d691d5f3ae 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
@@ -58,7 +58,7 @@ public class ArbitratorSettingsView extends View {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
         arbitratorRegistrationViewCB = (ArbitratorRegistrationView) loaded.controller;
 
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 f4379b74ae..dd4d5c52ea 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
@@ -110,13 +110,11 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        super.loadView(navigationItem);
-
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         ((Pane) root).getChildren().set(0, loaded.view);
-        Initializable childController = arbitratorProfileViewCB = (ArbitratorProfileView) loaded.controller;
-        ((View) childController).setParent(this);
+        View childController = arbitratorProfileViewCB = (ArbitratorProfileView) loaded.controller;
+        childController.setParent(this);
 
         return childController;
     }
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 ca5d381279..2cf4898347 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
@@ -20,6 +20,7 @@ package io.bitsquare.gui.main.account.content.restrictions;
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
 import io.bitsquare.gui.main.account.content.ContextAware;
@@ -170,7 +171,7 @@ public class RestrictionsView extends ActivatableViewAndModel<RestrictionsViewMo
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
 
         final Stage stage = new Stage();
@@ -191,7 +192,7 @@ public class RestrictionsView extends ActivatableViewAndModel<RestrictionsViewMo
         });
         stage.show();
 
-        return loaded.controller;
+        return (View) loaded.controller;
     }
 
 
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 53429ec1f1..f64759c30f 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
@@ -129,11 +129,11 @@ public class AccountSettingsView extends ActivatableViewAndModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         content.getChildren().setAll(loaded.view);
-        childController = loaded.controller;
-        ((View) childController).setParent(this);
+        childController = (View) loaded.controller;
+        childController.setParent(this);
         ((ContextAware) childController).useSettingsContext(true);
         return childController;
     }
diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java
index 16bf1470cc..952b32d5ba 100644
--- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java
@@ -183,11 +183,11 @@ public class AccountSetupView extends ActivatableView implements MultiStepNaviga
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         content.getChildren().setAll(loaded.view);
-        childController = loaded.controller;
-        ((View) childController).setParent(this);
+        childController = (View) loaded.controller;
+        childController.setParent(this);
         ((ContextAware) childController).useSettingsContext(false);
         return childController;
     }
@@ -196,7 +196,7 @@ public class AccountSetupView extends ActivatableView implements MultiStepNaviga
 class WizardItem extends HBox {
     private static final Logger log = LoggerFactory.getLogger(WizardItem.class);
 
-    private Initializable childController;
+    private View childController;
 
     private final ImageView imageView;
     private final Label titleLabel;
@@ -243,7 +243,7 @@ class WizardItem extends HBox {
         getChildren().addAll(imageView, vBox);
     }
 
-    Initializable show() {
+    View show() {
         host.loadView(navigationItem);
        /* navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, Navigation
                         .Item.ACCOUNT_SETUP,
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 3cbd1118b1..4456a214d9 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -95,9 +95,7 @@ public class FundsView extends ActivatableViewAndModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        super.loadView(navigationItem);
-
+    protected View loadView(Navigation.Item navigationItem) {
         // we want to get activate/deactivate called, so we remove the old view on tab change
         if (currentTab != null)
             currentTab.setContent(null);
@@ -113,8 +111,8 @@ public class FundsView extends ActivatableViewAndModel {
         }
         currentTab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(currentTab);
-        Initializable childController = loaded.controller;
-        ((View) childController).setParent(this);
+        View childController = (View) loaded.controller;
+        childController.setParent(this);
 
         return childController;
     }
diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
index 070a312a18..ad2ddf7eab 100644
--- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
+++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
@@ -47,11 +47,6 @@ public class MsgView extends View {
     // Navigation
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        return super.loadView(navigationItem);
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // GUI Event handlers
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 47a0ae1af3..a590438f2b 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
@@ -102,8 +102,7 @@ public class PortfolioView extends ActivatableViewAndModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        super.loadView(navigationItem);
+    protected View loadView(Navigation.Item navigationItem) {
 
         // we want to get activate/deactivate called, so we remove the old view on tab change
         if (currentTab != null)
@@ -123,8 +122,8 @@ public class PortfolioView extends ActivatableViewAndModel {
         }
         currentTab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(currentTab);
-        Initializable childController = loaded.controller;
-        ((View) childController).setParent(this);
+        View childController = (View) loaded.controller;
+        childController.setParent(this);
 
         return childController;
     }
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 555f92f021..dfa8d79400 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
@@ -103,9 +103,7 @@ public class SettingsView extends ActivatableViewAndModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        super.loadView(navigationItem);
-
+    protected View loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         final Tab tab;
         switch (navigationItem) {
@@ -120,9 +118,8 @@ public class SettingsView extends ActivatableViewAndModel {
         }
         tab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(tab);
-        Initializable childController = loaded.controller;
-        if (childController instanceof View)
-            ((View) childController).setParent(this);
+        View childController = (View) loaded.controller;
+        childController.setParent(this);
 
         return childController;
     }
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 524576f840..69a8d22ed2 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.Navigation;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.trade.createoffer.CreateOfferView;
@@ -34,7 +35,6 @@ import java.util.List;
 
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
-import javafx.fxml.Initializable;
 import javafx.scene.*;
 import javafx.scene.control.*;
 
@@ -145,8 +145,7 @@ public class TradeView extends ActivatableView implements TradeNavigator {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        super.loadView(navigationItem);
+    protected View loadView(Navigation.Item navigationItem) {
         TabPane tabPane = (TabPane) root;
         if (navigationItem == Navigation.Item.OFFER_BOOK && offerBookViewCB == null) {
             // Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens.