Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-20 21:04:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Optimize imports

Browse source
This commit is contained in:
Manfred Karrer 2015-03-14 09:40:15 +01:00
parent 8e280b99d4
commit 871db17edf
63 changed files with 154 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
View file

@ -26,6 +26,10 @@ import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
@ -34,11 +38,6 @@ import com.google.inject.Injector;
import java.io.IOException; import java.io.IOException;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
import javafx.application.Application; import javafx.application.Application;
import javafx.scene.*; import javafx.scene.*;
import javafx.scene.image.*; import javafx.scene.image.*;

2
core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
View file

@ -41,8 +41,8 @@ import joptsimple.OptionParser;
import joptsimple.OptionSet; import joptsimple.OptionSet;
import static io.bitsquare.app.BitsquareEnvironment.*; import static io.bitsquare.app.BitsquareEnvironment.*;
import static io.bitsquare.network.tomp2p.TomP2PNetworkModule.*;
import static io.bitsquare.network.Node.*; import static io.bitsquare.network.Node.*;
import static io.bitsquare.network.tomp2p.TomP2PNetworkModule.*;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class BitsquareAppMain extends BitsquareExecutable { public class BitsquareAppMain extends BitsquareExecutable {

13
core/src/main/java/io/bitsquare/gui/GuiModule.java
View file

@ -20,7 +20,6 @@ package io.bitsquare.gui;
import io.bitsquare.BitsquareModule; import io.bitsquare.BitsquareModule;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.MainView;
import io.bitsquare.offer.OfferBook;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.Transitions; import io.bitsquare.gui.util.Transitions;
import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
@ -29,18 +28,18 @@ import io.bitsquare.gui.util.validation.FiatValidator;
import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator; import io.bitsquare.gui.util.validation.PasswordValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.offer.OfferBook;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.fxml.FxmlViewLoader;
import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.google.inject.name.Names; import com.google.inject.name.Names;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.fxml.FxmlViewLoader;
import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
import javafx.stage.Stage; import javafx.stage.Stage;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;

5
core/src/main/java/io/bitsquare/gui/Navigation.java
View file

@ -20,6 +20,8 @@ package io.bitsquare.gui;
import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.trade.BuyView; import io.bitsquare.gui.main.trade.BuyView;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewPath;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -29,9 +31,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewPath;
public class Navigation { public class Navigation {
private static final String CURRENT_PATH_KEY = "currentPath"; private static final String CURRENT_PATH_KEY = "currentPath";

11
core/src/main/java/io/bitsquare/gui/main/MainView.java
View file

@ -32,16 +32,15 @@ import io.bitsquare.gui.main.settings.SettingsView;
import io.bitsquare.gui.main.trade.BuyView; import io.bitsquare.gui.main.trade.BuyView;
import io.bitsquare.gui.main.trade.SellView; import io.bitsquare.gui.main.trade.SellView;
import io.bitsquare.gui.util.Transitions; import io.bitsquare.gui.util.Transitions;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.InitializableView;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.geometry.Pos; import javafx.geometry.Pos;

9
core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
View file

@ -22,14 +22,13 @@ import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView; import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView;
import io.bitsquare.gui.main.account.settings.AccountSettingsView; import io.bitsquare.gui.main.account.settings.AccountSettingsView;
import io.bitsquare.gui.main.account.setup.AccountSetupWizard; import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
import io.bitsquare.viewfx.view.ActivatableView;
import javax.inject.Inject; import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

3
core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
View file

@ -18,11 +18,10 @@
package io.bitsquare.gui.main.account; package io.bitsquare.gui.main.account;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
class AccountViewModel implements ViewModel { class AccountViewModel implements ViewModel {
private final User user; private final User user;

9
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
View file

@ -18,14 +18,13 @@
package io.bitsquare.gui.main.account.arbitrator; package io.bitsquare.gui.main.account.arbitrator;
import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView; import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
import io.bitsquare.viewfx.view.AbstractView;
import javax.inject.Inject; import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.*; import javafx.scene.*;

15
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
View file

@ -19,23 +19,22 @@ package io.bitsquare.gui.main.account.arbitrator.browser;
import io.bitsquare.account.AccountSettings; import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.listeners.ArbitratorListener; import io.bitsquare.arbitrator.listeners.ArbitratorListener;
import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;

5
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
View file

@ -19,12 +19,11 @@ package io.bitsquare.gui.main.account.arbitrator.profile;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.AbstractView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

7
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
View file

@ -18,17 +18,19 @@
package io.bitsquare.gui.main.account.arbitrator.registration; package io.bitsquare.gui.main.account.arbitrator.registration;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.btc.WalletService; import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.LanguageUtil; import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.FxmlView;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; import org.bitcoinj.core.ECKey;
@ -44,9 +46,6 @@ import java.util.Locale;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ActivatableView;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

7
core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
View file

@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.changepassword;
import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;

3
core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
View file

@ -19,11 +19,10 @@ package io.bitsquare.gui.main.account.content.changepassword;
import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator; import io.bitsquare.gui.util.validation.PasswordValidator;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

5
core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
View file

@ -26,14 +26,13 @@ import io.bitsquare.locale.CurrencyUtil;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.Currency; import java.util.Currency;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

7
core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
View file

@ -28,6 +28,9 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Currency; import java.util.Currency;
@ -35,10 +38,6 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;

5
core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
View file

@ -24,14 +24,13 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.Currency; import java.util.Currency;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

7
core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
View file

@ -19,16 +19,18 @@ package io.bitsquare.gui.main.account.content.irc;
import io.bitsquare.account.AccountSettings; import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.bank.BankAccountType;
import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.locale.CurrencyUtil;
import io.bitsquare.locale.LanguageUtil; import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; import org.bitcoinj.core.ECKey;
@ -41,9 +43,6 @@ import java.util.Currency;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

7
core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
View file

@ -23,15 +23,14 @@ import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import java.util.Currency; import java.util.Currency;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

5
core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
View file

@ -21,14 +21,13 @@ import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.Currency; import java.util.Currency;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

7
core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
View file

@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.password;
import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;

3
core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
View file

@ -19,11 +19,10 @@ package io.bitsquare.gui.main.account.content.password;
import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator; import io.bitsquare.gui.util.validation.PasswordValidator;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

3
core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
View file

@ -23,6 +23,7 @@ import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
@ -34,8 +35,6 @@ import com.google.inject.Inject;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

7
core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
View file

@ -24,16 +24,15 @@ import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.InitializableView;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

5
core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
View file

@ -20,15 +20,14 @@ package io.bitsquare.gui.main.account.content.registration;
import io.bitsquare.btc.WalletService; import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.WithDataModel;
import org.bitcoinj.core.Address; import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.WithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

7
core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
View file

@ -19,15 +19,17 @@ package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.account.AccountSettings; import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.LanguageUtil; import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; import org.bitcoinj.core.ECKey;
@ -39,9 +41,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

13
core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
View file

@ -24,17 +24,16 @@ import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import java.util.Locale; import io.bitsquare.viewfx.view.CachingViewLoader;
import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import java.util.Locale;
import javax.inject.Inject;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.*; import javafx.scene.*;

5
core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
View file

@ -20,14 +20,13 @@ package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.Locale; import java.util.Locale;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

7
core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
View file

@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.seedwords;
import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;

3
core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
View file

@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.seedwords;
import io.bitsquare.btc.WalletService; import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.List; import java.util.List;
import io.bitsquare.viewfx.model.ViewModel;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

9
core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View file

@ -27,16 +27,15 @@ import io.bitsquare.gui.main.account.content.registration.RegistrationView;
import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView; import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView; import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
import io.bitsquare.gui.util.Colors; import io.bitsquare.gui.util.Colors;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javax.inject.Inject; import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ViewPath; import io.bitsquare.viewfx.view.ViewPath;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Pos; import javafx.geometry.Pos;

9
core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
View file

@ -25,15 +25,14 @@ import io.bitsquare.gui.main.account.content.registration.RegistrationView;
import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView; import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView; import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
import io.bitsquare.gui.main.trade.BuyView; import io.bitsquare.gui.main.trade.BuyView;
import io.bitsquare.viewfx.view.ActivatableView;
import javax.inject.Inject; import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Insets; import javafx.geometry.Insets;

9
core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View file

@ -21,15 +21,14 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.funds.transactions.TransactionsView; import io.bitsquare.gui.main.funds.transactions.TransactionsView;
import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
import javax.inject.Inject;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

5
core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
View file

@ -21,6 +21,8 @@ import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import org.bitcoinj.core.Transaction; import org.bitcoinj.core.Transaction;
@ -29,9 +31,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

5
core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
View file

@ -25,6 +25,8 @@ import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
@ -38,9 +40,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

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

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.home; package io.bitsquare.gui.main.home;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.AbstractView; import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView;
// home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, // 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 // probably overview, event history, news, charts,... -> low prio

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

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.msg; package io.bitsquare.gui.main.msg;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.AbstractView; import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView;
// will be probably only used for arbitration communication, will be renamed and the icon changed // will be probably only used for arbitration communication, will be renamed and the icon changed
@FxmlView @FxmlView

9
core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View file

@ -23,15 +23,14 @@ import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
import io.bitsquare.gui.main.portfolio.offer.OffersView; import io.bitsquare.gui.main.portfolio.offer.OffersView;
import io.bitsquare.gui.main.portfolio.pending.PendingTradesView; import io.bitsquare.gui.main.portfolio.pending.PendingTradesView;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import javax.inject.Inject;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

5
core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
View file

@ -22,12 +22,11 @@ import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.inject.Inject;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import com.google.inject.Inject;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.MapChangeListener; import javafx.collections.MapChangeListener;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

5
core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
View file

@ -18,12 +18,11 @@
package io.bitsquare.gui.main.portfolio.closed; package io.bitsquare.gui.main.portfolio.closed;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

5
core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
View file

@ -18,12 +18,11 @@
package io.bitsquare.gui.main.portfolio.closed; package io.bitsquare.gui.main.portfolio.closed;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataModel> implements ViewModel { class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataModel> implements ViewModel {

5
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
View file

@ -26,6 +26,8 @@ import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
@ -39,9 +41,6 @@ import com.google.inject.Inject;
import java.util.Optional; import java.util.Optional;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

5
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
View file

@ -33,6 +33,8 @@ import io.bitsquare.gui.main.portfolio.PortfolioView;
import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView; import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat; import org.bitcoinj.utils.Fiat;
@ -43,9 +45,6 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;

5
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
View file

@ -22,6 +22,8 @@ import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.validation.BtcAddressValidator; import io.bitsquare.gui.util.validation.BtcAddressValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat; import org.bitcoinj.utils.Fiat;
@ -30,9 +32,6 @@ import com.google.inject.Inject;
import java.util.Date; import java.util.Date;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.InvalidationListener; import javafx.beans.InvalidationListener;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

9
core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View file

@ -22,15 +22,14 @@ import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.settings.application.PreferencesView; import io.bitsquare.gui.main.settings.application.PreferencesView;
import io.bitsquare.gui.main.settings.network.NetworkSettingsView; import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
import io.bitsquare.settings.Preferences; import io.bitsquare.settings.Preferences;
import javax.inject.Inject;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import javax.inject.Inject;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

5
core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
View file

@ -18,12 +18,11 @@
package io.bitsquare.gui.main.settings.application; package io.bitsquare.gui.main.settings.application;
import io.bitsquare.settings.Preferences; import io.bitsquare.settings.Preferences;
import com.google.inject.Inject;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import com.google.inject.Inject;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

6
core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
View file

@ -17,10 +17,10 @@
package io.bitsquare.gui.main.settings.application; package io.bitsquare.gui.main.settings.application;
import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import javax.inject.Inject;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

6
core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
View file

@ -17,10 +17,10 @@
package io.bitsquare.gui.main.settings.application; package io.bitsquare.gui.main.settings.application;
import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import com.google.inject.Inject;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

5
core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
View file

@ -19,12 +19,11 @@ package io.bitsquare.gui.main.settings.network;
import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.network.ClientNode; import io.bitsquare.network.ClientNode;
import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javax.inject.Inject;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

5
core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
View file

@ -18,12 +18,11 @@
package io.bitsquare.gui.main.trade; package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import javax.inject.Inject;
@FxmlView @FxmlView
public class BuyView extends TradeView { public class BuyView extends TradeView {

5
core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
View file

@ -18,12 +18,11 @@
package io.bitsquare.gui.main.trade; package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import javax.inject.Inject;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import javax.inject.Inject;
@FxmlView @FxmlView
public class SellView extends TradeView { public class SellView extends TradeView {

5
core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
View file

@ -31,6 +31,8 @@ import io.bitsquare.persistence.Persistence;
import io.bitsquare.settings.Preferences; import io.bitsquare.settings.Preferences;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
@ -41,9 +43,6 @@ import com.google.inject.Inject;
import java.util.Locale; import java.util.Locale;
import java.util.UUID; import java.util.UUID;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

5
core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
View file

@ -29,6 +29,8 @@ import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.handlers.ErrorMessageHandler; import io.bitsquare.util.handlers.ErrorMessageHandler;
import io.bitsquare.util.handlers.ResultHandler; import io.bitsquare.util.handlers.ResultHandler;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
@ -36,9 +38,6 @@ import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;

5
core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
View file

@ -25,15 +25,14 @@ import io.bitsquare.gui.util.validation.OptionalFiatValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.offer.Direction; import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat; import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;
import javafx.collections.transformation.SortedList; import javafx.collections.transformation.SortedList;

5
core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
View file

@ -26,6 +26,8 @@ import io.bitsquare.persistence.Persistence;
import io.bitsquare.settings.Preferences; import io.bitsquare.settings.Preferences;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
@ -33,9 +35,6 @@ import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

2
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
View file

@ -18,10 +18,10 @@
package io.bitsquare.network.tomp2p; package io.bitsquare.network.tomp2p;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.network.MessageBroker;
import io.bitsquare.network.BootstrapState; import io.bitsquare.network.BootstrapState;
import io.bitsquare.network.ClientNode; import io.bitsquare.network.ClientNode;
import io.bitsquare.network.ConnectionType; import io.bitsquare.network.ConnectionType;
import io.bitsquare.network.MessageBroker;
import io.bitsquare.network.NetworkException; import io.bitsquare.network.NetworkException;
import io.bitsquare.network.Node; import io.bitsquare.network.Node;

2
core/src/main/java/io/bitsquare/trade/TradeMessageService.java
View file

@ -20,8 +20,8 @@ package io.bitsquare.trade;
import io.bitsquare.network.Message; import io.bitsquare.network.Message;
import io.bitsquare.network.MessageBroker; import io.bitsquare.network.MessageBroker;
import io.bitsquare.network.Peer; import io.bitsquare.network.Peer;
import io.bitsquare.trade.listeners.GetPeerAddressListener;
import io.bitsquare.trade.handlers.MessageHandler; import io.bitsquare.trade.handlers.MessageHandler;
import io.bitsquare.trade.listeners.GetPeerAddressListener;
import io.bitsquare.trade.listeners.SendMessageListener; import io.bitsquare.trade.listeners.SendMessageListener;
import java.security.PublicKey; import java.security.PublicKey;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
View file

@ -25,7 +25,7 @@ import io.bitsquare.util.taskrunner.TaskRunner;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.*; import static com.google.common.base.Preconditions.checkNotNull;
import static io.bitsquare.util.Validator.*; import static io.bitsquare.util.Validator.*;
public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOffererModel> { public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOffererModel> {

2
core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.network.Peer;
import io.bitsquare.network.tomp2p.TomP2PNode; import io.bitsquare.network.tomp2p.TomP2PNode;
import io.bitsquare.network.tomp2p.TomP2PPeer; import io.bitsquare.network.tomp2p.TomP2PPeer;
import io.bitsquare.trade.TradeMessageService; import io.bitsquare.trade.TradeMessageService;
import io.bitsquare.trade.listeners.GetPeerAddressListener;
import io.bitsquare.trade.handlers.MessageHandler; import io.bitsquare.trade.handlers.MessageHandler;
import io.bitsquare.trade.listeners.GetPeerAddressListener;
import io.bitsquare.trade.listeners.SendMessageListener; import io.bitsquare.trade.listeners.SendMessageListener;
import io.bitsquare.user.User; import io.bitsquare.user.User;

2
core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
View file

@ -17,8 +17,6 @@
package io.bitsquare.viewfx.view; package io.bitsquare.viewfx.view;
import io.bitsquare.viewfx.view.View;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.*; import javafx.scene.*;

4
core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
View file

@ -17,14 +17,10 @@
package io.bitsquare.viewfx.view; package io.bitsquare.viewfx.view;
import io.bitsquare.viewfx.view.View;
import java.util.HashMap; import java.util.HashMap;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.ViewLoader;
public class CachingViewLoader implements ViewLoader { public class CachingViewLoader implements ViewLoader {
private final HashMap<Object, View> cache = new HashMap<>(); private final HashMap<Object, View> cache = new HashMap<>();

5
core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
View file

@ -20,6 +20,8 @@ package io.bitsquare.viewfx.view.fxml;
import io.bitsquare.viewfx.ViewfxException; import io.bitsquare.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader;
import java.io.IOException; import java.io.IOException;
@ -29,9 +31,6 @@ import java.util.ResourceBundle;
import javax.inject.Inject; import javax.inject.Inject;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;

4
core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
View file

@ -17,12 +17,12 @@
package io.bitsquare.viewfx.view.guice; package io.bitsquare.viewfx.view.guice;
import io.bitsquare.viewfx.view.ViewFactory;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.inject.Injector; import com.google.inject.Injector;
import io.bitsquare.viewfx.view.ViewFactory;
public class InjectorViewFactory implements ViewFactory { public class InjectorViewFactory implements ViewFactory {
private Injector injector; private Injector injector;

7
core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
View file

@ -18,14 +18,13 @@
package io.bitsquare.viewfx.view.fxml; package io.bitsquare.viewfx.view.fxml;
import io.bitsquare.viewfx.ViewfxException; import io.bitsquare.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.viewfx.view.View;
import java.util.ResourceBundle;
import io.bitsquare.viewfx.view.ViewFactory; import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.AbstractView;
import java.util.ResourceBundle;
import javafx.fxml.LoadException; import javafx.fxml.LoadException;