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

Change package structure

Browse source
This commit is contained in:
Manfred Karrer 2014-09-11 01:08:34 +02:00
parent fcb2e6c5f9
commit 78d939f181
130 changed files with 244 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/io/bitsquare/gui/view/CachedCodeBehind.java → src/main/java/io/bitsquare/gui/CachedCodeBehind.java
View file

@ -1,6 +1,4 @@
package io.bitsquare.gui.view;
import io.bitsquare.gui.pm.PresentationModel;
package io.bitsquare.gui;
import java.net.URL;

5
src/main/java/io/bitsquare/gui/view/CodeBehind.java → src/main/java/io/bitsquare/gui/CodeBehind.java
View file

@ -1,7 +1,4 @@
package io.bitsquare.gui.view;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.pm.PresentationModel;
package io.bitsquare.gui;
import java.net.URL;

58
src/main/java/io/bitsquare/gui/NavigationItem.java
View file

@ -25,21 +25,21 @@ public enum NavigationItem {
// Application
///////////////////////////////////////////////////////////////////////////////////////////
MAIN(0, "/io/bitsquare/gui/view/MainView.fxml"),
MAIN(0, "/io/bitsquare/gui/main/MainView.fxml"),
///////////////////////////////////////////////////////////////////////////////////////////
// Main menu screens
///////////////////////////////////////////////////////////////////////////////////////////
HOME(1, "/io/bitsquare/gui/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE),
BUY(1, "/io/bitsquare/gui/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE),
SELL(1, "/io/bitsquare/gui/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE),
ORDERS(1, "/io/bitsquare/gui/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE),
FUNDS(1, "/io/bitsquare/gui/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE),
MSG(1, "/io/bitsquare/gui/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE),
SETTINGS(1, "/io/bitsquare/gui/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE),
ACCOUNT(1, "/io/bitsquare/gui/view/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE),
HOME(1, "/io/bitsquare/gui/main/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE),
BUY(1, "/io/bitsquare/gui/main/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE),
SELL(1, "/io/bitsquare/gui/main/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE),
ORDERS(1, "/io/bitsquare/gui/main/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE),
FUNDS(1, "/io/bitsquare/gui/main/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE),
MSG(1, "/io/bitsquare/gui/main/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE),
SETTINGS(1, "/io/bitsquare/gui/main/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE),
ACCOUNT(1, "/io/bitsquare/gui/main/account/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE),
///////////////////////////////////////////////////////////////////////////////////////////
@ -47,23 +47,23 @@ public enum NavigationItem {
///////////////////////////////////////////////////////////////////////////////////////////
// buy/sell (trade)
ORDER_BOOK(2, "/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml"),
CREATE_OFFER(2, "/io/bitsquare/gui/view/trade/CreateOfferView.fxml"),
TAKE_OFFER(2, "/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml"),
ORDER_BOOK(2, "/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml"),
CREATE_OFFER(2, "/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml"),
TAKE_OFFER(2, "/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml"),
// orders
OFFER(2, "/io/bitsquare/gui/orders/offer/OfferView.fxml"),
PENDING_TRADE(2, "/io/bitsquare/gui/orders/pending/PendingTradeView.fxml"),
CLOSED_TRADE(2, "/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml"),
OFFER(2, "/io/bitsquare/gui/main/orders/offer/OfferView.fxml"),
PENDING_TRADE(2, "/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml"),
CLOSED_TRADE(2, "/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml"),
// funds
DEPOSIT(2, "/io/bitsquare/gui/funds/deposit/DepositView.fxml"),
WITHDRAWAL(2, "/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml"),
TRANSACTIONS(2, "/io/bitsquare/gui/funds/transactions/TransactionsView.fxml"),
DEPOSIT(2, "/io/bitsquare/gui/main/funds/deposit/DepositView.fxml"),
WITHDRAWAL(2, "/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"),
TRANSACTIONS(2, "/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"),
// account
ACCOUNT_SETUP(2, "/io/bitsquare/gui/view/account/AccountSetupView.fxml"),
ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/view/account/AccountSettingsView.fxml"),
ACCOUNT_SETUP(2, "/io/bitsquare/gui/main/account/AccountSetupView.fxml"),
ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/main/account/AccountSettingsView.fxml"),
///////////////////////////////////////////////////////////////////////////////////////////
@ -71,12 +71,12 @@ public enum NavigationItem {
///////////////////////////////////////////////////////////////////////////////////////////
// account content
SEED_WORDS(3, "/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"),
ADD_PASSWORD(3, "/io/bitsquare/gui/view/account/content/PasswordView.fxml"),
CHANGE_PASSWORD(3, "/io/bitsquare/gui/view/account/content/PasswordView.fxml"),
RESTRICTIONS(3, "/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"),
REGISTRATION(3, "/io/bitsquare/gui/view/account/content/RegistrationView.fxml"),
FIAT_ACCOUNT(3, "/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"),
SEED_WORDS(3, "/io/bitsquare/gui/main/account/content/SeedWordsView.fxml"),
ADD_PASSWORD(3, "/io/bitsquare/gui/main/account/content/PasswordView.fxml"),
CHANGE_PASSWORD(3, "/io/bitsquare/gui/main/account/content/PasswordView.fxml"),
RESTRICTIONS(3, "/io/bitsquare/gui/main/account/content/RestrictionsView.fxml"),
REGISTRATION(3, "/io/bitsquare/gui/main/account/content/RegistrationView.fxml"),
FIAT_ACCOUNT(3, "/io/bitsquare/gui/main/account/content/FiatAccountView.fxml"),
///////////////////////////////////////////////////////////////////////////////////////////
@ -84,9 +84,9 @@ public enum NavigationItem {
///////////////////////////////////////////////////////////////////////////////////////////
// arbitrator
ARBITRATOR_PROFILE(2, "/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml"),
ARBITRATOR_BROWSER(-1, "/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml"),
ARBITRATOR_REGISTRATION(-1, "/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml");
ARBITRATOR_PROFILE(2, "/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml"),
ARBITRATOR_BROWSER(-1, "/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml"),
ARBITRATOR_REGISTRATION(-1, "/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml");
private int level;

4
src/main/java/io/bitsquare/gui/pm/PresentationModel.java → src/main/java/io/bitsquare/gui/PresentationModel.java
View file

@ -1,6 +1,4 @@
package io.bitsquare.gui.pm;
import io.bitsquare.gui.model.UIModel;
package io.bitsquare.gui;
public class PresentationModel<T extends UIModel> {

2
src/main/java/io/bitsquare/gui/model/UIModel.java → src/main/java/io/bitsquare/gui/UIModel.java
View file

@ -1,4 +1,4 @@
package io.bitsquare.gui.model;
package io.bitsquare.gui;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/io/bitsquare/gui/ViewController.java
View file

@ -17,8 +17,6 @@
package io.bitsquare.gui;
import io.bitsquare.gui.view.CodeBehind;
import java.net.URL;
import java.util.ResourceBundle;

3
src/main/java/io/bitsquare/gui/model/MainModel.java → src/main/java/io/bitsquare/gui/main/MainModel.java
View file

@ -15,12 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model;
package io.bitsquare.gui.main;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.UIModel;
import io.bitsquare.gui.util.Profiler;
import io.bitsquare.msg.MessageFacade;
import io.bitsquare.msg.listeners.BootstrapListener;

4
src/main/java/io/bitsquare/gui/pm/MainPM.java → src/main/java/io/bitsquare/gui/main/MainPM.java
View file

@ -15,11 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm;
package io.bitsquare.gui.main;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.model.MainModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.BSFormatter;
import com.google.inject.Inject;

2
src/main/java/io/bitsquare/gui/view/MainView.fxml → src/main/java/io/bitsquare/gui/main/MainView.fxml
View file

@ -17,7 +17,7 @@
-->
<?import javafx.scene.layout.*?>
<StackPane fx:id="root" fx:controller="io.bitsquare.gui.view.MainViewCB"
<StackPane fx:id="root" fx:controller="io.bitsquare.gui.main.MainViewCB"
prefHeight="750" prefWidth="1000" stylesheets="/io/bitsquare/gui/bitsquare.css"
xmlns:fx="http://javafx.com/fxml">
</StackPane>

4
src/main/java/io/bitsquare/gui/view/MainViewCB.java → src/main/java/io/bitsquare/gui/main/MainViewCB.java
View file

@ -15,15 +15,15 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view;
package io.bitsquare.gui.main;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.gui.CodeBehind;
import io.bitsquare.gui.NavigationController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.OverlayController;
import io.bitsquare.gui.components.NetworkSyncPane;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.pm.MainPM;
import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.gui.util.Profiler;
import io.bitsquare.gui.util.Transitions;

3
src/main/java/io/bitsquare/gui/model/AccountModel.java → src/main/java/io/bitsquare/gui/main/account/AccountModel.java
View file

@ -15,8 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.UIModel;
import io.bitsquare.user.User;
import com.google.inject.Inject;

4
src/main/java/io/bitsquare/gui/pm/AccountPM.java → src/main/java/io/bitsquare/gui/main/account/AccountPM.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.model.AccountModel;
import io.bitsquare.gui.PresentationModel;
import com.google.inject.Inject;

4
src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java → src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import com.google.inject.Inject;

5
src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java → src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java
View file

@ -15,10 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.model.account.AccountSettingsModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import com.google.inject.Inject;

2
src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml → src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.AccountSettingsViewCB"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountSettingsViewCB"
prefHeight="660.0" prefWidth="1000.0"
xmlns:fx="http://javafx.com/fxml">

11
src/main/java/io/bitsquare/gui/view/account/AccountSettingsViewCB.java → src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java
View file

@ -15,15 +15,14 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.CodeBehind;
import io.bitsquare.gui.NavigationController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.pm.account.AccountSettingsPM;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.CodeBehind;
import io.bitsquare.gui.view.account.content.ContextAware;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.main.account.content.ContextAware;
import io.bitsquare.util.BSFXMLLoader;
import java.io.IOException;

4
src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java → src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import com.google.inject.Inject;

5
src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java → src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java
View file

@ -15,10 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.model.account.AccountSetupModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import com.google.inject.Inject;

2
src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml → src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.AccountSetupViewCB"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountSetupViewCB"
xmlns:fx="http://javafx.com/fxml">
<VBox fx:id="leftVBox" spacing="5" prefWidth="300" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="20"

21
src/main/java/io/bitsquare/gui/view/account/AccountSetupViewCB.java → src/main/java/io/bitsquare/gui/main/account/AccountSetupViewCB.java
View file

@ -15,20 +15,19 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.CodeBehind;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.pm.account.AccountSetupPM;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.main.account.content.ContextAware;
import io.bitsquare.gui.main.account.content.FiatAccountViewCB;
import io.bitsquare.gui.main.account.content.PasswordViewCB;
import io.bitsquare.gui.main.account.content.RegistrationViewCB;
import io.bitsquare.gui.main.account.content.RestrictionsViewCB;
import io.bitsquare.gui.main.account.content.SeedWordsViewCB;
import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.CodeBehind;
import io.bitsquare.gui.view.account.content.ContextAware;
import io.bitsquare.gui.view.account.content.FiatAccountViewCB;
import io.bitsquare.gui.view.account.content.PasswordViewCB;
import io.bitsquare.gui.view.account.content.RegistrationViewCB;
import io.bitsquare.gui.view.account.content.RestrictionsViewCB;
import io.bitsquare.gui.view.account.content.SeedWordsViewCB;
import io.bitsquare.util.BSFXMLLoader;
import java.io.IOException;

2
src/main/java/io/bitsquare/gui/view/AccountView.fxml → src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.view.AccountViewCB"
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountViewCB"
prefHeight="630.0" prefWidth="1000.0"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"

6
src/main/java/io/bitsquare/gui/view/AccountViewCB.java → src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java
View file

@ -15,12 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view;
package io.bitsquare.gui.main.account;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.CodeBehind;
import io.bitsquare.gui.NavigationController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.pm.AccountPM;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.util.BSFXMLLoader;
import java.io.IOException;

4
src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java → src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import com.google.inject.Inject;

5
src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java → src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java
View file

@ -15,10 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.model.account.content.ChangePasswordModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator;

2
src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml → src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.ChangePasswordViewCB" hgap="5.0" vgap="5.0"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.ChangePasswordViewCB" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

11
src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordViewCB.java → src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java
View file

@ -15,13 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.account.content.ChangePasswordPM;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.main.account.AccountSetupViewCB;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import java.net.URL;

2
src/main/java/io/bitsquare/gui/view/account/content/ContextAware.java → src/main/java/io/bitsquare/gui/main/account/content/ContextAware.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
public interface ContextAware {
void useSettingsContext(boolean useSettingsContext);

4
src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java → src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java
View file

@ -15,11 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.CurrencyUtil;

5
src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java → src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java
View file

@ -15,12 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.model.account.content.FiatAccountModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources;

2
src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml → src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml
View file

@ -23,7 +23,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.FiatAccountViewCB" hgap="5.0" vgap="5.0"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.FiatAccountViewCB" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

11
src/main/java/io/bitsquare/gui/view/account/content/FiatAccountViewCB.java → src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java
View file

@ -15,18 +15,17 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.account.content.FiatAccountPm;
import io.bitsquare.gui.main.account.AccountSetupViewCB;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;

4
src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java → src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import com.google.inject.Inject;

5
src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java → src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java
View file

@ -15,10 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.model.account.content.PasswordModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator;

2
src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml → src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.PasswordViewCB" hgap="5.0" vgap="5.0"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.PasswordViewCB" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

11
src/main/java/io/bitsquare/gui/view/account/content/PasswordViewCB.java → src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java
View file

@ -15,13 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.account.content.PasswordPM;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.main.account.AccountSetupViewCB;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import java.net.URL;

4
src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java → src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java
View file

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;

5
src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java → src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java
View file

@ -15,11 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.model.account.content.RegistrationModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.locale.BSResources;
import com.google.bitcoin.core.Address;

2
src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml → src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml
View file

@ -23,7 +23,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.RegistrationViewCB" hgap="5.0" vgap="5.0"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.RegistrationViewCB" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

13
src/main/java/io/bitsquare/gui/view/account/content/RegistrationViewCB.java → src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java
View file

@ -15,17 +15,16 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.OverlayController;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.components.btc.AddressTextField;
import io.bitsquare.gui.components.btc.BalanceTextField;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.account.content.RegistrationPM;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.gui.main.account.AccountSetupViewCB;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.locale.BSResources;
import java.net.URL;
@ -86,7 +85,7 @@ public class RegistrationViewCB extends CachedCodeBehind<RegistrationPM> impleme
// TODO find better solution
addressTextField.setOverlayController(overlayController);
balanceTextField.setup(presentationModel.getWalletFacade(), presentationModel.address.get());
payButton.disableProperty().bind(presentationModel.isPayButtonDisabled);

4
src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java → src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java
View file

@ -15,11 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.LanguageUtil;

5
src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java → src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java
View file

@ -15,11 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.model.account.content.RestrictionsModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;

2
src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml → src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml
View file

@ -20,7 +20,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.RestrictionsViewCB" hgap="5.0" vgap="5.0"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.RestrictionsViewCB" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

11
src/main/java/io/bitsquare/gui/view/account/content/RestrictionsViewCB.java → src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java
View file

@ -15,17 +15,16 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.BitSquare;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.account.content.RestrictionsPM;
import io.bitsquare.gui.main.account.AccountSetupViewCB;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;
import io.bitsquare.util.BSFXMLLoader;

4
src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java → src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java
View file

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import com.google.inject.Inject;

5
src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java → src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java
View file

@ -15,10 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.model.account.content.SeedWordsModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.BSFormatter;
import com.google.inject.Inject;

2
src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml → src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml
View file

@ -22,7 +22,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.SeedWordsViewCB" hgap="5.0" vgap="5.0"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.SeedWordsViewCB" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

11
src/main/java/io/bitsquare/gui/view/account/content/SeedWordsViewCB.java → src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java
View file

@ -15,13 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.account.content;
package io.bitsquare.gui.main.account.content;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.account.content.SeedWordsPM;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.gui.view.account.AccountSetupViewCB;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.main.account.AccountSetupViewCB;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import java.net.URL;

4
src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java → src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserController.java
View file

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.arbitrators.browser;
package io.bitsquare.gui.main.arbitrators.browser;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.ViewController;
import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController;
import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.msg.MessageFacade;
import io.bitsquare.msg.listeners.ArbitratorListener;

2
src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml → src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml
View file

@ -18,7 +18,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.arbitrators.browser.ArbitratorBrowserController"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.browser.ArbitratorBrowserController"
prefHeight="600" prefWidth="800" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
xmlns:fx="http://javafx.com/fxml">

2
src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java → src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.arbitrators.profile;
package io.bitsquare.gui.main.arbitrators.profile;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.CachedViewController;

2
src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml → src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController"
hgap="5.0" vgap="5.0" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="10.0"
AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
xmlns:fx="http://javafx.com/fxml">

4
src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java → src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.arbitrators.registration;
package io.bitsquare.gui.main.arbitrators.registration;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.Reputation;
@ -23,9 +23,9 @@ import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.ViewController;
import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController;
import io.bitsquare.gui.components.ConfidenceDisplay;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.BitSquareValidator;
import io.bitsquare.locale.BSResources;

2
src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml → src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml
View file

@ -20,7 +20,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.arbitrators.registration.ArbitratorRegistrationController"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationController"
prefHeight="600" prefWidth="800" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
xmlns:fx="http://javafx.com/fxml">

2
src/main/java/io/bitsquare/gui/funds/FundsController.java → src/main/java/io/bitsquare/gui/main/funds/FundsController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds;
package io.bitsquare.gui.main.funds;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;

2
src/main/java/io/bitsquare/gui/funds/FundsView.fxml → src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
View file

@ -19,7 +19,7 @@
<?import io.bitsquare.gui.components.CachingTabPane?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.funds.FundsController"
<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.main.funds.FundsController"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

2
src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java → src/main/java/io/bitsquare/gui/main/funds/deposit/DepositController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds.deposit;
package io.bitsquare.gui.main.funds.deposit;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletFacade;

4
src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java → src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java
View file

@ -15,11 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds.deposit;
package io.bitsquare.gui.main.funds.deposit;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.funds.withdrawal.WithdrawalListItem;
import io.bitsquare.gui.main.funds.withdrawal.WithdrawalListItem;
public class DepositListItem extends WithdrawalListItem {
public DepositListItem(AddressEntry addressEntry, WalletFacade walletFacade) {

2
src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml → src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.funds.deposit.DepositController"
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.deposit.DepositController"
spacing="10" xmlns:fx="http://javafx.com/fxml">
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

2
src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java → src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds.transactions;
package io.bitsquare.gui.main.funds.transactions;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.CachedViewController;

2
src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java → src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds.transactions;
package io.bitsquare.gui.main.funds.transactions;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.btc.listeners.ConfidenceListener;

2
src/main/java/io/bitsquare/gui/funds/transactions/TransactionsView.fxml → src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.funds.transactions.TransactionsController"
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.transactions.TransactionsController"
spacing="10" xmlns:fx="http://javafx.com/fxml">
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

2
src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java → src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds.withdrawal;
package io.bitsquare.gui.main.funds.withdrawal;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy;

2
src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java → src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.funds.withdrawal;
package io.bitsquare.gui.main.funds.withdrawal;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletFacade;

2
src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml → src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.funds.withdrawal.WithdrawalController"
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.withdrawal.WithdrawalController"
spacing="10" xmlns:fx="http://javafx.com/fxml">
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

2
src/main/java/io/bitsquare/gui/help/Help.java → src/main/java/io/bitsquare/gui/main/help/Help.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.help;
package io.bitsquare.gui.main.help;
import io.bitsquare.BitSquare;

2
src/main/java/io/bitsquare/gui/help/HelpId.java → src/main/java/io/bitsquare/gui/main/help/HelpId.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.help;
package io.bitsquare.gui.main.help;
public enum HelpId {
CREATE_OFFER_GENERAL,

4
src/main/java/io/bitsquare/gui/home/HomeController.java → src/main/java/io/bitsquare/gui/main/home/HomeController.java
View file

@ -15,12 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.home;
package io.bitsquare.gui.main.home;
import io.bitsquare.BitSquare;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.arbitrators.registration.ArbitratorRegistrationController;
import io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationController;
import io.bitsquare.util.BSFXMLLoader;
import java.io.IOException;

2
src/main/java/io/bitsquare/gui/home/HomeView.fxml → src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
View file

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

2
src/main/java/io/bitsquare/gui/msg/MsgController.java → src/main/java/io/bitsquare/gui/main/msg/MsgController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.msg;
package io.bitsquare.gui.main.msg;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;

2
src/main/java/io/bitsquare/gui/msg/MsgView.fxml → src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
View file

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

2
src/main/java/io/bitsquare/gui/orders/OrdersController.java → src/main/java/io/bitsquare/gui/main/orders/OrdersController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.orders;
package io.bitsquare.gui.main.orders;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;

2
src/main/java/io/bitsquare/gui/orders/OrdersView.fxml → src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml
View file

@ -20,7 +20,7 @@
<?import io.bitsquare.gui.components.CachingTabPane?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.orders.OrdersController"
<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.main.orders.OrdersController"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

2
src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java → src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.orders.closed;
package io.bitsquare.gui.main.orders.closed;
import io.bitsquare.gui.CachedViewController;

2
src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml → src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.orders.closed.ClosedTradeController"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.orders.closed.ClosedTradeController"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<VBox spacing="20" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"

2
src/main/java/io/bitsquare/gui/orders/offer/OfferController.java → src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.orders.offer;
package io.bitsquare.gui.main.orders.offer;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.util.ImageUtil;

2
src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java → src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.orders.offer;
package io.bitsquare.gui.main.orders.offer;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.trade.Offer;

2
src/main/java/io/bitsquare/gui/orders/offer/OfferView.fxml → src/main/java/io/bitsquare/gui/main/orders/offer/OfferView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.orders.offer.OfferController"
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.orders.offer.OfferController"
spacing="10" xmlns:fx="http://javafx.com/fxml">
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

2
src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java → src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.orders.pending;
package io.bitsquare.gui.main.orders.pending;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;

2
src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml → src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml
View file

@ -22,7 +22,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<VBox fx:id="root" fx:controller="io.bitsquare.gui.orders.pending.PendingTradeController"
<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.orders.pending.PendingTradeController"
spacing="10" AnchorPane.bottomAnchor="0"
AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">

4
src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java → src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.orders.pending;
package io.bitsquare.gui.main.orders.pending;
import io.bitsquare.gui.trade.orderbook.OrderBookListItem;
import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem;
import io.bitsquare.trade.Trade;
import org.slf4j.Logger;

2
src/main/java/io/bitsquare/gui/settings/SettingsController.java → src/main/java/io/bitsquare/gui/main/settings/SettingsController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings;
package io.bitsquare.gui.main.settings;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;

2
src/main/java/io/bitsquare/gui/settings/SettingsView.fxml → src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
View file

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

2
src/main/java/io/bitsquare/gui/trade/BuyController.java → src/main/java/io/bitsquare/gui/main/trade/BuyController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade;
package io.bitsquare.gui.main.trade;
import io.bitsquare.trade.Direction;

2
src/main/java/io/bitsquare/gui/trade/BuyView.fxml → src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.trade.BuyController"
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.BuyController"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml"/>

2
src/main/java/io/bitsquare/gui/trade/SellController.java → src/main/java/io/bitsquare/gui/main/trade/SellController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade;
package io.bitsquare.gui.main.trade;
import io.bitsquare.trade.Direction;

2
src/main/java/io/bitsquare/gui/trade/SellView.fxml → src/main/java/io/bitsquare/gui/main/trade/SellView.fxml
View file

@ -19,7 +19,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.trade.SellController"
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.SellController"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml"/>

8
src/main/java/io/bitsquare/gui/trade/TradeController.java → src/main/java/io/bitsquare/gui/main/trade/TradeController.java
View file

@ -15,14 +15,14 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade;
package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.trade.orderbook.OrderBookController;
import io.bitsquare.gui.trade.takeoffer.TakeOfferController;
import io.bitsquare.gui.view.trade.CreateOfferViewCB;
import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB;
import io.bitsquare.gui.main.trade.orderbook.OrderBookController;
import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController;
import io.bitsquare.trade.Direction;
import io.bitsquare.util.BSFXMLLoader;

4
src/main/java/io/bitsquare/gui/model/trade/CreateOfferModel.java → src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.model.trade;
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.bank.BankAccount;
@ -23,7 +23,7 @@ import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.model.UIModel;
import io.bitsquare.gui.UIModel;
import io.bitsquare.locale.Country;
import io.bitsquare.settings.Settings;
import io.bitsquare.trade.Direction;

5
src/main/java/io/bitsquare/gui/pm/trade/CreateOfferPM.java → src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
View file

@ -15,11 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.trade;
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.model.trade.CreateOfferModel;
import io.bitsquare.gui.pm.PresentationModel;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.validation.BtcValidator;
import io.bitsquare.gui.util.validation.FiatValidator;

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

@ -26,7 +26,7 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.view.trade.CreateOfferViewCB"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB"
AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0"
AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
xmlns:fx="http://javafx.com/fxml">

9
src/main/java/io/bitsquare/gui/view/trade/CreateOfferViewCB.java → src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
View file

@ -15,8 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.view.trade;
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.gui.CachedCodeBehind;
import io.bitsquare.gui.NavigationController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.OverlayController;
@ -25,11 +26,9 @@ import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.components.btc.AddressTextField;
import io.bitsquare.gui.components.btc.BalanceTextField;
import io.bitsquare.gui.help.Help;
import io.bitsquare.gui.help.HelpId;
import io.bitsquare.gui.pm.trade.CreateOfferPM;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.gui.view.CachedCodeBehind;
import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.orderbook.OrderBookFilter;

8
src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java → src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java
View file

@ -15,21 +15,21 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade.orderbook;
package io.bitsquare.gui.main.trade.orderbook;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.CodeBehind;
import io.bitsquare.gui.NavigationController;
import io.bitsquare.gui.NavigationItem;
import io.bitsquare.gui.OverlayController;
import io.bitsquare.gui.ViewController;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.trade.takeoffer.TakeOfferController;
import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB;
import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.gui.view.CodeBehind;
import io.bitsquare.gui.view.trade.CreateOfferViewCB;
import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.CurrencyUtil;

2
src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java → src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade.orderbook;
package io.bitsquare.gui.main.trade.orderbook;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.trade.Offer;

2
src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml → src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml
View file

@ -21,7 +21,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.trade.orderbook.OrderBookController"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.orderbook.OrderBookController"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">

4
src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java → src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferController.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade.takeoffer;
package io.bitsquare.gui.main.trade.takeoffer;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy;
@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.CachedViewController;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.components.ValidatedTextField;
import io.bitsquare.gui.trade.TradeController;
import io.bitsquare.gui.main.trade.TradeController;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.BitSquareValidator;
import io.bitsquare.trade.Offer;

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

@ -21,7 +21,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.trade.takeoffer.TakeOfferController"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.takeoffer.TakeOfferController"
xmlns:fx="http://javafx.com/fxml">
<Accordion fx:id="accordion" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0">

2
src/main/java/io/bitsquare/trade/orderbook/OrderBook.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.orderbook;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.gui.trade.orderbook.OrderBookListItem;
import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.CurrencyUtil;
import io.bitsquare.msg.MessageFacade;

2
src/test/java/io/bitsquare/BitSquareTestSuite.java
View file

@ -18,7 +18,7 @@
package io.bitsquare;
import io.bitsquare.btc.RestrictionsTest;
import io.bitsquare.gui.pm.trade.CreateOfferPMTest;
import io.bitsquare.gui.main.trade.createoffer.CreateOfferPMTest;
import io.bitsquare.gui.util.BSFormatterTest;
import io.bitsquare.gui.util.BitSquareConverterTest;
import io.bitsquare.gui.util.BitSquareNumberValidatorTest;

4
src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java → src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class AccountSettingsUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), false);
getUrl("/io/bitsquare/gui/account/AccountSettingsView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java → src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class AccountUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/AccountView.fxml"), false);
getUrl("/io/bitsquare/gui/account/AccountView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

Some files were not shown because too many files have changed in this diff Show more