Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-24 22:39:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate *CB suffixes on View variable names

Browse source
This commit is contained in:
Chris Beams 2014-11-23 05:17:09 +01:00
parent 00dce517ee
commit 4eb1b3994e
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
5 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
View file

@ -37,7 +37,7 @@ public class ArbitratorSettingsView extends AbstractView {
private final Navigation navigation; private final Navigation navigation;
private final Stage primaryStage; private final Stage primaryStage;
private ArbitratorRegistrationView arbitratorRegistrationViewCB; private ArbitratorRegistrationView arbitratorRegistrationView;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -60,7 +60,7 @@ public class ArbitratorSettingsView extends AbstractView {
@Override @Override
protected View loadView(Navigation.Item navigationItem) { protected View loadView(Navigation.Item navigationItem) {
ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false); ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
arbitratorRegistrationViewCB = (ArbitratorRegistrationView) loaded.controller; arbitratorRegistrationView = (ArbitratorRegistrationView) loaded.controller;
final Stage stage = new Stage(); final Stage stage = new Stage();
stage.setTitle("Arbitrator"); stage.setTitle("Arbitrator");
@ -76,7 +76,7 @@ public class ArbitratorSettingsView extends AbstractView {
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
return arbitratorRegistrationViewCB; return arbitratorRegistrationView;
} }
@ -92,7 +92,7 @@ public class ArbitratorSettingsView extends AbstractView {
@FXML @FXML
public void onArbitratorEdit() { public void onArbitratorEdit() {
loadView(Navigation.Item.ARBITRATOR_REGISTRATION); loadView(Navigation.Item.ARBITRATOR_REGISTRATION);
arbitratorRegistrationViewCB.setEditMode(true); arbitratorRegistrationView.setEditMode(true);
} }
} }

16
src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
View file

@ -50,7 +50,7 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
private final List<Arbitrator> allArbitrators = new ArrayList<>(); private final List<Arbitrator> allArbitrators = new ArrayList<>();
private Arbitrator currentArbitrator; private Arbitrator currentArbitrator;
private ArbitratorProfileView arbitratorProfileViewCB; private ArbitratorProfileView arbitratorProfileView;
private int index = -1; private int index = -1;
@FXML Button prevButton, nextButton, selectButton, closeButton; @FXML Button prevButton, nextButton, selectButton, closeButton;
@ -92,11 +92,11 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
final ViewLoader loader = new ViewLoader(getClass().getResource(item.getFxmlUrl())); final ViewLoader loader = new ViewLoader(getClass().getResource(item.getFxmlUrl()));
try { try {
final Node view = loader.load(); final Node view = loader.load();
arbitratorProfileViewCB = loader.getController(); arbitratorProfileView = loader.getController();
arbitratorProfileViewCB.setParentController(this); arbitratorProfileView.setParentController(this);
((Pane) root).getChildren().set(0, view); ((Pane) root).getChildren().set(0, view);
return arbitratorProfileViewCB; return arbitratorProfileView;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -112,7 +112,7 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
protected View loadView(Navigation.Item navigationItem) { protected View loadView(Navigation.Item navigationItem) {
ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl()); ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
((Pane) root).getChildren().set(0, loaded.view); ((Pane) root).getChildren().set(0, loaded.view);
return arbitratorProfileViewCB = (ArbitratorProfileView) loaded.controller; return arbitratorProfileView = (ArbitratorProfileView) loaded.controller;
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -131,7 +131,7 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
if (!allArbitrators.isEmpty()) { if (!allArbitrators.isEmpty()) {
index = 0; index = 0;
currentArbitrator = allArbitrators.get(index); currentArbitrator = allArbitrators.get(index);
arbitratorProfileViewCB.applyArbitrator(currentArbitrator); arbitratorProfileView.applyArbitrator(currentArbitrator);
checkButtonState(); checkButtonState();
} }
} }
@ -150,7 +150,7 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
if (index > 0) { if (index > 0) {
index--; index--;
currentArbitrator = allArbitrators.get(index); currentArbitrator = allArbitrators.get(index);
arbitratorProfileViewCB.applyArbitrator(currentArbitrator); arbitratorProfileView.applyArbitrator(currentArbitrator);
} }
checkButtonState(); checkButtonState();
} }
@ -160,7 +160,7 @@ public class ArbitratorBrowserView extends ActivatableView implements Arbitrator
if (index < allArbitrators.size() - 1) { if (index < allArbitrators.size() - 1) {
index++; index++;
currentArbitrator = allArbitrators.get(index); currentArbitrator = allArbitrators.get(index);
arbitratorProfileViewCB.applyArbitrator(currentArbitrator); arbitratorProfileView.applyArbitrator(currentArbitrator);
} }
checkButtonState(); checkButtonState();
} }

59
src/main/java/io/bitsquare/gui/main/trade/TradeView.java
View file

@ -44,11 +44,11 @@ import org.slf4j.LoggerFactory;
public class TradeView extends ActivatableView { public class TradeView extends ActivatableView {
private static final Logger log = LoggerFactory.getLogger(TradeView.class); private static final Logger log = LoggerFactory.getLogger(TradeView.class);
private OfferBookView offerBookViewCB; private OfferBookView offerBookView;
private CreateOfferView createOfferViewCB; private CreateOfferView createOfferView;
private TakeOfferView takeOfferViewCB; private TakeOfferView takeOfferView;
private Node createOfferView; private Node createOfferRoot;
private Node takeOfferView; private Node takeOfferRoot;
private Navigation.Listener listener; private Navigation.Listener listener;
private Navigation.Item navigationItem; private Navigation.Item navigationItem;
private Direction direction; private Direction direction;
@ -101,9 +101,9 @@ public class TradeView extends ActivatableView {
change.next(); change.next();
List<? extends Tab> removedTabs = change.getRemoved(); List<? extends Tab> removedTabs = change.getRemoved();
if (removedTabs.size() == 1) { if (removedTabs.size() == 1) {
if (removedTabs.get(0).getContent().equals(createOfferView)) if (removedTabs.get(0).getContent().equals(createOfferRoot))
onCreateOfferViewRemoved(); onCreateOfferViewRemoved();
else if (removedTabs.get(0).getContent().equals(takeOfferView)) else if (removedTabs.get(0).getContent().equals(takeOfferRoot))
onTakeOfferViewRemoved(); onTakeOfferViewRemoved();
} }
}); });
@ -139,49 +139,48 @@ public class TradeView extends ActivatableView {
@Override @Override
protected View loadView(Navigation.Item navigationItem) { protected View loadView(Navigation.Item navigationItem) {
TabPane tabPane = (TabPane) root; TabPane tabPane = (TabPane) root;
if (navigationItem == Navigation.Item.OFFER_BOOK && offerBookViewCB == null) { if (navigationItem == Navigation.Item.OFFER_BOOK && offerBookView == null) {
// Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens. // Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens.
ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false); ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
final Tab tab = new Tab(direction == Direction.BUY ? "Buy Bitcoin" : "Sell Bitcoin"); final Tab tab = new Tab(direction == Direction.BUY ? "Buy Bitcoin" : "Sell Bitcoin");
tab.setClosable(false); tab.setClosable(false);
tab.setContent(loaded.view); tab.setContent(loaded.view);
tabPane.getTabs().add(tab); tabPane.getTabs().add(tab);
offerBookViewCB = (OfferBookView) loaded.controller; offerBookView = (OfferBookView) loaded.controller;
offerBookViewCB.setParent(this); offerBookView.setParent(this);
offerBookViewCB.setDirection(direction); offerBookView.setDirection(direction);
// offerBookViewCB.setNavigationListener(n -> loadView(n));
return offerBookViewCB; return offerBookView;
} }
else if (navigationItem == Navigation.Item.CREATE_OFFER && createOfferViewCB == null) { else if (navigationItem == Navigation.Item.CREATE_OFFER && createOfferView == null) {
// CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times // CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times
// in different graphs // in different graphs
ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false); ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
createOfferView = loaded.view; createOfferRoot = loaded.view;
createOfferViewCB = (CreateOfferView) loaded.controller; createOfferView = (CreateOfferView) loaded.controller;
createOfferViewCB.initWithData(direction, amount, price); createOfferView.initWithData(direction, amount, price);
final Tab tab = new Tab("Create offer"); final Tab tab = new Tab("Create offer");
createOfferViewCB.configCloseHandlers(tab.closableProperty()); createOfferView.configCloseHandlers(tab.closableProperty());
tab.setContent(createOfferView); tab.setContent(createOfferRoot);
tabPane.getTabs().add(tab); tabPane.getTabs().add(tab);
tabPane.getSelectionModel().select(tab); tabPane.getSelectionModel().select(tab);
return createOfferViewCB; return createOfferView;
} }
else if (navigationItem == Navigation.Item.TAKE_OFFER && takeOfferViewCB == null && else if (navigationItem == Navigation.Item.TAKE_OFFER && takeOfferView == null &&
offer != null) { offer != null) {
// CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times // CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times
// in different graphs // in different graphs
ViewLoader.Item loaded = viewLoader.load(Navigation.Item.TAKE_OFFER.getFxmlUrl(), false); ViewLoader.Item loaded = viewLoader.load(Navigation.Item.TAKE_OFFER.getFxmlUrl(), false);
takeOfferView = loaded.view; takeOfferRoot = loaded.view;
takeOfferViewCB = (TakeOfferView) loaded.controller; takeOfferView = (TakeOfferView) loaded.controller;
takeOfferViewCB.initWithData(direction, amount, offer); takeOfferView.initWithData(direction, amount, offer);
final Tab tab = new Tab("Take offer"); final Tab tab = new Tab("Take offer");
takeOfferViewCB.configCloseHandlers(tab.closableProperty()); takeOfferView.configCloseHandlers(tab.closableProperty());
tab.setContent(takeOfferView); tab.setContent(takeOfferRoot);
tabPane.getTabs().add(tab); tabPane.getTabs().add(tab);
tabPane.getSelectionModel().select(tab); tabPane.getSelectionModel().select(tab);
return takeOfferViewCB; return takeOfferView;
} }
return null; return null;
} }
@ -197,15 +196,15 @@ public class TradeView extends ActivatableView {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private void onCreateOfferViewRemoved() { private void onCreateOfferViewRemoved() {
createOfferViewCB = null; createOfferView = null;
offerBookViewCB.enableCreateOfferButton(); offerBookView.enableCreateOfferButton();
// update the navigation state // update the navigation state
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK);
} }
private void onTakeOfferViewRemoved() { private void onTakeOfferViewRemoved() {
takeOfferViewCB = null; takeOfferView = null;
// update the navigation state // update the navigation state
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK);

2
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
View file

@ -139,7 +139,7 @@ public class CreateOfferView extends ActivatableViewAndModel<CreateOfferViewMode
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Public methods (called form other views/CB) // Public methods (called form other views)
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void initWithData(Direction direction, Coin amount, Fiat price) { public void initWithData(Direction direction, Coin amount, Fiat price) {

2
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
View file

@ -127,7 +127,7 @@ public class TakeOfferView extends ActivatableViewAndModel<TakeOfferViewModel> {
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Public methods (called form other views/CB) // Public methods (called form other views)
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void initWithData(Direction direction, Coin amount, Offer offer) { public void initWithData(Direction direction, Coin amount, Offer offer) {