From 842a11252aa168c5d7f8b54e6b12716d51b61eb9 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 5 Apr 2015 02:51:33 +0200 Subject: [PATCH] Rename view packages --- .../java/io/bitsquare/gui/Navigation.java | 4 +- .../src/main/java/io/bitsquare/gui/images.css | 20 ++-- .../java/io/bitsquare/gui/main/MainView.java | 8 +- .../account/setup/AccountSetupWizard.java | 4 +- .../BuyView.fxml => offer/BuyOfferView.fxml} | 2 +- .../SellView.java => offer/BuyOfferView.java} | 6 +- .../TradeView.java => offer/OfferView.java} | 28 +++--- .../SellOfferView.fxml} | 2 +- .../BuyView.java => offer/SellOfferView.java} | 6 +- .../createoffer/CreateOfferDataModel.java | 2 +- .../createoffer/CreateOfferView.fxml | 2 +- .../createoffer/CreateOfferView.java | 14 +-- .../createoffer/CreateOfferViewModel.java | 2 +- .../offerbook/OfferBookDataModel.java | 2 +- .../offerbook/OfferBookListItem.java | 2 +- .../offerbook/OfferBookView.fxml | 2 +- .../offerbook/OfferBookView.java | 8 +- .../offerbook/OfferBookViewModel.java | 2 +- .../takeoffer/TakeOfferDataModel.java | 2 +- .../takeoffer/TakeOfferView.fxml | 2 +- .../takeoffer/TakeOfferView.java | 10 +- .../takeoffer/TakeOfferViewModel.java | 2 +- .../gui/main/portfolio/PortfolioView.java | 10 +- .../ClosedTradesDataModel.java | 2 +- .../ClosedTradesListItem.java | 2 +- .../ClosedTradesView.fxml | 2 +- .../ClosedTradesView.java | 2 +- .../ClosedTradesViewModel.java | 2 +- .../OpenOfferListItem.java} | 6 +- .../OpenOffersDataModel.java} | 14 +-- .../OpenOffersView.fxml} | 2 +- .../OpenOffersView.java} | 92 +++++++++--------- .../OpenOffersViewModel.java} | 22 ++--- .../BuyerSubView.java | 12 +-- .../PendingTradesDataModel.java | 4 +- .../PendingTradesListItem.java | 2 +- .../PendingTradesView.fxml | 2 +- .../PendingTradesView.java | 2 +- .../PendingTradesViewModel.java | 2 +- .../SellerSubView.java | 10 +- .../TradeSubView.java | 6 +- .../steps/CompletedView.java | 4 +- .../steps/ConfirmFiatReceivedView.java | 4 +- .../steps/StartFiatView.java | 4 +- .../steps/TradeStepDetailsView.java | 4 +- .../steps/TradeWizardItem.java | 2 +- .../steps/WaitFiatReceivedView.java | 4 +- .../steps/WaitTxInBlockchainView.java | 4 +- .../java/io/bitsquare/offer/OfferBook.java | 2 +- .../images/nav/{buy.png => buyoffer.png} | Bin .../nav/{buy@2x.png => buyoffer@2x.png} | Bin .../{buy_active.png => buyoffer_active.png} | Bin ...y_active@2x.png => buyoffer_active@2x.png} | Bin .../images/nav/{sell.png => selloffer.png} | Bin .../nav/{sell@2x.png => selloffer@2x.png} | Bin .../{sell_active.png => selloffer_active.png} | Bin ..._active@2x.png => selloffer_active@2x.png} | Bin .../createoffer/CreateOfferViewModelTest.java | 2 +- 58 files changed, 179 insertions(+), 179 deletions(-) rename core/src/main/java/io/bitsquare/gui/main/{trade/BuyView.fxml => offer/BuyOfferView.fxml} (92%) rename core/src/main/java/io/bitsquare/gui/main/{trade/SellView.java => offer/BuyOfferView.java} (85%) rename core/src/main/java/io/bitsquare/gui/main/{trade/TradeView.java => offer/OfferView.java} (89%) rename core/src/main/java/io/bitsquare/gui/main/{trade/SellView.fxml => offer/SellOfferView.fxml} (92%) rename core/src/main/java/io/bitsquare/gui/main/{trade/BuyView.java => offer/SellOfferView.java} (85%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/createoffer/CreateOfferDataModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/createoffer/CreateOfferView.fxml (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/createoffer/CreateOfferView.java (98%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/createoffer/CreateOfferViewModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/offerbook/OfferBookDataModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/offerbook/OfferBookListItem.java (97%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/offerbook/OfferBookView.fxml (98%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/offerbook/OfferBookView.java (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/offerbook/OfferBookViewModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/takeoffer/TakeOfferDataModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/takeoffer/TakeOfferView.fxml (99%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/takeoffer/TakeOfferView.java (98%) rename core/src/main/java/io/bitsquare/gui/main/{trade => offer}/takeoffer/TakeOfferViewModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{closed => closedtrades}/ClosedTradesDataModel.java (97%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{closed => closedtrades}/ClosedTradesListItem.java (96%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{closed => closedtrades}/ClosedTradesView.fxml (98%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{closed => closedtrades}/ClosedTradesView.java (99%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{closed => closedtrades}/ClosedTradesViewModel.java (98%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{offer/OfferListItem.java => openoffer/OpenOfferListItem.java} (89%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{offer/OffersDataModel.java => openoffer/OpenOffersDataModel.java} (84%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{offer/OffersView.fxml => openoffer/OpenOffersView.fxml} (98%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{offer/OffersView.java => openoffer/OpenOffersView.java} (67%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{offer/OffersViewModel.java => openoffer/OpenOffersViewModel.java} (75%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/BuyerSubView.java (93%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/PendingTradesDataModel.java (98%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/PendingTradesListItem.java (97%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/PendingTradesView.fxml (98%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/PendingTradesView.java (99%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/PendingTradesViewModel.java (99%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/SellerSubView.java (95%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/TradeSubView.java (94%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/CompletedView.java (97%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/ConfirmFiatReceivedView.java (97%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/StartFiatView.java (97%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/TradeStepDetailsView.java (95%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/TradeWizardItem.java (97%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/WaitFiatReceivedView.java (96%) rename core/src/main/java/io/bitsquare/gui/main/portfolio/{pending => pendingtrades}/steps/WaitTxInBlockchainView.java (96%) rename core/src/main/resources/images/nav/{buy.png => buyoffer.png} (100%) rename core/src/main/resources/images/nav/{buy@2x.png => buyoffer@2x.png} (100%) rename core/src/main/resources/images/nav/{buy_active.png => buyoffer_active.png} (100%) rename core/src/main/resources/images/nav/{buy_active@2x.png => buyoffer_active@2x.png} (100%) rename core/src/main/resources/images/nav/{sell.png => selloffer.png} (100%) rename core/src/main/resources/images/nav/{sell@2x.png => selloffer@2x.png} (100%) rename core/src/main/resources/images/nav/{sell_active.png => selloffer_active.png} (100%) rename core/src/main/resources/images/nav/{sell_active@2x.png => selloffer_active@2x.png} (100%) rename core/src/test/java/io/bitsquare/gui/main/{trade => offer}/createoffer/CreateOfferViewModelTest.java (98%) diff --git a/core/src/main/java/io/bitsquare/gui/Navigation.java b/core/src/main/java/io/bitsquare/gui/Navigation.java index 8a527acdcf..9c9a60e903 100644 --- a/core/src/main/java/io/bitsquare/gui/Navigation.java +++ b/core/src/main/java/io/bitsquare/gui/Navigation.java @@ -20,7 +20,7 @@ package io.bitsquare.gui; import io.bitsquare.common.viewfx.view.View; import io.bitsquare.common.viewfx.view.ViewPath; import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.trade.BuyView; +import io.bitsquare.gui.main.offer.BuyOfferView; import io.bitsquare.storage.Storage; import com.google.inject.Inject; @@ -39,7 +39,7 @@ public class Navigation implements Serializable { private static final long serialVersionUID = 1L; transient private static final Logger log = LoggerFactory.getLogger(Navigation.class); - transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, BuyView.class); + transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, BuyOfferView.class); public interface Listener { diff --git a/core/src/main/java/io/bitsquare/gui/images.css b/core/src/main/java/io/bitsquare/gui/images.css index 1933fb02c4..106e45ab60 100644 --- a/core/src/main/java/io/bitsquare/gui/images.css +++ b/core/src/main/java/io/bitsquare/gui/images.css @@ -22,11 +22,11 @@ -fx-image: url("../../../images/remove.png"); } -#image-buy { +#image-buyoffer { -fx-image: url("../../../images/buy.png"); } -#image-sell { +#image-selloffer { -fx-image: url("../../../images/sell.png"); } @@ -55,20 +55,20 @@ -fx-image: url("../../../images/nav/home_active.png"); } -#image-nav-buy { - -fx-image: url("../../../images/nav/buy.png"); +#image-nav-buyoffer { + -fx-image: url("../../../images/nav/buyoffer.png"); } -#image-nav-buy-active { - -fx-image: url("../../../images/nav/buy_active.png"); +#image-nav-buyoffer-active { + -fx-image: url("../../../images/nav/buyoffer_active.png"); } -#image-nav-sell { - -fx-image: url("../../../images/nav/sell.png"); +#image-nav-selloffer { + -fx-image: url("../../../images/nav/selloffer.png"); } -#image-nav-sell-active { - -fx-image: url("../../../images/nav/sell_active.png"); +#image-nav-selloffer-active { + -fx-image: url("../../../images/nav/selloffer_active.png"); } #image-nav-portfolio { diff --git a/core/src/main/java/io/bitsquare/gui/main/MainView.java b/core/src/main/java/io/bitsquare/gui/main/MainView.java index 314ea313be..26b0dba84c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/core/src/main/java/io/bitsquare/gui/main/MainView.java @@ -32,10 +32,10 @@ import io.bitsquare.gui.main.account.AccountView; import io.bitsquare.gui.main.funds.FundsView; import io.bitsquare.gui.main.home.HomeView; import io.bitsquare.gui.main.msg.MsgView; +import io.bitsquare.gui.main.offer.BuyOfferView; +import io.bitsquare.gui.main.offer.SellOfferView; import io.bitsquare.gui.main.portfolio.PortfolioView; import io.bitsquare.gui.main.settings.SettingsView; -import io.bitsquare.gui.main.trade.BuyView; -import io.bitsquare.gui.main.trade.SellView; import io.bitsquare.gui.util.Transitions; import javax.inject.Inject; @@ -83,8 +83,8 @@ public class MainView extends InitializableView { ToggleButton homeButton = new NavButton(HomeView.class, "Overview") {{ setDisable(true); // alpha }}; - ToggleButton buyButton = new NavButton(BuyView.class, "Buy BTC"); - ToggleButton sellButton = new NavButton(SellView.class, "Sell BTC"); + ToggleButton buyButton = new NavButton(BuyOfferView.class, "Buy BTC"); + ToggleButton sellButton = new NavButton(SellOfferView.class, "Sell BTC"); ToggleButton portfolioButton = new NavButton(PortfolioView.class, "Portfolio"); ToggleButton fundsButton = new NavButton(FundsView.class, "Funds"); ToggleButton msgButton = new NavButton(MsgView.class, "Messages") {{ diff --git a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java index 48c873b864..b211512380 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java +++ b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java @@ -30,7 +30,7 @@ import io.bitsquare.gui.main.account.content.password.PasswordView; import io.bitsquare.gui.main.account.content.registration.RegistrationView; import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView; import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView; -import io.bitsquare.gui.main.trade.BuyView; +import io.bitsquare.gui.main.offer.BuyOfferView; import javax.inject.Inject; @@ -142,7 +142,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard { if (navigation.getReturnPath() != null) navigation.navigateTo(navigation.getReturnPath()); else - navigation.navigateTo(MainView.class, BuyView.class); + navigation.navigateTo(MainView.class, BuyOfferView.class); } } diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml b/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml similarity index 92% rename from core/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml rename to core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml index dfda5c151a..c60dc180ec 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml @@ -19,7 +19,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java b/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java similarity index 85% rename from core/src/main/java/io/bitsquare/gui/main/trade/SellView.java rename to core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java index 2fcf35b2bb..762c88d2e0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade; +package io.bitsquare.gui.main.offer; import io.bitsquare.common.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.ViewLoader; @@ -24,10 +24,10 @@ import io.bitsquare.gui.Navigation; import javax.inject.Inject; @FxmlView -public class SellView extends TradeView { +public class BuyOfferView extends OfferView { @Inject - public SellView(ViewLoader viewLoader, Navigation navigation) { + public BuyOfferView(ViewLoader viewLoader, Navigation navigation) { super(viewLoader, navigation); } } diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java similarity index 89% rename from core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java rename to core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java index f2831d5f05..3a1e89b449 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade; +package io.bitsquare.gui.main.offer; import io.bitsquare.common.viewfx.view.ActivatableView; import io.bitsquare.common.viewfx.view.View; @@ -23,9 +23,9 @@ import io.bitsquare.common.viewfx.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.trade.createoffer.CreateOfferView; -import io.bitsquare.gui.main.trade.offerbook.OfferBookView; -import io.bitsquare.gui.main.trade.takeoffer.TakeOfferView; +import io.bitsquare.gui.main.offer.createoffer.CreateOfferView; +import io.bitsquare.gui.main.offer.offerbook.OfferBookView; +import io.bitsquare.gui.main.offer.takeoffer.TakeOfferView; import io.bitsquare.offer.Offer; import org.bitcoinj.core.Coin; @@ -38,7 +38,7 @@ import javafx.collections.ListChangeListener; import javafx.scene.control.*; import javafx.scene.layout.*; -public abstract class TradeView extends ActivatableView { +public abstract class OfferView extends ActivatableView { private OfferBookView offerBookView; private CreateOfferView createOfferView; @@ -54,10 +54,10 @@ public abstract class TradeView extends ActivatableView { private final Navigation navigation; private final Offer.Direction direction; - protected TradeView(ViewLoader viewLoader, Navigation navigation) { + protected OfferView(ViewLoader viewLoader, Navigation navigation) { this.viewLoader = viewLoader; this.navigation = navigation; - this.direction = (this instanceof BuyView) ? Offer.Direction.BUY : Offer.Direction.SELL; + this.direction = (this instanceof BuyOfferView) ? Offer.Direction.BUY : Offer.Direction.SELL; } @Override @@ -127,18 +127,18 @@ public abstract class TradeView extends ActivatableView { OfferActionHandler offerActionHandler = new OfferActionHandler() { @Override public void createOffer(Coin amount, Fiat price) { - TradeView.this.amount = amount; - TradeView.this.price = price; - TradeView.this.navigation.navigateTo(MainView.class, TradeView.this.getClass(), + OfferView.this.amount = amount; + OfferView.this.price = price; + OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(), CreateOfferView.class); } @Override public void takeOffer(Coin amount, Fiat price, Offer offer) { - TradeView.this.amount = amount; - TradeView.this.price = price; - TradeView.this.offer = offer; - TradeView.this.navigation.navigateTo(MainView.class, TradeView.this.getClass(), + OfferView.this.amount = amount; + OfferView.this.price = price; + OfferView.this.offer = offer; + OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(), TakeOfferView.class); } }; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml b/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml similarity index 92% rename from core/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml rename to core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml index 74e3a7078a..229c98fff6 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml @@ -19,7 +19,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java b/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java similarity index 85% rename from core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java rename to core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java index 27eb987604..4cb4ce3c4f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade; +package io.bitsquare.gui.main.offer; import io.bitsquare.common.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.ViewLoader; @@ -24,10 +24,10 @@ import io.bitsquare.gui.Navigation; import javax.inject.Inject; @FxmlView -public class BuyView extends TradeView { +public class SellOfferView extends OfferView { @Inject - public BuyView(ViewLoader viewLoader, Navigation navigation) { + public SellOfferView(ViewLoader viewLoader, Navigation navigation) { super(viewLoader, navigation); } } diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java rename to core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java index aed55f32a8..4c115875a4 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.createoffer; +package io.bitsquare.gui.main.offer.createoffer; import io.bitsquare.arbitration.Arbitrator; import io.bitsquare.arbitration.ArbitratorService; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml b/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml rename to core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml index 6e3c2e49ba..60e67b1aa8 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml @@ -27,7 +27,7 @@ - . */ -package io.bitsquare.gui.main.trade.createoffer; +package io.bitsquare.gui.main.offer.createoffer; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.FxmlView; @@ -33,9 +33,9 @@ import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView; import io.bitsquare.gui.main.account.settings.AccountSettingsView; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; +import io.bitsquare.gui.main.offer.OfferView; import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.offer.OffersView; -import io.bitsquare.gui.main.trade.TradeView; +import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.BSResources; import io.bitsquare.offer.Offer; @@ -102,7 +102,7 @@ public class CreateOfferView extends ActivatableViewAndModel. */ -package io.bitsquare.gui.main.trade.createoffer; +package io.bitsquare.gui.main.offer.createoffer; import io.bitsquare.btc.WalletService; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java rename to core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java index 706f368dd0..7d92dd0a2b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.offerbook; +package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java rename to core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java index 40b9119509..f0babadb3f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.offerbook; +package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.locale.Country; import io.bitsquare.offer.Offer; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml rename to core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml index 7727a36f6a..74132793e9 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml @@ -24,7 +24,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java rename to core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java index 4307f2b6c0..7fee4c49f4 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.offerbook; +package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.FxmlView; @@ -30,7 +30,7 @@ import io.bitsquare.gui.main.account.settings.AccountSettingsView; import io.bitsquare.gui.main.account.setup.AccountSetupWizard; import io.bitsquare.gui.main.funds.FundsView; import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; -import io.bitsquare.gui.main.trade.TradeView; +import io.bitsquare.gui.main.offer.OfferView; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.validation.OptionalBtcValidator; import io.bitsquare.gui.util.validation.OptionalFiatValidator; @@ -82,7 +82,7 @@ public class OfferBookView extends ActivatableViewAndModel. */ -package io.bitsquare.gui.main.trade.offerbook; +package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java rename to core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java index 56178a5f76..9ffc9b312a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.takeoffer; +package io.bitsquare.gui.main.offer.takeoffer; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml b/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml rename to core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml index f31d229e67..168c381091 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml @@ -27,7 +27,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java rename to core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java index 4c96baabc3..262ac1551e 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java +++ b/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.takeoffer; +package io.bitsquare.gui.main.offer.takeoffer; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; @@ -31,9 +31,9 @@ import io.bitsquare.gui.components.TitledGroupBg; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; +import io.bitsquare.gui.main.offer.OfferView; import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesView; -import io.bitsquare.gui.main.trade.TradeView; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.BSResources; import io.bitsquare.offer.Offer; @@ -96,7 +96,7 @@ public class TakeOfferView extends ActivatableViewAndModel errorMessageChangeListener; @@ -152,7 +152,7 @@ public class TakeOfferView extends ActivatableViewAndModel. */ -package io.bitsquare.gui.main.trade.takeoffer; +package io.bitsquare.gui.main.offer.takeoffer; import io.bitsquare.btc.WalletService; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index 7a50b9b38e..b6601d21e3 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -25,9 +25,9 @@ import io.bitsquare.common.viewfx.view.View; import io.bitsquare.common.viewfx.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView; -import io.bitsquare.gui.main.portfolio.offer.OffersView; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesView; +import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView; +import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView; import io.bitsquare.trade.TradeManager; import javax.inject.Inject; @@ -63,7 +63,7 @@ public class PortfolioView extends ActivatableViewAndModel tabChangeListener = (ov, oldValue, newValue) -> { if (newValue == offersTab) - navigation.navigateTo(MainView.class, PortfolioView.class, OffersView.class); + navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class); else if (newValue == openTradesTab) navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class); else if (newValue == closedTradesTab) @@ -96,7 +96,7 @@ public class PortfolioView extends ActivatableViewAndModel View view = viewLoader.load(viewClass); - if (view instanceof OffersView) currentTab = offersTab; + if (view instanceof OpenOffersView) currentTab = offersTab; else if (view instanceof PendingTradesView) currentTab = openTradesTab; else if (view instanceof ClosedTradesView) currentTab = closedTradesTab; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java index 219f04f890..8d986727f8 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.closed; +package io.bitsquare.gui.main.portfolio.closedtrades; import io.bitsquare.common.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.DataModel; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java index 3ec30ce369..0acfcb67f3 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.closed; +package io.bitsquare.gui.main.portfolio.closedtrades; import io.bitsquare.trade.Trade; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml index 452f75ed5d..a5707b2846 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml @@ -21,7 +21,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java index dd4cf4830b..33a086ec76 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.closed; +package io.bitsquare.gui.main.portfolio.closedtrades; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.FxmlView; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java index d6a908cac6..778ebc5b9a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.closed; +package io.bitsquare.gui.main.portfolio.closedtrades; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ViewModel; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java similarity index 89% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java index 85b7ed5a18..2bdad1700b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.offer; +package io.bitsquare.gui.main.portfolio.openoffer; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; @@ -23,11 +23,11 @@ import io.bitsquare.trade.Trade; /** * We could remove that wrapper if it is not needed for additional UI only fields. */ -class OfferListItem { +class OpenOfferListItem { private final Offer offer; - public OfferListItem(Trade trade) { + public OpenOfferListItem(Trade trade) { this.offer = trade.getOffer(); } diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java similarity index 84% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java index 2a0fd06e1d..1014af3111 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.offer; +package io.bitsquare.gui.main.portfolio.openoffer; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; @@ -37,17 +37,17 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class OffersDataModel implements Activatable, DataModel { - private static final Logger log = LoggerFactory.getLogger(OffersDataModel.class); +class OpenOffersDataModel implements Activatable, DataModel { + private static final Logger log = LoggerFactory.getLogger(OpenOffersDataModel.class); private final TradeManager tradeManager; private final User user; - private final ObservableList list = FXCollections.observableArrayList(); + private final ObservableList list = FXCollections.observableArrayList(); private final ListChangeListener tradesListChangeListener; @Inject - public OffersDataModel(TradeManager tradeManager, User user) { + public OpenOffersDataModel(TradeManager tradeManager, User user) { this.tradeManager = tradeManager; this.user = user; @@ -70,7 +70,7 @@ class OffersDataModel implements Activatable, DataModel { } - public ObservableList getList() { + public ObservableList getList() { return list; } @@ -82,7 +82,7 @@ class OffersDataModel implements Activatable, DataModel { private void applyList() { list.clear(); - list.addAll(tradeManager.getOpenOfferTrades().stream().map(OfferListItem::new).collect(Collectors.toList())); + list.addAll(tradeManager.getOpenOfferTrades().stream().map(OpenOfferListItem::new).collect(Collectors.toList())); // we sort by date, earliest first list.sort((o1, o2) -> o2.getOffer().getCreationDate().compareTo(o1.getOffer().getCreationDate())); diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml rename to core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml index aeb8b60a95..5f4366ee50 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml @@ -21,7 +21,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java similarity index 67% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java index ff9572a615..39bbce23e9 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.offer; +package io.bitsquare.gui.main.portfolio.openoffer; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.FxmlView; @@ -37,15 +37,15 @@ import javafx.scene.layout.*; import javafx.util.Callback; @FxmlView -public class OffersView extends ActivatableViewAndModel { +public class OpenOffersView extends ActivatableViewAndModel { - @FXML TableView table; - @FXML TableColumn priceColumn, amountColumn, volumeColumn, + @FXML TableView table; + @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, dateColumn, offerIdColumn, removeItemColumn; private Navigation navigation; @Inject - public OffersView(OffersViewModel model, Navigation navigation) { + public OpenOffersView(OpenOffersViewModel model, Navigation navigation) { super(model); this.navigation = navigation; } @@ -83,7 +83,7 @@ public class OffersView extends ActivatableViewAndModel new ReadOnlyObjectWrapper<>(offerListItem.getValue())); offerIdColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call(TableColumn column) { - return new TableCell() { + public TableCell call(TableColumn column) { + return new TableCell() { private Hyperlink hyperlink; @Override - public void updateItem(final OfferListItem item, boolean empty) { + public void updateItem(final OpenOfferListItem item, boolean empty) { super.updateItem(item, empty); if (item != null && !empty) { @@ -128,14 +128,14 @@ public class OffersView extends ActivatableViewAndModel new ReadOnlyObjectWrapper<>(offer.getValue())); dateColumn.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 OfferListItem item, boolean empty) { + public void updateItem(final OpenOfferListItem item, boolean empty) { super.updateItem(item, empty); if (item != null) setText(model.getDate(item)); @@ -150,14 +150,14 @@ public class OffersView extends ActivatableViewAndModel 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 OfferListItem item, boolean empty) { + public void updateItem(final OpenOfferListItem item, boolean empty) { super.updateItem(item, empty); setText(model.getAmount(item)); } @@ -169,14 +169,14 @@ public class OffersView extends ActivatableViewAndModel 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 OfferListItem item, boolean empty) { + public void updateItem(final OpenOfferListItem item, boolean empty) { super.updateItem(item, empty); setText(model.getPrice(item)); } @@ -188,14 +188,14 @@ public class OffersView extends ActivatableViewAndModel 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 OfferListItem item, boolean empty) { + public void updateItem(final OpenOfferListItem item, boolean empty) { super.updateItem(item, empty); if (item != null) setText(model.getVolume(item)); @@ -210,14 +210,14 @@ public class OffersView extends ActivatableViewAndModel 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() { @Override - public void updateItem(final OfferListItem item, boolean empty) { + public void updateItem(final OpenOfferListItem item, boolean empty) { super.updateItem(item, empty); setText(model.getDirectionLabel(item)); } @@ -229,11 +229,11 @@ public class OffersView extends ActivatableViewAndModel new ReadOnlyObjectWrapper<>(offerListItem.getValue())); removeItemColumn.setCellFactory( - new Callback, TableCell>() { + new Callback, TableCell>() { @Override - public TableCell call(TableColumn directionColumn) { - return new TableCell() { + public TableCell call(TableColumn directionColumn) { + return new TableCell() { final ImageView iconView = new ImageView(); final Button button = new Button(); @@ -245,7 +245,7 @@ public class OffersView extends ActivatableViewAndModel. */ -package io.bitsquare.gui.main.portfolio.offer; +package io.bitsquare.gui.main.portfolio.openoffer; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; @@ -31,14 +31,14 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class OffersViewModel extends ActivatableWithDataModel implements ViewModel { - private static final Logger log = LoggerFactory.getLogger(OffersViewModel.class); +class OpenOffersViewModel extends ActivatableWithDataModel implements ViewModel { + private static final Logger log = LoggerFactory.getLogger(OpenOffersViewModel.class); private final BSFormatter formatter; @Inject - public OffersViewModel(OffersDataModel dataModel, BSFormatter formatter) { + public OpenOffersViewModel(OpenOffersDataModel dataModel, BSFormatter formatter) { super(dataModel); this.formatter = formatter; @@ -49,31 +49,31 @@ class OffersViewModel extends ActivatableWithDataModel implemen dataModel.onCancelOpenOffer(offer, resultHandler, errorMessageHandler); } - public ObservableList getList() { + public ObservableList getList() { return dataModel.getList(); } - String getTradeId(OfferListItem item) { + String getTradeId(OpenOfferListItem item) { return item.getOffer().getId(); } - String getAmount(OfferListItem item) { + String getAmount(OpenOfferListItem item) { return (item != null) ? formatter.formatAmountWithMinAmount(item.getOffer()) : ""; } - String getPrice(OfferListItem item) { + String getPrice(OpenOfferListItem item) { return (item != null) ? formatter.formatFiat(item.getOffer().getPrice()) : ""; } - String getVolume(OfferListItem item) { + String getVolume(OpenOfferListItem item) { return (item != null) ? formatter.formatVolumeWithMinVolume(item.getOffer()) : ""; } - String getDirectionLabel(OfferListItem item) { + String getDirectionLabel(OpenOfferListItem item) { return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getOffer())) : ""; } - String getDate(OfferListItem item) { + String getDate(OpenOfferListItem item) { return formatter.formatDateTime(item.getOffer().getCreationDate()); } diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/BuyerSubView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java similarity index 93% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/BuyerSubView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java index 13259dd425..52cfe31cf7 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/BuyerSubView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java @@ -15,14 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.main.portfolio.pending.steps.CompletedView; -import io.bitsquare.gui.main.portfolio.pending.steps.StartFiatView; -import io.bitsquare.gui.main.portfolio.pending.steps.TradeWizardItem; -import io.bitsquare.gui.main.portfolio.pending.steps.WaitFiatReceivedView; -import io.bitsquare.gui.main.portfolio.pending.steps.WaitTxInBlockchainView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.CompletedView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.StartFiatView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitFiatReceivedView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitTxInBlockchainView; import io.bitsquare.locale.BSResources; import org.slf4j.Logger; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java index 3e5d3c997e..9765aa4acd 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletService; @@ -25,7 +25,7 @@ import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView; +import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView; import io.bitsquare.offer.Offer; import io.bitsquare.trade.BuyerTrade; import io.bitsquare.trade.Contract; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java index 870992fdb0..cd5317445c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.trade.Trade; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml index 50a2d485eb..3343f9f67b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml @@ -22,7 +22,7 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java index 5dc5e24c4c..d5c8eb3fa5 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.FxmlView; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java index 26096b3760..e74f20e117 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.btc.WalletService; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/SellerSubView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java similarity index 95% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/SellerSubView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java index 00067b8c80..33119c9634 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/SellerSubView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.main.portfolio.pending.steps.CompletedView; -import io.bitsquare.gui.main.portfolio.pending.steps.ConfirmFiatReceivedView; -import io.bitsquare.gui.main.portfolio.pending.steps.TradeWizardItem; -import io.bitsquare.gui.main.portfolio.pending.steps.WaitTxInBlockchainView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.CompletedView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.ConfirmFiatReceivedView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitTxInBlockchainView; import io.bitsquare.locale.BSResources; import org.slf4j.Logger; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/TradeSubView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java similarity index 94% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/TradeSubView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java index b1e5b3540f..00f0bfd9dc 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/TradeSubView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java @@ -15,10 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending; +package io.bitsquare.gui.main.portfolio.pendingtrades; -import io.bitsquare.gui.main.portfolio.pending.steps.TradeStepDetailsView; -import io.bitsquare.gui.main.portfolio.pending.steps.TradeWizardItem; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepDetailsView; +import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; import io.bitsquare.gui.util.Layout; import javafx.beans.value.ChangeListener; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/CompletedView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/CompletedView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java index 4bd82b5d88..5bceb52e6f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/CompletedView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import io.bitsquare.gui.util.Layout; import javafx.application.Platform; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/ConfirmFiatReceivedView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/ConfirmFiatReceivedView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java index a3c744553a..a71216f512 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/ConfirmFiatReceivedView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.TxIdTextField; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import io.bitsquare.gui.util.Layout; import javafx.beans.value.ChangeListener; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/StartFiatView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/StartFiatView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java index abfa4e0989..d74c6a57b2 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/StartFiatView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java @@ -15,12 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.TextFieldWithCopyIcon; import io.bitsquare.gui.components.TxIdTextField; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import io.bitsquare.gui.util.Layout; import io.bitsquare.locale.BSResources; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/TradeStepDetailsView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java similarity index 95% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/TradeStepDetailsView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java index 4fe8fdcafe..9a8d489d0f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/TradeStepDetailsView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import javafx.event.ActionEvent; import javafx.scene.layout.*; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/TradeWizardItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/TradeWizardItem.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java index 83563cb6db..1fdeb63de4 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/TradeWizardItem.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.util.Colors; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/WaitFiatReceivedView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/WaitFiatReceivedView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java index f994b41162..253b73f5c8 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/WaitFiatReceivedView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.TxIdTextField; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import io.bitsquare.gui.util.Layout; import javafx.beans.value.ChangeListener; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/WaitTxInBlockchainView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/WaitTxInBlockchainView.java rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java index e2197404e7..4d22cf29b6 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/steps/WaitTxInBlockchainView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.portfolio.pending.steps; +package io.bitsquare.gui.main.portfolio.pendingtrades.steps; import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.TxIdTextField; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel; +import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import io.bitsquare.gui.util.Layout; import javafx.beans.value.ChangeListener; diff --git a/core/src/main/java/io/bitsquare/offer/OfferBook.java b/core/src/main/java/io/bitsquare/offer/OfferBook.java index 95fece8291..265eddfa53 100644 --- a/core/src/main/java/io/bitsquare/offer/OfferBook.java +++ b/core/src/main/java/io/bitsquare/offer/OfferBook.java @@ -18,7 +18,7 @@ package io.bitsquare.offer; import io.bitsquare.fiat.FiatAccount; -import io.bitsquare.gui.main.trade.offerbook.OfferBookListItem; +import io.bitsquare.gui.main.offer.offerbook.OfferBookListItem; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.trade.TradeManager; diff --git a/core/src/main/resources/images/nav/buy.png b/core/src/main/resources/images/nav/buyoffer.png similarity index 100% rename from core/src/main/resources/images/nav/buy.png rename to core/src/main/resources/images/nav/buyoffer.png diff --git a/core/src/main/resources/images/nav/buy@2x.png b/core/src/main/resources/images/nav/buyoffer@2x.png similarity index 100% rename from core/src/main/resources/images/nav/buy@2x.png rename to core/src/main/resources/images/nav/buyoffer@2x.png diff --git a/core/src/main/resources/images/nav/buy_active.png b/core/src/main/resources/images/nav/buyoffer_active.png similarity index 100% rename from core/src/main/resources/images/nav/buy_active.png rename to core/src/main/resources/images/nav/buyoffer_active.png diff --git a/core/src/main/resources/images/nav/buy_active@2x.png b/core/src/main/resources/images/nav/buyoffer_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/buy_active@2x.png rename to core/src/main/resources/images/nav/buyoffer_active@2x.png diff --git a/core/src/main/resources/images/nav/sell.png b/core/src/main/resources/images/nav/selloffer.png similarity index 100% rename from core/src/main/resources/images/nav/sell.png rename to core/src/main/resources/images/nav/selloffer.png diff --git a/core/src/main/resources/images/nav/sell@2x.png b/core/src/main/resources/images/nav/selloffer@2x.png similarity index 100% rename from core/src/main/resources/images/nav/sell@2x.png rename to core/src/main/resources/images/nav/selloffer@2x.png diff --git a/core/src/main/resources/images/nav/sell_active.png b/core/src/main/resources/images/nav/selloffer_active.png similarity index 100% rename from core/src/main/resources/images/nav/sell_active.png rename to core/src/main/resources/images/nav/selloffer_active.png diff --git a/core/src/main/resources/images/nav/sell_active@2x.png b/core/src/main/resources/images/nav/selloffer_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/sell_active@2x.png rename to core/src/main/resources/images/nav/selloffer_active@2x.png diff --git a/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java b/core/src/test/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java similarity index 98% rename from core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java rename to core/src/test/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java index e99009a75e..04c248368d 100644 --- a/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java +++ b/core/src/test/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.trade.createoffer; +package io.bitsquare.gui.main.offer.createoffer; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.util.BSFormatter;