diff --git a/src/main/java/io/bitsquare/gui/Navigation.java b/src/main/java/io/bitsquare/gui/Navigation.java index b69e3974bd..8c635a9216 100644 --- a/src/main/java/io/bitsquare/gui/Navigation.java +++ b/src/main/java/io/bitsquare/gui/Navigation.java @@ -159,7 +159,7 @@ public class Navigation { HOME("/io/bitsquare/gui/main/home/HomeView.fxml"), BUY("/io/bitsquare/gui/main/trade/BuyView.fxml"), SELL("/io/bitsquare/gui/main/trade/SellView.fxml"), - ORDERS("/io/bitsquare/gui/main/orders/OrdersView.fxml"), + PORTFOLIO("/io/bitsquare/gui/main/portfolio/PortfolioView.fxml"), FUNDS("/io/bitsquare/gui/main/funds/FundsView.fxml"), MSG("/io/bitsquare/gui/main/msg/MsgView.fxml"), SETTINGS("/io/bitsquare/gui/main/settings/SettingsView.fxml"), @@ -171,14 +171,14 @@ public class Navigation { /////////////////////////////////////////////////////////////////////////////////////////// // buy/sell (trade) - ORDER_BOOK("/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml"), + OFFER_BOOK("/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml"), CREATE_OFFER("/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml"), TAKE_OFFER("/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml"), - // orders - OFFERS("/io/bitsquare/gui/main/orders/offer/OffersView.fxml"), - PENDING_TRADES("/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml"), - CLOSED_TRADES("/io/bitsquare/gui/main/orders/closed/ClosedTradesView.fxml"), + // portfolio + OFFERS("/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml"), + PENDING_TRADES("/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml"), + CLOSED_TRADES("/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml"), // funds WITHDRAWAL("/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"), diff --git a/src/main/java/io/bitsquare/gui/images.css b/src/main/java/io/bitsquare/gui/images.css index 88469ae8bc..e0489179cf 100644 --- a/src/main/java/io/bitsquare/gui/images.css +++ b/src/main/java/io/bitsquare/gui/images.css @@ -68,11 +68,11 @@ -fx-image: url("../../../images/nav/sell_active.png"); } -#image-nav-orders { - -fx-image: url("../../../images/nav/orders.png"); +#image-nav-portfolio { + -fx-image: url("../../../images/nav/portfolio.png"); } -#image-nav-orders-active { - -fx-image: url("../../../images/nav/orders_active.png"); +#image-nav-portfolio-active { + -fx-image: url("../../../images/nav/portfolio_active.png"); } #image-nav-funds { diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index b9e1ce44fe..af1c5a4463 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -256,7 +256,7 @@ public class MainViewCB extends ViewCB { case MSG: msgButton.setSelected(true); break; - case ORDERS: + case PORTFOLIO: ordersButton.setSelected(true); break; case SETTINGS: @@ -337,7 +337,7 @@ public class MainViewCB extends ViewCB { sellButton = addNavButton(leftNavPane, "Sell BTC", Navigation.Item.SELL); ordersButtonButtonPane = new Pane(); - ordersButton = addNavButton(ordersButtonButtonPane, "Portfolio", Navigation.Item.ORDERS); + ordersButton = addNavButton(ordersButtonButtonPane, "Portfolio", Navigation.Item.PORTFOLIO); leftNavPane.getChildren().add(ordersButtonButtonPane); fundsButton = addNavButton(leftNavPane, "Funds", Navigation.Item.FUNDS); diff --git a/src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml rename to src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml index 7778850f3f..7161bdd295 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java similarity index 88% rename from src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java index 38deaad52a..67d6e54d92 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders; +package io.bitsquare.gui.main.portfolio; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; @@ -40,8 +40,8 @@ import javafx.scene.control.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OrdersViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(OrdersViewCB.class); +public class PortfolioViewCB extends CachedViewCB { + private static final Logger log = LoggerFactory.getLogger(PortfolioViewCB.class); private final Navigation navigation; private final TradeManager tradeManager; @@ -57,7 +57,7 @@ public class OrdersViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - OrdersViewCB(Navigation navigation, TradeManager tradeManager) { + PortfolioViewCB(Navigation navigation, TradeManager tradeManager) { super(); this.navigation = navigation; @@ -73,17 +73,18 @@ public class OrdersViewCB extends CachedViewCB { public void initialize(URL url, ResourceBundle rb) { navigationListener = navigationItems -> { if (navigationItems != null && navigationItems.length == 3 - && navigationItems[1] == Navigation.Item.ORDERS) + && navigationItems[1] == Navigation.Item.PORTFOLIO) loadView(navigationItems[2]); }; tabChangeListener = (ov, oldValue, newValue) -> { if (newValue == offersTab) - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.OFFERS); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); else if (newValue == pendingTradesTab) - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.PENDING_TRADES); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, + Navigation.Item.PENDING_TRADES); else if (newValue == closedTradesTab) - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.CLOSED_TRADES); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.CLOSED_TRADES); }; super.initialize(url, rb); @@ -97,9 +98,9 @@ public class OrdersViewCB extends CachedViewCB { navigation.addListener(navigationListener); if (tradeManager.getPendingTrades().size() == 0) - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.OFFERS); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); else - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.PENDING_TRADES); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.PENDING_TRADES); } @Override diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesListItem.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesListItem.java rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java index fc074db3fc..1b6285c25f 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesListItem.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.closed; +package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.trade.Trade; diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java index 44536e8999..4db4756aa7 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.closed; +package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.gui.UIModel; import io.bitsquare.trade.Direction; diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesPM.java index 0006c85fde..fce241c8ac 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.closed; +package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml similarity index 96% rename from src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesView.fxml rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml index c1901f397d..f2c2ac0ee1 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java index 1b7c967fc1..1ba56b06c5 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.closed; +package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.components.Popups; diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java similarity index 95% rename from src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java index a5bf4c407b..70ed12c71f 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.offer; +package io.bitsquare.gui.main.portfolio.offer; import io.bitsquare.trade.Offer; diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java index 0c2b991105..cdc27a3451 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.offer; +package io.bitsquare.gui.main.portfolio.offer; import io.bitsquare.gui.UIModel; import io.bitsquare.trade.Direction; diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersPM.java similarity index 98% rename from src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersPM.java index 510c5e7bc3..7d7a1aca53 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.offer; +package io.bitsquare.gui.main.portfolio.offer; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml similarity index 96% rename from src/main/java/io/bitsquare/gui/main/orders/offer/OffersView.fxml rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml index 17b6ef131b..df765c3cf3 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java index 0bc83ffcf0..73afb22906 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.offer; +package io.bitsquare.gui.main.portfolio.offer; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.components.Popups; diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java similarity index 97% rename from src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java index 226a033c1a..98f73a9f47 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending; +package io.bitsquare.gui.main.portfolio.pending; import io.bitsquare.trade.Trade; diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java index 1138f0d89c..7ee87e4337 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending; +package io.bitsquare.gui.main.portfolio.pending; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java index 8d8eef8172..bf7e42265f 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending; +package io.bitsquare.gui.main.portfolio.pending; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.PresentationModel; diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml index 502cab5683..9ba33f2da1 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml @@ -27,7 +27,7 @@ - - + diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java similarity index 99% rename from src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java index ce7d7931e1..a11151f924 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending; +package io.bitsquare.gui.main.portfolio.pending; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; @@ -208,7 +208,8 @@ public class PendingTradesViewCB extends CachedViewCB { presentationModel.removePendingTrade(); presentationModel.withdraw(withdrawAddressTextField.getText()); Platform.runLater(() -> - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.CLOSED_TRADES)); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, + Navigation.Item.CLOSED_TRADES)); } @FXML diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java index 344095ec77..06e0fae5f9 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java @@ -21,7 +21,7 @@ import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB; -import io.bitsquare.gui.main.trade.orderbook.OrderBookViewCB; +import io.bitsquare.gui.main.trade.offerbook.OfferBookViewCB; import io.bitsquare.gui.main.trade.takeoffer.TakeOfferViewCB; import io.bitsquare.trade.Direction; import io.bitsquare.trade.Offer; @@ -50,7 +50,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { private static final Logger log = LoggerFactory.getLogger(TradeViewCB.class); // private final OrderBookInfo orderBookInfo = new OrderBookInfo(); - private OrderBookViewCB orderBookViewCB; + private OfferBookViewCB orderBookViewCB; private CreateOfferViewCB createOfferViewCB; private TakeOfferViewCB takeOfferViewCB; private Node createOfferView; @@ -118,7 +118,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { }); navigation.addListener(listener); - navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.ORDER_BOOK); + navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); } @SuppressWarnings("EmptyMethod") @@ -166,7 +166,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { protected Initializable loadView(Navigation.Item navigationItem) { super.loadView(navigationItem); TabPane tabPane = (TabPane) root; - if (navigationItem == Navigation.Item.ORDER_BOOK && orderBookViewCB == null) { + if (navigationItem == Navigation.Item.OFFER_BOOK && orderBookViewCB == null) { // Orderbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens. ViewLoader orderBookLoader = new ViewLoader(getClass().getResource(navigationItem.getFxmlUrl()), false); @@ -244,14 +244,14 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator { orderBookViewCB.enableCreateOfferButton(); // update the navigation state - navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.ORDER_BOOK); + navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); } private void onTakeOfferViewRemoved() { takeOfferViewCB = null; // update the navigation state - navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.ORDER_BOOK); + navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); } } diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index 29776715d0..effb1fc23c 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -277,7 +277,7 @@ public class CreateOfferViewCB extends CachedViewCB { TabPane tabPane = ((TabPane) (root.getParent().getParent())); tabPane.getTabs().remove(tabPane.getSelectionModel().getSelectedItem()); - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.OFFERS); + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java similarity index 86% rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java index a9d001bb24..a79aebf00f 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBook.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.orderbook; +package io.bitsquare.gui.main.trade.offerbook; import io.bitsquare.bank.BankAccount; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.msg.MessageFacade; -import io.bitsquare.msg.listeners.OrderBookListener; +import io.bitsquare.msg.listeners.OfferBookListener; import io.bitsquare.trade.Offer; import io.bitsquare.user.User; import io.bitsquare.util.Utilities; @@ -47,15 +47,15 @@ import static com.google.common.base.Preconditions.checkArgument; * It also use OrderBookListener as the lists items class and we don't want to get any dependency out of the package * for that. */ -public class OrderBook { +public class OfferBook { - private static final Logger log = LoggerFactory.getLogger(OrderBook.class); + private static final Logger log = LoggerFactory.getLogger(OfferBook.class); private final MessageFacade messageFacade; private final User user; - private final ObservableList orderBookListItems = FXCollections.observableArrayList(); - private final OrderBookListener orderBookListener; + private final ObservableList offerBookListItems = FXCollections.observableArrayList(); + private final OfferBookListener offerBookListener; private final ChangeListener bankAccountChangeListener; private final ChangeListener invalidationListener; private String fiatCode; @@ -69,14 +69,14 @@ public class OrderBook { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - OrderBook(MessageFacade messageFacade, User user) { + OfferBook(MessageFacade messageFacade, User user) { this.messageFacade = messageFacade; this.user = user; bankAccountChangeListener = (observableValue, oldValue, newValue) -> setBankAccount(newValue); invalidationListener = (ov, oldValue, newValue) -> requestOffers(); - orderBookListener = new OrderBookListener() { + offerBookListener = new OfferBookListener() { @Override public void onOfferAdded(Offer offer) { addOfferToOrderBookListItems(offer); @@ -85,13 +85,13 @@ public class OrderBook { @Override public void onOffersReceived(List offers) { //TODO use deltas instead replacing the whole list - orderBookListItems.clear(); + offerBookListItems.clear(); offers.stream().forEach(e -> addOfferToOrderBookListItems(e)); } @Override public void onOfferRemoved(Offer offer) { - orderBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId())); + offerBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId())); } }; } @@ -119,8 +119,8 @@ public class OrderBook { // Getter /////////////////////////////////////////////////////////////////////////////////////////// - ObservableList getOrderBookListItems() { - return orderBookListItems; + ObservableList getOfferBookListItems() { + return offerBookListItems; } @@ -133,7 +133,7 @@ public class OrderBook { if (bankAccount != null) { country = bankAccount.getCountry(); fiatCode = bankAccount.getCurrency().getCurrencyCode(); - orderBookListItems.stream().forEach(e -> e.setBankAccountCountry(country)); + offerBookListItems.stream().forEach(e -> e.setBankAccountCountry(country)); } else { fiatCode = CurrencyUtil.getDefaultCurrency().getCurrencyCode(); @@ -143,20 +143,20 @@ public class OrderBook { private void addListeners() { log.debug("addListeners "); user.currentBankAccountProperty().addListener(bankAccountChangeListener); - messageFacade.addOrderBookListener(orderBookListener); + messageFacade.addOrderBookListener(offerBookListener); messageFacade.invalidationTimestampProperty().addListener(invalidationListener); } private void removeListeners() { log.debug("removeListeners "); user.currentBankAccountProperty().removeListener(bankAccountChangeListener); - messageFacade.removeOrderBookListener(orderBookListener); + messageFacade.removeOrderBookListener(offerBookListener); messageFacade.invalidationTimestampProperty().removeListener(invalidationListener); } private void addOfferToOrderBookListItems(Offer offer) { if (offer != null) { - orderBookListItems.add(new OrderBookListItem(offer, country)); + offerBookListItems.add(new OfferBookListItem(offer, country)); } } diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java similarity index 93% rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java index 4134237769..47ea51087f 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.orderbook; +package io.bitsquare.gui.main.trade.offerbook; import io.bitsquare.locale.Country; import io.bitsquare.trade.Offer; @@ -23,7 +23,7 @@ import io.bitsquare.trade.Offer; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; -public class OrderBookListItem { +public class OfferBookListItem { private final Offer offer; private final ObjectProperty bankAccountCountry = new SimpleObjectProperty<>(); @@ -32,7 +32,7 @@ public class OrderBookListItem { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public OrderBookListItem(Offer offer, Country bankAccountCountry) { + public OfferBookListItem(Offer offer, Country bankAccountCountry) { this.offer = offer; setBankAccountCountry(bankAccountCountry); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java similarity index 94% rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java index 7ea47f6c94..0649364e55 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.orderbook; +package io.bitsquare.gui.main.trade.offerbook; import io.bitsquare.bank.BankAccount; import io.bitsquare.gui.UIModel; @@ -51,17 +51,17 @@ import org.slf4j.LoggerFactory; /** * It holds the scope specific domain data for either a buy or sell UI screen. */ -class OrderBookModel extends UIModel { - private static final Logger log = LoggerFactory.getLogger(OrderBookModel.class); +class OfferBookModel extends UIModel { + private static final Logger log = LoggerFactory.getLogger(OfferBookModel.class); private final User user; - private final OrderBook orderBook; + private final OfferBook orderBook; private final Settings settings; private BSFormatter formatter; private final TradeManager tradeManager; - private final FilteredList filteredItems; - private final SortedList sortedItems; + private final FilteredList filteredItems; + private final SortedList sortedItems; // private OrderBookInfo orderBookInfo; private ChangeListener bankAccountChangeListener; @@ -73,7 +73,7 @@ class OrderBookModel extends UIModel { final StringProperty fiatCode = new SimpleStringProperty(); final StringProperty btcCode = new SimpleStringProperty(); final ObjectProperty bankAccountCountry = new SimpleObjectProperty<>(); - final ObjectProperty> comparator = new SimpleObjectProperty<>(); + final ObjectProperty> comparator = new SimpleObjectProperty<>(); private Direction direction; @@ -82,9 +82,9 @@ class OrderBookModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - OrderBookModel(User user, + OfferBookModel(User user, TradeManager tradeManager, - OrderBook orderBook, + OfferBook orderBook, Settings settings, BSFormatter formatter) { this.tradeManager = tradeManager; @@ -93,7 +93,7 @@ class OrderBookModel extends UIModel { this.settings = settings; this.formatter = formatter; - filteredItems = new FilteredList<>(orderBook.getOrderBookListItems()); + filteredItems = new FilteredList<>(orderBook.getOfferBookListItems()); sortedItems = new SortedList<>(filteredItems); } @@ -238,7 +238,7 @@ class OrderBookModel extends UIModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - SortedList getOfferList() { + SortedList getOfferList() { return sortedItems; } diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookPM.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java similarity index 94% rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookPM.java rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java index d4e82b3187..0314f883ff 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookPM.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.orderbook; +package io.bitsquare.gui.main.trade.offerbook; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.util.BSFormatter; @@ -38,8 +38,8 @@ import javafx.collections.transformation.SortedList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class OrderBookPM extends PresentationModel { - private static final Logger log = LoggerFactory.getLogger(OrderBookPM.class); +class OfferBookPM extends PresentationModel { + private static final Logger log = LoggerFactory.getLogger(OfferBookPM.class); private final OptionalBtcValidator optionalBtcValidator; private BSFormatter formatter; @@ -58,7 +58,7 @@ class OrderBookPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - OrderBookPM(OrderBookModel model, + OfferBookPM(OfferBookModel model, OptionalFiatValidator optionalFiatValidator, OptionalBtcValidator optionalBtcValidator, BSFormatter formatter) { @@ -161,7 +161,7 @@ class OrderBookPM extends PresentationModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - SortedList getOfferList() { + SortedList getOfferList() { return model.getOfferList(); } @@ -185,21 +185,21 @@ class OrderBookPM extends PresentationModel { return model.isMyOffer(offer); } - String getAmount(OrderBookListItem item) { + String getAmount(OfferBookListItem item) { return (item != null) ? formatter.formatCoin(item.getOffer().getAmount()) + " (" + formatter.formatCoin(item.getOffer().getMinAmount()) + ")" : ""; } - String getPrice(OrderBookListItem item) { + String getPrice(OfferBookListItem item) { return (item != null) ? formatter.formatFiat(item.getOffer().getPrice()) : ""; } - String getVolume(OrderBookListItem item) { + String getVolume(OfferBookListItem item) { return (item != null) ? formatter.formatFiat(item.getOffer().getOfferVolume()) + " (" + formatter.formatFiat(item.getOffer().getMinOfferVolume()) + ")" : ""; } - String getBankAccountType(OrderBookListItem item) { + String getBankAccountType(OfferBookListItem item) { return (item != null) ? BSResources.get(item.getOffer().getBankAccountType().toString()) : ""; } diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml similarity index 99% rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml index bba0e1e003..a78420e904 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml @@ -24,7 +24,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java similarity index 86% rename from src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java index 71fb90fc5d..6cdd0c755e 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.orderbook; +package io.bitsquare.gui.main.trade.offerbook; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; @@ -62,8 +62,8 @@ import static javafx.beans.binding.Bindings.createStringBinding; * TODO: The advanced filters are not impl. yet * The restrictions handling is open from the concept and is only implemented for countries yet. */ -public class OrderBookViewCB extends CachedViewCB { - private static final Logger log = LoggerFactory.getLogger(OrderBookViewCB.class); +public class OfferBookViewCB extends CachedViewCB { + private static final Logger log = LoggerFactory.getLogger(OfferBookViewCB.class); private final Navigation navigation; private final OverlayManager overlayManager; @@ -80,9 +80,9 @@ public class OrderBookViewCB extends CachedViewCB { @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel, extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel; @FXML InputTextField volumeTextField, amountTextField, priceTextField; - @FXML TableView table; + @FXML TableView table; @FXML Button createOfferButton, showAdvancedSettingsButton, openCountryFilterButton, openPaymentMethodsFilterButton; - @FXML TableColumn priceColumn, amountColumn, volumeColumn, + @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, countryColumn, bankAccountTypeColumn; /////////////////////////////////////////////////////////////////////////////////////////// @@ -90,7 +90,7 @@ public class OrderBookViewCB extends CachedViewCB { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - OrderBookViewCB(OrderBookPM presentationModel, + OfferBookViewCB(OfferBookPM presentationModel, Navigation navigation, OverlayManager overlayManager, OptionalBtcValidator optionalBtcValidator, @@ -135,7 +135,7 @@ public class OrderBookViewCB extends CachedViewCB { // for irc demo showAdvancedSettingsButton.setVisible(false); showAdvancedSettingsButton.setManaged(false); - + super.initialize(url, rb); } @@ -144,7 +144,7 @@ public class OrderBookViewCB extends CachedViewCB { super.activate(); // setOrderBookInfo has been called before - SortedList offerList = presentationModel.getOfferList(); + SortedList offerList = presentationModel.getOfferList(); table.setItems(offerList); offerList.comparatorProperty().bind(table.comparatorProperty()); priceColumn.setSortType((presentationModel.getDirection() == Direction.BUY) ? @@ -388,14 +388,14 @@ public class OrderBookViewCB extends CachedViewCB { private void setAmountColumnCellFactory() { amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); amountColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { @Override - public void updateItem(final OrderBookListItem item, boolean empty) { + public void updateItem(final OfferBookListItem item, boolean empty) { super.updateItem(item, empty); setText(presentationModel.getAmount(item)); } @@ -407,14 +407,14 @@ public class OrderBookViewCB extends CachedViewCB { private void setPriceColumnCellFactory() { priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); priceColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { @Override - public void updateItem(final OrderBookListItem item, boolean empty) { + public void updateItem(final OfferBookListItem item, boolean empty) { super.updateItem(item, empty); setText(presentationModel.getPrice(item)); } @@ -426,14 +426,14 @@ public class OrderBookViewCB extends CachedViewCB { private void setVolumeColumnCellFactory() { volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); volumeColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { @Override - public void updateItem(final OrderBookListItem item, boolean empty) { + public void updateItem(final OfferBookListItem item, boolean empty) { super.updateItem(item, empty); setText(presentationModel.getVolume(item)); } @@ -445,13 +445,13 @@ public class OrderBookViewCB extends CachedViewCB { private void setDirectionColumnCellFactory() { directionColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); directionColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { final ImageView iconView = new ImageView(); final Button button = new Button(); @@ -460,7 +460,7 @@ public class OrderBookViewCB extends CachedViewCB { button.setMinWidth(70); } - private void verifyIfTradable(final OrderBookListItem item) { + private void verifyIfTradable(final OfferBookListItem item) { boolean isMatchingRestrictions = presentationModel.isTradable(item .getOffer()); button.setDisable(!isMatchingRestrictions); @@ -488,7 +488,7 @@ public class OrderBookViewCB extends CachedViewCB { } @Override - public void updateItem(final OrderBookListItem item, boolean empty) { + public void updateItem(final OfferBookListItem item, boolean empty) { super.updateItem(item, empty); if (item != null) { @@ -529,13 +529,13 @@ public class OrderBookViewCB extends CachedViewCB { private void setCountryColumnCellFactory() { countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); countryColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { final HBox hBox = new HBox(); { @@ -545,13 +545,13 @@ public class OrderBookViewCB extends CachedViewCB { } @Override - public void updateItem(final OrderBookListItem orderBookListItem, boolean empty) { - super.updateItem(orderBookListItem, empty); + public void updateItem(final OfferBookListItem offerBookListItem, boolean empty) { + super.updateItem(offerBookListItem, empty); hBox.getChildren().clear(); - if (orderBookListItem != null) { - Country country = orderBookListItem.getOffer().getBankAccountCountry(); - hBox.getChildren().add(ImageUtil.getCountryIconImageView(orderBookListItem + if (offerBookListItem != null) { + Country country = offerBookListItem.getOffer().getBankAccountCountry(); + hBox.getChildren().add(ImageUtil.getCountryIconImageView(offerBookListItem .getOffer().getBankAccountCountry())); Tooltip.install(this, new Tooltip(country.getName())); } @@ -564,16 +564,16 @@ public class OrderBookViewCB extends CachedViewCB { private void setBankAccountTypeColumnCellFactory() { bankAccountTypeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); bankAccountTypeColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { @Override - public void updateItem(final OrderBookListItem orderBookListItem, boolean empty) { - super.updateItem(orderBookListItem, empty); - setText(presentationModel.getBankAccountType(orderBookListItem)); + public void updateItem(final OfferBookListItem offerBookListItem, boolean empty) { + super.updateItem(offerBookListItem, empty); + setText(presentationModel.getBankAccountType(offerBookListItem)); } }; } diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java index 4fc08d6fc9..5f6e7b5509 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java @@ -340,7 +340,7 @@ public class TakeOfferViewCB extends CachedViewCB { getProperties().put("type", "CLOSE"); try { close(); - navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.PENDING_TRADES); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java index aa891a1cca..206e846731 100644 --- a/src/main/java/io/bitsquare/msg/MessageFacade.java +++ b/src/main/java/io/bitsquare/msg/MessageFacade.java @@ -23,7 +23,7 @@ import io.bitsquare.msg.listeners.ArbitratorListener; import io.bitsquare.msg.listeners.BootstrapListener; import io.bitsquare.msg.listeners.GetPeerAddressListener; import io.bitsquare.msg.listeners.IncomingTradeMessageListener; -import io.bitsquare.msg.listeners.OrderBookListener; +import io.bitsquare.msg.listeners.OfferBookListener; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.Offer; import io.bitsquare.trade.protocol.trade.TradeMessage; @@ -82,7 +82,7 @@ public class MessageFacade implements MessageBroker { private final P2PNode p2pNode; private final User user; - private final List orderBookListeners = new ArrayList<>(); + private final List offerBookListeners = new ArrayList<>(); private final List arbitratorListeners = new ArrayList<>(); private final List incomingTradeMessageListeners = new ArrayList<>(); private final LongProperty invalidationTimestamp = new SimpleLongProperty(0); @@ -173,7 +173,7 @@ public class MessageFacade implements MessageBroker { if (future.isSuccess()) { Platform.runLater(() -> { addOfferListener.onComplete(); - orderBookListeners.stream().forEach(listener -> { + offerBookListeners.stream().forEach(listener -> { try { Object offerDataObject = offerData.object(); if (offerDataObject instanceof Offer) { @@ -231,7 +231,7 @@ public class MessageFacade implements MessageBroker { public void operationComplete(BaseFuture future) throws Exception { if (future.isSuccess()) { Platform.runLater(() -> { - orderBookListeners.stream().forEach(orderBookListener -> { + offerBookListeners.stream().forEach(orderBookListener -> { try { Object offerDataObject = offerData.object(); if (offerDataObject instanceof Offer) { @@ -287,7 +287,7 @@ public class MessageFacade implements MessageBroker { } } - Platform.runLater(() -> orderBookListeners.stream().forEach(listener -> + Platform.runLater(() -> offerBookListeners.stream().forEach(listener -> listener.onOffersReceived(offers))); } @@ -298,7 +298,7 @@ public class MessageFacade implements MessageBroker { final Map dataMap = futureGet.dataMap(); if (dataMap == null || dataMap.size() == 0) { log.trace("Get offers from DHT delivered empty dataMap."); - Platform.runLater(() -> orderBookListeners.stream().forEach(listener -> + Platform.runLater(() -> offerBookListeners.stream().forEach(listener -> listener.onOffersReceived(new ArrayList<>()))); } else { @@ -447,12 +447,12 @@ public class MessageFacade implements MessageBroker { // Event Listeners /////////////////////////////////////////////////////////////////////////////////////////// - public void addOrderBookListener(OrderBookListener listener) { - orderBookListeners.add(listener); + public void addOrderBookListener(OfferBookListener listener) { + offerBookListeners.add(listener); } - public void removeOrderBookListener(OrderBookListener listener) { - orderBookListeners.remove(listener); + public void removeOrderBookListener(OfferBookListener listener) { + offerBookListeners.remove(listener); } public void addArbitratorListener(ArbitratorListener listener) { diff --git a/src/main/java/io/bitsquare/msg/listeners/OrderBookListener.java b/src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java similarity index 96% rename from src/main/java/io/bitsquare/msg/listeners/OrderBookListener.java rename to src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java index 2a28534fb5..1b6054fda1 100644 --- a/src/main/java/io/bitsquare/msg/listeners/OrderBookListener.java +++ b/src/main/java/io/bitsquare/msg/listeners/OfferBookListener.java @@ -21,7 +21,7 @@ import io.bitsquare.trade.Offer; import java.util.List; -public interface OrderBookListener { +public interface OfferBookListener { void onOfferAdded(Offer offer); void onOffersReceived(List offers); diff --git a/src/main/resources/images/nav/orders.png b/src/main/resources/images/nav/portfolio.png similarity index 100% rename from src/main/resources/images/nav/orders.png rename to src/main/resources/images/nav/portfolio.png diff --git a/src/main/resources/images/nav/orders@2x.png b/src/main/resources/images/nav/portfolio@2x.png similarity index 100% rename from src/main/resources/images/nav/orders@2x.png rename to src/main/resources/images/nav/portfolio@2x.png diff --git a/src/main/resources/images/nav/orders_active.png b/src/main/resources/images/nav/portfolio_active.png similarity index 100% rename from src/main/resources/images/nav/orders_active.png rename to src/main/resources/images/nav/portfolio_active.png diff --git a/src/main/resources/images/nav/orders_active@2x.png b/src/main/resources/images/nav/portfolio_active@2x.png similarity index 100% rename from src/main/resources/images/nav/orders_active@2x.png rename to src/main/resources/images/nav/portfolio_active@2x.png diff --git a/src/test/java/io/bitsquare/gui/main/orders/pending/PendingTradesUIRunner.java b/src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java similarity index 95% rename from src/test/java/io/bitsquare/gui/main/orders/pending/PendingTradesUIRunner.java rename to src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java index c18a5ae7d6..d31fba7612 100644 --- a/src/test/java/io/bitsquare/gui/main/orders/pending/PendingTradesUIRunner.java +++ b/src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending; +package io.bitsquare.gui.main.portfolio.pending; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.ViewLoader; @@ -68,7 +68,7 @@ public class PendingTradesUIRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); ViewLoader loader = new ViewLoader( - getUrl("/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml"), false); + getUrl("/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml"), false); try { view = loader.load(); diff --git a/src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesControllerUIMock.java b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesControllerUIMock.java similarity index 98% rename from src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesControllerUIMock.java rename to src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesControllerUIMock.java index bf568cd604..ba8ae977b8 100644 --- a/src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesControllerUIMock.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending.uimock; +package io.bitsquare.gui.main.portfolio.pending.uimock; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.components.processbar.ProcessStepBar; diff --git a/src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java similarity index 94% rename from src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesUIMockRunner.java rename to src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java index fb14129401..5333ac4a2d 100644 --- a/src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.orders.pending.uimock; +package io.bitsquare.gui.main.portfolio.pending.uimock; import io.bitsquare.di.BitSquareModule; import io.bitsquare.util.ViewLoader; @@ -68,7 +68,7 @@ public class PendingTradesUIMockRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); ViewLoader loader = new ViewLoader( - getUrl("/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesViewUIMock.fxml"), false); + getUrl("/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesViewUIMock.fxml"), false); try { view = loader.load(); diff --git a/src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesViewUIMock.fxml b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesViewUIMock.fxml similarity index 97% rename from src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesViewUIMock.fxml rename to src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesViewUIMock.fxml index fef0ea7e54..8a89a77ac5 100644 --- a/src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesViewUIMock.fxml @@ -24,7 +24,7 @@ - diff --git a/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java b/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java index 8c4db35cfa..a90c7c96c0 100644 --- a/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java +++ b/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java @@ -19,13 +19,13 @@ package io.bitsquare.msg.dhttest; import io.bitsquare.BitSquare; import io.bitsquare.bank.BankAccountType; -import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem; +import io.bitsquare.gui.main.trade.offerbook.OfferBookListItem; import io.bitsquare.locale.CountryUtil; import io.bitsquare.msg.BootstrappedPeerFactory; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.AddOfferListener; import io.bitsquare.msg.listeners.BootstrapListener; -import io.bitsquare.msg.listeners.OrderBookListener; +import io.bitsquare.msg.listeners.OfferBookListener; import io.bitsquare.trade.Direction; import io.bitsquare.trade.Offer; import io.bitsquare.user.User; @@ -58,12 +58,12 @@ public class DHTTestController implements Initializable { private final MessageFacade messageFacade; private BootstrappedPeerFactory bootstrappedPeerFactory; private User user; - private final ObservableList orderBookListItems = FXCollections.observableArrayList(); + private final ObservableList offerBookListItems = FXCollections.observableArrayList(); @FXML TableView table; @FXML TextArea stateLabel; @FXML TextField toSaveTextField; - @FXML TableColumn idColumn; + @FXML TableColumn idColumn; @Inject private DHTTestController(MessageFacade messageFacade, User user, @@ -89,7 +89,7 @@ public class DHTTestController implements Initializable { } }); - messageFacade.addOrderBookListener(new OrderBookListener() { + messageFacade.addOrderBookListener(new OfferBookListener() { @Override public void onOfferAdded(Offer offer) { log.debug("offer added " + offer.getId()); @@ -98,22 +98,22 @@ public class DHTTestController implements Initializable { @Override public void onOffersReceived(List offers) { //TODO use deltas instead replacing the whole list - orderBookListItems.clear(); + offerBookListItems.clear(); offers.stream().forEach(offer -> { if (offer != null) { - orderBookListItems.add(new OrderBookListItem(offer, CountryUtil.getDefaultCountry())); + offerBookListItems.add(new OfferBookListItem(offer, CountryUtil.getDefaultCountry())); } }); } @Override public void onOfferRemoved(Offer offer) { - orderBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId())); + offerBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId())); } }); setIDColumnCellFactory(); - table.setItems(orderBookListItems); + table.setItems(offerBookListItems); bootstrappedPeerFactory.connectionState.addListener((ov, oldValue, newValue) -> { stateLabel.setText(newValue); @@ -162,14 +162,14 @@ public class DHTTestController implements Initializable { private void setIDColumnCellFactory() { idColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); idColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call( - TableColumn column) { - return new TableCell() { + public TableCell call( + TableColumn column) { + return new TableCell() { @Override - public void updateItem(final OrderBookListItem item, boolean empty) { + public void updateItem(final OfferBookListItem item, boolean empty) { super.updateItem(item, empty); if (item != null && item.getOffer() != null && item.getOffer().getAmount() != null) setText(item.getOffer().getId());