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

Fix compilation failure--return View from loadView

Browse Source
This commit is contained in:
Chris Beams 2014-11-23 02:05:00 +01:00
parent 00552399d7
commit 02bf6f673d
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
12 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
src/main/java/io/bitsquare/gui/main/account/AccountView.java
View File

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

2
src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
View File

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

8
src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
View File

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

5
src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
View File

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

6
src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View File

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

10
src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java
View File

@ -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,

8
src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View File

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

5
src/main/java/io/bitsquare/gui/main/msg/MsgView.java
View File

@ -47,11 +47,6 @@ public class MsgView extends View {
// Navigation
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected Initializable loadView(Navigation.Item navigationItem) {
return super.loadView(navigationItem);
}
///////////////////////////////////////////////////////////////////////////////////////////
// GUI Event handlers

7
src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View File

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

9
src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View File

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

5
src/main/java/io/bitsquare/gui/main/trade/TradeView.java
View File

@ -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.