From 5915e670078256cade8dc71e5b9951b04f4988bf Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 28 Jul 2016 15:27:12 +0200 Subject: [PATCH] Renaming of markets package to market --- .../java/io/bitsquare/gui/Navigation.java | 2 +- .../java/io/bitsquare/gui/main/MainView.java | 2 +- .../main/{markets => market}/MarketView.fxml | 2 +- .../main/{markets => market}/MarketView.java | 8 ++--- .../market/offerbook/OfferBookChartView.fxml | 32 +++++++++++++++++++ .../offerbook/OfferBookChartView.java | 2 +- .../offerbook/OfferBookChartViewModel.java | 2 +- .../spread/SpreadItem.java | 2 +- .../spread/SpreadView.fxml | 2 +- .../spread/SpreadView.java | 2 +- .../spread/SpreadViewModel.java | 2 +- .../trades/TradesChartsView.fxml | 2 +- .../trades/TradesChartsView.java | 6 ++-- .../trades/TradesChartsViewModel.java | 4 +-- .../trades/charts/CandleData.java | 2 +- .../trades/charts/price/Candle.java | 4 +-- .../trades/charts/price/CandleStickChart.java | 4 +-- .../trades/charts/price/CandleTooltip.java | 4 +-- .../trades/charts/volume/VolumeBar.java | 2 +- .../trades/charts/volume/VolumeChart.java | 6 ++-- .../trades/TradesChartsViewModelTest.java | 4 +-- 21 files changed, 64 insertions(+), 32 deletions(-) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/MarketView.fxml (98%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/MarketView.java (94%) create mode 100644 gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/offerbook/OfferBookChartView.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/offerbook/OfferBookChartViewModel.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/spread/SpreadItem.java (95%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/spread/SpreadView.fxml (98%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/spread/SpreadView.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/spread/SpreadViewModel.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/TradesChartsView.fxml (92%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/TradesChartsView.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/TradesChartsViewModel.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/charts/CandleData.java (96%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/charts/price/Candle.java (97%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/charts/price/CandleStickChart.java (99%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/charts/price/CandleTooltip.java (96%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/charts/volume/VolumeBar.java (97%) rename gui/src/main/java/io/bitsquare/gui/main/{markets => market}/trades/charts/volume/VolumeChart.java (97%) rename gui/src/test/java/io/bitsquare/gui/main/{markets => market}/trades/TradesChartsViewModelTest.java (96%) diff --git a/gui/src/main/java/io/bitsquare/gui/Navigation.java b/gui/src/main/java/io/bitsquare/gui/Navigation.java index 8cbf95f801..a5bac398d9 100644 --- a/gui/src/main/java/io/bitsquare/gui/Navigation.java +++ b/gui/src/main/java/io/bitsquare/gui/Navigation.java @@ -23,7 +23,7 @@ import io.bitsquare.common.persistance.Persistable; import io.bitsquare.gui.common.view.View; import io.bitsquare.gui.common.view.ViewPath; import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.markets.MarketView; +import io.bitsquare.gui.main.market.MarketView; import io.bitsquare.storage.Storage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java index 3bb1695c2d..a24a30b178 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java @@ -31,7 +31,7 @@ import io.bitsquare.gui.components.BusyAnimation; import io.bitsquare.gui.main.account.AccountView; import io.bitsquare.gui.main.disputes.DisputesView; import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.markets.MarketView; +import io.bitsquare.gui.main.market.MarketView; import io.bitsquare.gui.main.offer.BuyOfferView; import io.bitsquare.gui.main.offer.SellOfferView; import io.bitsquare.gui.main.overlays.Overlay; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.fxml b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml index bc67988576..f9dce73097 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.java b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.java rename to gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java index 3ff82556f8..e31ecb0bf3 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java @@ -15,15 +15,15 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets; +package io.bitsquare.gui.main.market; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.common.model.Activatable; import io.bitsquare.gui.common.view.*; import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.markets.offerbook.OfferBookChartView; -import io.bitsquare.gui.main.markets.spread.SpreadView; -import io.bitsquare.gui.main.markets.trades.TradesChartsView; +import io.bitsquare.gui.main.market.offerbook.OfferBookChartView; +import io.bitsquare.gui.main.market.spread.SpreadView; +import io.bitsquare.gui.main.market.trades.TradesChartsView; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.Tab; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml new file mode 100644 index 0000000000..8e3ad701dc --- /dev/null +++ b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartView.java b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartView.java rename to gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java index 16c8293644..ae7fc115bb 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.offerbook; +package io.bitsquare.gui.main.market.offerbook; import io.bitsquare.common.UserThread; import io.bitsquare.common.util.Tuple3; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java index 0e2bd57aec..a86080dd5a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.offerbook; +package io.bitsquare.gui.main.market.offerbook; import com.google.common.math.LongMath; import com.google.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadItem.java b/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadItem.java rename to gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java index 6284a25158..8400262793 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadItem.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.markets.spread; +package io.bitsquare.gui.main.market.spread; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadView.fxml b/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml index 8717b0216c..dc0cd2e820 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.markets.spread; +package io.bitsquare.gui.main.market.spread; import io.bitsquare.gui.common.view.ActivatableViewAndModel; import io.bitsquare.gui.common.view.FxmlView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java index de2af5a450..a3fbf20db0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.spread; +package io.bitsquare.gui.main.market.spread; import com.google.inject.Inject; import io.bitsquare.gui.common.model.ActivatableViewModel; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml index 379a99420e..3f79a8b902 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.markets.trades; +package io.bitsquare.gui.main.market.trades; import io.bitsquare.common.UserThread; import io.bitsquare.gui.common.view.ActivatableViewAndModel; import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.markets.trades.charts.price.CandleStickChart; -import io.bitsquare.gui.main.markets.trades.charts.volume.VolumeChart; +import io.bitsquare.gui.main.market.trades.charts.price.CandleStickChart; +import io.bitsquare.gui.main.market.trades.charts.volume.VolumeChart; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.CryptoCurrency; import io.bitsquare.locale.FiatCurrency; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java index aa8ecc7859..cadb2fb81c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.trades; +package io.bitsquare.gui.main.market.trades; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; import io.bitsquare.btc.pricefeed.PriceFeedService; import io.bitsquare.gui.common.model.ActivatableViewModel; -import io.bitsquare.gui.main.markets.trades.charts.CandleData; +import io.bitsquare.gui.main.market.trades.charts.CandleData; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.locale.TradeCurrency; import io.bitsquare.trade.statistics.TradeStatistics; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java index 14f77bbf7a..d0558877a5 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.trades.charts; +package io.bitsquare.gui.main.market.trades.charts; public class CandleData { public final long tick; // Is the time tick in the chosen time interval diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/Candle.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/Candle.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java index 122364e116..163ad30c1c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/Candle.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java @@ -29,9 +29,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.bitsquare.gui.main.markets.trades.charts.price; +package io.bitsquare.gui.main.market.trades.charts.price; -import io.bitsquare.gui.main.markets.trades.charts.CandleData; +import io.bitsquare.gui.main.market.trades.charts.CandleData; import javafx.scene.Group; import javafx.scene.control.Tooltip; import javafx.scene.layout.Region; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleStickChart.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleStickChart.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java index ba8c2b1298..4e56891bd5 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleStickChart.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java @@ -29,9 +29,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.bitsquare.gui.main.markets.trades.charts.price; +package io.bitsquare.gui.main.market.trades.charts.price; -import io.bitsquare.gui.main.markets.trades.charts.CandleData; +import io.bitsquare.gui.main.market.trades.charts.CandleData; import javafx.animation.FadeTransition; import javafx.event.ActionEvent; import javafx.scene.Node; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleTooltip.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleTooltip.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java index a263b84877..770e03dc11 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleTooltip.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java @@ -29,9 +29,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.bitsquare.gui.main.markets.trades.charts.price; +package io.bitsquare.gui.main.market.trades.charts.price; -import io.bitsquare.gui.main.markets.trades.charts.CandleData; +import io.bitsquare.gui.main.market.trades.charts.CandleData; import io.bitsquare.gui.util.Layout; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java index 1bad815254..3813301b9e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.trades.charts.volume; +package io.bitsquare.gui.main.market.trades.charts.volume; import javafx.scene.Group; import javafx.scene.control.Tooltip; diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java rename to gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java index f86466453a..63a1136938 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Affero General Public License * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.main.markets.trades.charts.volume; +package io.bitsquare.gui.main.market.trades.charts.volume; -import io.bitsquare.gui.main.markets.trades.charts.CandleData; -import io.bitsquare.gui.main.markets.trades.charts.price.CandleStickChart; +import io.bitsquare.gui.main.market.trades.charts.CandleData; +import io.bitsquare.gui.main.market.trades.charts.price.CandleStickChart; import javafx.animation.FadeTransition; import javafx.event.ActionEvent; import javafx.scene.Node; diff --git a/gui/src/test/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModelTest.java b/gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java similarity index 96% rename from gui/src/test/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModelTest.java rename to gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java index 1989885cbf..0ff8999bad 100644 --- a/gui/src/test/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModelTest.java +++ b/gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java @@ -1,6 +1,6 @@ -package io.bitsquare.gui.main.markets.trades; +package io.bitsquare.gui.main.market.trades; -import io.bitsquare.gui.main.markets.trades.charts.CandleData; +import io.bitsquare.gui.main.market.trades.charts.CandleData; import io.bitsquare.trade.offer.Offer; import io.bitsquare.trade.statistics.TradeStatistics; import org.bitcoinj.core.Coin;