diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java index c91ed04684..3011a5f737 100644 --- a/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/src/main/java/io/bitsquare/gui/main/MainView.java @@ -29,7 +29,7 @@ import io.bitsquare.gui.util.Transitions; import javax.inject.Inject; import javax.inject.Named; -import viewfx.ActivatableView; +import viewfx.view.support.ActivatableView; import javafx.application.Platform; import javafx.geometry.Insets; diff --git a/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/src/main/java/io/bitsquare/gui/main/MainViewModel.java index bb4240ecfc..cba00b332d 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -30,7 +30,7 @@ import io.bitsquare.user.User; import com.google.inject.Inject; -import viewfx.ViewModel; +import viewfx.model.ViewModel; import javafx.application.Platform; import javafx.beans.property.BooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/src/main/java/io/bitsquare/gui/main/account/AccountView.java index f1219a246b..c58794ade3 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -22,7 +22,7 @@ import io.bitsquare.gui.ViewLoader; import javax.inject.Inject; -import viewfx.ActivatableView; +import viewfx.view.support.ActivatableView; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java index 82bb0ca64e..5ae1ccf86d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java @@ -21,7 +21,7 @@ import io.bitsquare.user.User; import com.google.inject.Inject; -import viewfx.ViewModel; +import viewfx.model.ViewModel; class AccountViewModel implements ViewModel { diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java index 92e619f2af..9f9f0ed2e6 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java @@ -23,7 +23,7 @@ import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrat import javax.inject.Inject; -import viewfx.AbstractView; +import viewfx.view.support.AbstractView; import javafx.fxml.FXML; import javafx.scene.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java index 8d086448da..5e299e32cf 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java @@ -32,7 +32,7 @@ import java.util.List; import javax.inject.Inject; -import viewfx.ActivatableView; +import viewfx.view.support.ActivatableView; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java index e2618796d8..fdb2b7e201 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java @@ -24,7 +24,7 @@ import io.bitsquare.settings.Preferences; import javax.inject.Inject; -import viewfx.AbstractView; +import viewfx.view.support.AbstractView; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java index 6cf97ae3c3..6044382ef7 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java @@ -44,7 +44,7 @@ import java.util.Locale; import javax.inject.Inject; -import viewfx.ActivatableView; +import viewfx.view.support.ActivatableView; import javafx.collections.FXCollections; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java index b6cc884bb7..e884488f63 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java @@ -22,8 +22,8 @@ import io.bitsquare.gui.main.help.HelpId; import javax.inject.Inject; -import viewfx.InitializableView; -import viewfx.Wizard; +import viewfx.view.support.InitializableView; +import viewfx.view.Wizard; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java index 9d2451b6d5..02fdfa3d20 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java @@ -22,7 +22,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator; import com.google.inject.Inject; -import viewfx.ViewModel; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java index 69dc71d93b..b3e3252c2a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java @@ -31,8 +31,8 @@ import com.google.inject.Inject; import java.util.Currency; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java index a3880211e7..08b4831b50 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java @@ -35,8 +35,8 @@ import java.util.List; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; -import viewfx.Wizard; +import viewfx.view.support.ActivatableViewAndModel; +import viewfx.view.Wizard; import javafx.collections.ListChangeListener; import javafx.event.ActionEvent; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java index 856f6cbcae..573dcb2f7e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java @@ -29,8 +29,8 @@ import com.google.inject.Inject; import java.util.Currency; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java index 4a209960a7..c055127bbd 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java @@ -43,8 +43,8 @@ import java.util.Currency; import java.util.List; import java.util.Locale; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java index 9ae92eac6a..d7bc4aa315 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java @@ -28,8 +28,8 @@ import java.util.Currency; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; -import viewfx.Wizard; +import viewfx.view.support.ActivatableViewAndModel; +import viewfx.view.Wizard; import javafx.application.Platform; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java index 968a9ccbba..c443ac922e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java @@ -27,8 +27,8 @@ import com.google.inject.Inject; import java.util.Currency; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java index 3d2fd9c1f9..635384c643 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java @@ -22,8 +22,8 @@ import io.bitsquare.gui.main.help.HelpId; import javax.inject.Inject; -import viewfx.InitializableView; -import viewfx.Wizard; +import viewfx.view.support.InitializableView; +import viewfx.view.Wizard; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java index 3e15eb5dbe..2f2a4fc53e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java @@ -22,7 +22,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator; import com.google.inject.Inject; -import viewfx.ViewModel; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java index 56d2205e07..7f8f8b07a8 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java @@ -34,7 +34,7 @@ import com.google.inject.Inject; import javax.annotation.Nullable; -import viewfx.DataModel; +import viewfx.model.DataModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java index ecbe3085c0..78b8cee6b1 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java @@ -30,8 +30,8 @@ import java.util.List; import javax.inject.Inject; -import viewfx.InitializableView; -import viewfx.Wizard; +import viewfx.view.support.InitializableView; +import viewfx.view.Wizard; import javafx.event.ActionEvent; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java index 22a9304a68..596d101aa3 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java @@ -26,8 +26,8 @@ import org.bitcoinj.core.Coin; import com.google.inject.Inject; -import viewfx.ViewModel; -import viewfx.WithDelegate; +import viewfx.model.ViewModel; +import viewfx.model.support.WithDelegate; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java index acec0a3840..09d23a2fe3 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java @@ -39,8 +39,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java index cd22b49464..24b668ff29 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java @@ -30,9 +30,9 @@ import java.util.Locale; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; -import viewfx.View; -import viewfx.Wizard; +import viewfx.view.support.ActivatableViewAndModel; +import viewfx.view.View; +import viewfx.view.Wizard; import javafx.fxml.FXML; import javafx.scene.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java index 611a383acf..23d5a4d457 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java @@ -25,8 +25,8 @@ import com.google.inject.Inject; import java.util.Locale; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java index 11dbd49435..3a85a63ed6 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java @@ -22,8 +22,8 @@ import io.bitsquare.gui.main.help.HelpId; import javax.inject.Inject; -import viewfx.InitializableView; -import viewfx.Wizard; +import viewfx.view.support.InitializableView; +import viewfx.view.Wizard; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java index b2706ead5b..5e10201edb 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import java.util.List; -import viewfx.ViewModel; +import viewfx.model.ViewModel; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java index daefd4bc51..39654676ab 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java @@ -23,9 +23,9 @@ import io.bitsquare.gui.util.Colors; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; -import viewfx.View; -import viewfx.Wizard; +import viewfx.view.support.ActivatableViewAndModel; +import viewfx.view.View; +import viewfx.view.Wizard; import javafx.fxml.FXML; import javafx.geometry.Pos; diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java index d42ff5b209..cb77a53f53 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java @@ -27,9 +27,9 @@ import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView; import javax.inject.Inject; -import viewfx.ActivatableView; -import viewfx.View; -import viewfx.Wizard; +import viewfx.view.support.ActivatableView; +import viewfx.view.View; +import viewfx.view.Wizard; import javafx.fxml.FXML; import javafx.geometry.Insets; diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java index 42268e7c04..3fbd251c68 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java @@ -22,8 +22,8 @@ import io.bitsquare.gui.ViewLoader; import javax.inject.Inject; -import viewfx.Activatable; -import viewfx.ActivatableViewAndModel; +import viewfx.model.Activatable; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java index 2c0103afe2..5c61c1add5 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.FXCollections; diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index 4c1a739867..5b911fe029 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java +++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.FXCollections; diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/src/main/java/io/bitsquare/gui/main/home/HomeView.java index 26a5cbd02b..0318fc7cd3 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeView.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.home; -import viewfx.AbstractView; +import viewfx.view.support.AbstractView; // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, // probably overview, event history, news, charts,... -> low prio diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java index 02d01d6973..0774d163c8 100644 --- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.msg; -import viewfx.AbstractView; +import viewfx.view.support.AbstractView; // will be probably only used for arbitration communication, will be renamed and the icon changed class MsgView extends AbstractView { diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index 1a961fb541..7e3c227f2f 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -23,8 +23,8 @@ import io.bitsquare.trade.TradeManager; import javax.inject.Inject; -import viewfx.Activatable; -import viewfx.ActivatableViewAndModel; +import viewfx.model.Activatable; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java index 060974f183..a3522bdd3e 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java @@ -25,8 +25,8 @@ import io.bitsquare.user.User; import com.google.inject.Inject; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java index 4334f5538e..dc02adfe43 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java @@ -21,7 +21,7 @@ import io.bitsquare.gui.components.Popups; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java index 3af0a618e0..b32dfadea0 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java @@ -21,8 +21,8 @@ import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java index b9957b9288..714ace5a17 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java @@ -26,8 +26,8 @@ import com.google.inject.Inject; import java.util.stream.Collectors; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java index f6d7b280eb..10fad004d5 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java @@ -22,7 +22,7 @@ import io.bitsquare.util.Utilities; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java index d0882d6abe..f5b8cec4aa 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java @@ -21,8 +21,8 @@ import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.collections.ObservableList; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java index ee3feb1098..c3d148b3fd 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java @@ -39,8 +39,8 @@ import com.google.inject.Inject; import java.util.Optional; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java index 40dd3d5ec1..174f559fc8 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java @@ -40,7 +40,7 @@ import java.util.List; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.application.Platform; import javafx.beans.property.ReadOnlyObjectWrapper; diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java index 4a976f36c1..d95ffd3263 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java @@ -30,8 +30,8 @@ import com.google.inject.Inject; import java.util.Date; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.InvalidationListener; import javafx.beans.property.BooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java index b2a9b5f4d5..c8ab6392eb 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java @@ -23,8 +23,8 @@ import io.bitsquare.settings.Preferences; import javax.inject.Inject; -import viewfx.Activatable; -import viewfx.ActivatableViewAndModel; +import viewfx.model.Activatable; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java index 1b25f47409..63b1ae3825 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java @@ -21,8 +21,8 @@ import io.bitsquare.settings.Preferences; import com.google.inject.Inject; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java index 42b0f35aca..101ef41c47 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java +++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java @@ -19,7 +19,7 @@ package io.bitsquare.gui.main.settings.application; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java index 95a7b0c41a..153e68b14e 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java @@ -19,8 +19,8 @@ package io.bitsquare.gui.main.settings.application; import com.google.inject.Inject; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.StringProperty; diff --git a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java index f05adafb13..2b8066f63a 100644 --- a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java @@ -22,7 +22,7 @@ import io.bitsquare.network.ClientNode; import javax.inject.Inject; -import viewfx.InitializableView; +import viewfx.view.support.InitializableView; import javafx.fxml.FXML; import javafx.scene.control.*; diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java index 4aeb2d16ae..d3c0f049a6 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java @@ -31,8 +31,8 @@ import org.bitcoinj.utils.Fiat; import java.util.List; -import viewfx.ActivatableView; -import viewfx.View; +import viewfx.view.support.ActivatableView; +import viewfx.view.View; import javafx.application.Platform; import javafx.collections.ListChangeListener; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java index 6c1ba95bf7..f2a011cf4a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java @@ -41,8 +41,8 @@ import com.google.inject.Inject; import java.util.Locale; import java.util.UUID; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java index 9ae332f0b3..60be5430c1 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java @@ -39,7 +39,7 @@ import java.util.List; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.property.BooleanProperty; import javafx.event.ActionEvent; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java index c37e84fa7d..6de4e7d763 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java @@ -31,8 +31,8 @@ import org.bitcoinj.utils.Fiat; import javax.inject.Inject; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.Observable; import javafx.beans.binding.Bindings; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java index 1368b353a3..def0e6e45d 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java @@ -35,8 +35,8 @@ import com.google.inject.Inject; import java.util.Comparator; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java index 6918fd02c6..65a48db023 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java @@ -35,8 +35,8 @@ import java.util.List; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; -import viewfx.ChildView; +import viewfx.view.support.ActivatableViewAndModel; +import viewfx.view.ChildView; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.transformation.SortedList; diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java index be5bd4166a..73e109333e 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java @@ -30,8 +30,8 @@ import org.bitcoinj.utils.Fiat; import com.google.inject.Inject; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java index a96a7ba9a2..0680da0bbe 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java @@ -33,8 +33,8 @@ import org.bitcoinj.utils.Fiat; import com.google.inject.Inject; -import viewfx.Activatable; -import viewfx.DataModel; +import viewfx.model.Activatable; +import viewfx.model.DataModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java index 2c13c416d7..491641c873 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java @@ -40,7 +40,7 @@ import java.util.List; import javax.inject.Inject; -import viewfx.ActivatableViewAndModel; +import viewfx.view.support.ActivatableViewAndModel; import javafx.beans.property.BooleanProperty; import javafx.event.ActionEvent; diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java index fef24e88ab..c585f2aa23 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java @@ -30,8 +30,8 @@ import org.bitcoinj.core.Coin; import javax.inject.Inject; -import viewfx.ActivatableWithDelegate; -import viewfx.ViewModel; +import viewfx.model.support.ActivatableWithDelegate; +import viewfx.model.ViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; diff --git a/src/main/java/viewfx/Activatable.java b/src/main/java/viewfx/model/Activatable.java similarity index 97% rename from src/main/java/viewfx/Activatable.java rename to src/main/java/viewfx/model/Activatable.java index ca94d3751d..3a4f47d237 100644 --- a/src/main/java/viewfx/Activatable.java +++ b/src/main/java/viewfx/model/Activatable.java @@ -15,9 +15,10 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.model; public interface Activatable { + void activate(); void deactivate(); diff --git a/src/main/java/viewfx/DataModel.java b/src/main/java/viewfx/model/DataModel.java similarity index 97% rename from src/main/java/viewfx/DataModel.java rename to src/main/java/viewfx/model/DataModel.java index a1f6cac8a1..3f3094a5ab 100644 --- a/src/main/java/viewfx/DataModel.java +++ b/src/main/java/viewfx/model/DataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.model; public interface DataModel extends Model { } diff --git a/src/main/java/viewfx/Model.java b/src/main/java/viewfx/model/Model.java similarity index 97% rename from src/main/java/viewfx/Model.java rename to src/main/java/viewfx/model/Model.java index 01dc1427b8..8fa74d106b 100644 --- a/src/main/java/viewfx/Model.java +++ b/src/main/java/viewfx/model/Model.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.model; public interface Model { } diff --git a/src/main/java/viewfx/ViewModel.java b/src/main/java/viewfx/model/ViewModel.java similarity index 97% rename from src/main/java/viewfx/ViewModel.java rename to src/main/java/viewfx/model/ViewModel.java index b099615b97..d035d0bc2e 100644 --- a/src/main/java/viewfx/ViewModel.java +++ b/src/main/java/viewfx/model/ViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.model; public interface ViewModel extends Model { } diff --git a/src/main/java/viewfx/ActivatableWithDelegate.java b/src/main/java/viewfx/model/support/ActivatableWithDelegate.java similarity index 95% rename from src/main/java/viewfx/ActivatableWithDelegate.java rename to src/main/java/viewfx/model/support/ActivatableWithDelegate.java index 5eb8068eb2..174b6b6d75 100644 --- a/src/main/java/viewfx/ActivatableWithDelegate.java +++ b/src/main/java/viewfx/model/support/ActivatableWithDelegate.java @@ -15,7 +15,9 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.model.support; + +import viewfx.model.Activatable; public abstract class ActivatableWithDelegate extends WithDelegate implements Activatable { diff --git a/src/main/java/viewfx/WithDelegate.java b/src/main/java/viewfx/model/support/WithDelegate.java similarity index 97% rename from src/main/java/viewfx/WithDelegate.java rename to src/main/java/viewfx/model/support/WithDelegate.java index ca8e7db06a..eb6842ace7 100644 --- a/src/main/java/viewfx/WithDelegate.java +++ b/src/main/java/viewfx/model/support/WithDelegate.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.model.support; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/src/main/java/viewfx/ChildView.java b/src/main/java/viewfx/view/ChildView.java similarity index 94% rename from src/main/java/viewfx/ChildView.java rename to src/main/java/viewfx/view/ChildView.java index 8cfcc3f65b..efd950e026 100644 --- a/src/main/java/viewfx/ChildView.java +++ b/src/main/java/viewfx/view/ChildView.java @@ -15,7 +15,9 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view; + +import viewfx.view.View; public interface ChildView extends View { void setParent(Parent parent); diff --git a/src/main/java/viewfx/View.java b/src/main/java/viewfx/view/View.java similarity index 97% rename from src/main/java/viewfx/View.java rename to src/main/java/viewfx/view/View.java index 3e7a37bb8a..e0efad73e0 100644 --- a/src/main/java/viewfx/View.java +++ b/src/main/java/viewfx/view/View.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view; public interface View { } diff --git a/src/main/java/viewfx/Wizard.java b/src/main/java/viewfx/view/Wizard.java similarity index 97% rename from src/main/java/viewfx/Wizard.java rename to src/main/java/viewfx/view/Wizard.java index 5b510ca05a..7d87b31cfd 100644 --- a/src/main/java/viewfx/Wizard.java +++ b/src/main/java/viewfx/view/Wizard.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view; public interface Wizard extends View { void nextStep(Step currentStep); diff --git a/src/main/java/viewfx/AbstractView.java b/src/main/java/viewfx/view/support/AbstractView.java similarity index 95% rename from src/main/java/viewfx/AbstractView.java rename to src/main/java/viewfx/view/support/AbstractView.java index 4ad427dd0e..89ac694439 100644 --- a/src/main/java/viewfx/AbstractView.java +++ b/src/main/java/viewfx/view/support/AbstractView.java @@ -15,7 +15,9 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view.support; + +import viewfx.view.View; import javafx.fxml.FXML; import javafx.scene.*; diff --git a/src/main/java/viewfx/ActivatableView.java b/src/main/java/viewfx/view/support/ActivatableView.java similarity index 97% rename from src/main/java/viewfx/ActivatableView.java rename to src/main/java/viewfx/view/support/ActivatableView.java index 703afab0c2..c0a9f0fa58 100644 --- a/src/main/java/viewfx/ActivatableView.java +++ b/src/main/java/viewfx/view/support/ActivatableView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view.support; import javafx.scene.*; diff --git a/src/main/java/viewfx/ActivatableViewAndModel.java b/src/main/java/viewfx/view/support/ActivatableViewAndModel.java similarity index 95% rename from src/main/java/viewfx/ActivatableViewAndModel.java rename to src/main/java/viewfx/view/support/ActivatableViewAndModel.java index a5447dbe49..dc3fe6200f 100644 --- a/src/main/java/viewfx/ActivatableViewAndModel.java +++ b/src/main/java/viewfx/view/support/ActivatableViewAndModel.java @@ -15,7 +15,9 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view.support; + +import viewfx.model.Activatable; import javafx.scene.*; diff --git a/src/main/java/viewfx/InitializableView.java b/src/main/java/viewfx/view/support/InitializableView.java similarity index 97% rename from src/main/java/viewfx/InitializableView.java rename to src/main/java/viewfx/view/support/InitializableView.java index 324f892f58..a94ab818ac 100644 --- a/src/main/java/viewfx/InitializableView.java +++ b/src/main/java/viewfx/view/support/InitializableView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package viewfx; +package viewfx.view.support; import java.net.URL;