mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renaming of markets package to market

Browse Source
This commit is contained in:
Manfred Karrer 2016-07-28 15:27:12 +02:00
parent 70d9035652
commit 5915e67007
21 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src/main/java/io/bitsquare/gui/Navigation.java
View File

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

2
gui/src/main/java/io/bitsquare/gui/main/MainView.java
View File

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

2
gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.fxml → gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml
View File

@ -20,7 +20,7 @@
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.markets.MarketView"
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.market.MarketView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">

8
gui/src/main/java/io/bitsquare/gui/main/markets/MarketView.java → gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java
View File

@ -15,15 +15,15 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

32
gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ This file is part of Bitsquare.
~
~ Bitsquare is free software: you can redistribute it and/or modify it
~ under the terms of the GNU Affero General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or (at
~ your option) any later version.
~
~ Bitsquare is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
~ License for more details.
~
~ You should have received a copy of the GNU Affero General Public License
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.geometry.Insets?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.market.offerbook.OfferBookChartView"
spacing="20.0" fillWidth="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<padding>
<Insets bottom="10.0" left="20.0" top="10.0" right="20"/>
</padding>
</VBox>

2
gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartView.java → gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
gui/src/main/java/io/bitsquare/gui/main/markets/offerbook/OfferBookChartViewModel.java → gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadItem.java → gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java
View File

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

2
gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadView.fxml → gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml
View File

@ -20,7 +20,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.markets.spread.SpreadView"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.market.spread.SpreadView"
hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

2
gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadView.java → gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
gui/src/main/java/io/bitsquare/gui/main/markets/spread/SpreadViewModel.java → gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsView.fxml → gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml
View File

@ -20,7 +20,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.markets.trades.TradesChartsView"
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.market.trades.TradesChartsView"
spacing="10.0" fillWidth="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

6
gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsView.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
View File

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

4
gui/src/main/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModel.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java
View File

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

2
gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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

4
gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/Candle.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java
View File

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

4
gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleStickChart.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java
View File

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

4
gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/price/CandleTooltip.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java
View File

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

2
gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

6
gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java → gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java
View File

@ -14,10 +14,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
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;

4
gui/src/test/java/io/bitsquare/gui/main/markets/trades/TradesChartsViewModelTest.java → gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java
View File

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