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

Add commons package, Refactored packages

Browse Source
This commit is contained in:
Manfred Karrer 2015-03-17 09:32:35 +01:00
parent 9a46ef7c4d
commit 6e9539dff8
178 changed files with 637 additions and 4258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/pom.xml
View File

@ -41,7 +41,7 @@
<minimizeJar>false</minimizeJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.bitsquare.app.gui.BitsquareAppMain</mainClass>
<mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
</transformer>
</transformers>
<filters>

12
core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java → core/src/main/java/io/bitsquare/app/BitsquareApp.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.app.gui;
package io.bitsquare.app;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.gui.SystemTray;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.MainView;
@ -26,10 +26,10 @@ import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;
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 io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
import com.google.common.base.Throwables;

4
core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java → core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
View File

@ -15,11 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.app.gui;
package io.bitsquare.app;
import io.bitsquare.BitsquareException;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.BitsquareExecutable;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.network.BootstrapNodes;
import io.bitsquare.network.Node;

10
core/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java → core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
View File

@ -15,12 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.app.gui;
package io.bitsquare.app;
import io.bitsquare.BitsquareModule;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.ArbitratorMessageModule;
import io.bitsquare.arbitrator.tomp2p.TomP2PArbitratorMessageModule;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitration.ArbitratorMessageModule;
import io.bitsquare.arbitration.tomp2p.TomP2PArbitratorMessageModule;
import io.bitsquare.btc.BitcoinModule;
import io.bitsquare.crypto.CryptoModule;
import io.bitsquare.gui.GuiModule;
@ -29,7 +29,7 @@ import io.bitsquare.network.tomp2p.TomP2PNetworkModule;
import io.bitsquare.offer.OfferModule;
import io.bitsquare.offer.tomp2p.TomP2POfferModule;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.settings.Preferences;
import io.bitsquare.user.Preferences;
import io.bitsquare.trade.TradeMessageModule;
import io.bitsquare.trade.tomp2p.TomP2PTradeMessageModule;
import io.bitsquare.user.User;

1
core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
View File

@ -18,7 +18,6 @@
package io.bitsquare.app;
import io.bitsquare.BitsquareException;
import io.bitsquare.app.gui.BitsquareAppMain;
import io.bitsquare.btc.UserAgent;
import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.main.MainView;

3
core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java → core/src/main/java/io/bitsquare/app/UpdateProcess.java
View File

@ -15,9 +15,8 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.app.gui;
package io.bitsquare.app;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.util.Utilities;
import com.google.inject.Inject;

2
core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java → core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.arbitrator;
package io.bitsquare.arbitration;
import org.bitcoinj.core.Coin;

2
core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java → core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageModule.java
View File

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

4
core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java → core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageService.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.arbitrator;
package io.bitsquare.arbitration;
import io.bitsquare.arbitrator.listeners.ArbitratorListener;
import io.bitsquare.arbitration.listeners.ArbitratorListener;
import java.util.Locale;
import java.util.concurrent.Executor;

2
core/src/main/java/io/bitsquare/arbitrator/Reputation.java → core/src/main/java/io/bitsquare/arbitration/Reputation.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.arbitrator;
package io.bitsquare.arbitration;
import java.io.Serializable;

4
core/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java → core/src/main/java/io/bitsquare/arbitration/listeners/ArbitratorListener.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.arbitrator.listeners;
package io.bitsquare.arbitration.listeners;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitration.Arbitrator;
import java.util.List;

6
core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java → core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageModule.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.arbitrator.tomp2p;
package io.bitsquare.arbitration.tomp2p;
import io.bitsquare.arbitrator.ArbitratorMessageModule;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitration.ArbitratorMessageModule;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.network.tomp2p.TomP2PNode;
import com.google.inject.Injector;

8
core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java → core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageService.java
View File

@ -15,11 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.arbitrator.tomp2p;
package io.bitsquare.arbitration.tomp2p;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.listeners.ArbitratorListener;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitration.listeners.ArbitratorListener;
import io.bitsquare.network.tomp2p.TomP2PNode;
import java.io.IOException;

6
core/src/main/java/io/bitsquare/btc/BlockChainService.java
View File

@ -17,7 +17,7 @@
package io.bitsquare.btc;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.fiat.FiatAccount;
import javax.inject.Inject;
@ -33,7 +33,7 @@ public class BlockChainService {
//TODO
@SuppressWarnings("SameReturnValue")
public boolean isAccountBlackListed(String accountId, BankAccount bankAccount) {
public boolean isAccountBlackListed(String accountId, FiatAccount fiatAccount) {
return false;
}
@ -69,7 +69,7 @@ public class BlockChainService {
}
@SuppressWarnings("SameReturnValue")
private boolean isBankAccountBlacklisted(BankAccount bankAccount) {
private boolean isBankAccountBlacklisted(FiatAccount fiatAccount) {
// TODO check if accountID is on blacklist
return false;
}

2
core/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java → core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.handlers;
package io.bitsquare.common.handlers;
/**
* For reporting error message only (UI)

2
core/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java → core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.handlers;
package io.bitsquare.common.handlers;
/**
* For reporting throwable objects only

2
core/src/main/java/io/bitsquare/util/handlers/FaultHandler.java → core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.handlers;
package io.bitsquare.common.handlers;
/**
* For reporting a description message and throwable

2
core/src/main/java/io/bitsquare/util/handlers/ResultHandler.java → core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.handlers;
package io.bitsquare.common.handlers;
public interface ResultHandler {
void handleResult();

2
core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java → core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.taskrunner;
package io.bitsquare.common.taskrunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java → core/src/main/java/io/bitsquare/common/taskrunner/SharedModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.taskrunner;
package io.bitsquare.common.taskrunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/src/main/java/io/bitsquare/util/taskrunner/Task.java → core/src/main/java/io/bitsquare/common/taskrunner/Task.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.taskrunner;
package io.bitsquare.common.taskrunner;
import io.bitsquare.btc.exceptions.SigningException;
import io.bitsquare.btc.exceptions.TransactionVerificationException;

6
core/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java → core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.util.taskrunner;
package io.bitsquare.common.taskrunner;
import io.bitsquare.util.handlers.ErrorMessageHandler;
import io.bitsquare.util.handlers.ResultHandler;
import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
import java.util.Arrays;
import java.util.Queue;

2
core/src/main/java/io/bitsquare/viewfx/ViewfxException.java → core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx;
package io.bitsquare.common.viewfx;
import static java.lang.String.format;

2
core/src/main/java/io/bitsquare/viewfx/model/Activatable.java → core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.model;
package io.bitsquare.common.viewfx.model;
public interface Activatable {

2
core/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java → core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.model;
package io.bitsquare.common.viewfx.model;
public abstract class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {

2
core/src/main/java/io/bitsquare/viewfx/model/DataModel.java → core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.model;
package io.bitsquare.common.viewfx.model;
public interface DataModel extends Model {
}

2
core/src/main/java/io/bitsquare/viewfx/model/Model.java → core/src/main/java/io/bitsquare/common/viewfx/model/Model.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.model;
package io.bitsquare.common.viewfx.model;
public interface Model {
}

2
core/src/main/java/io/bitsquare/viewfx/model/ViewModel.java → core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.model;
package io.bitsquare.common.viewfx.model;
public interface ViewModel extends Model {
}

2
core/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java → core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.model;
package io.bitsquare.common.viewfx.model;
import static com.google.common.base.Preconditions.checkNotNull;

2
core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java → core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import javafx.fxml.FXML;
import javafx.scene.*;

2
core/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java → core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import javafx.scene.*;

4
core/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java → core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.Activatable;
import javafx.scene.*;

2
core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java → core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import java.util.HashMap;

2
core/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java → core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import org.springframework.util.ClassUtils;

2
core/src/main/java/io/bitsquare/viewfx/view/FxmlView.java → core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import java.util.function.Function;

2
core/src/main/java/io/bitsquare/viewfx/view/InitializableView.java → core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import java.net.URL;

2
core/src/main/java/io/bitsquare/viewfx/view/View.java → core/src/main/java/io/bitsquare/common/viewfx/view/View.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import javafx.scene.*;

2
core/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java → core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import javafx.util.Callback;

2
core/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java → core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
public interface ViewLoader {
View load(Class<? extends View> viewClass);

2
core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java → core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
import java.util.ArrayList;
import java.util.Arrays;

2
core/src/main/java/io/bitsquare/viewfx/view/Wizard.java → core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view;
package io.bitsquare.common.viewfx.view;
public interface Wizard extends View {
void nextStep(Step currentStep);

12
core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java → core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java
View File

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view.fxml;
package io.bitsquare.common.viewfx.view.fxml;
import io.bitsquare.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.ViewfxException;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewFactory;
import io.bitsquare.common.viewfx.view.ViewLoader;
import java.io.IOException;

4
core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java → core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view.guice;
package io.bitsquare.common.viewfx.view.guice;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.common.viewfx.view.ViewFactory;
import com.google.common.base.Preconditions;

20
core/src/main/java/io/bitsquare/bank/BankAccount.java → core/src/main/java/io/bitsquare/fiat/FiatAccount.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.bank;
package io.bitsquare.fiat;
import io.bitsquare.locale.Country;
@ -27,10 +27,10 @@ import java.util.Objects;
import javax.annotation.concurrent.Immutable;
@Immutable
public class BankAccount implements Serializable {
public class FiatAccount implements Serializable {
private static final long serialVersionUID = 1792577576443221268L;
private final BankAccountType bankAccountType;
private final FiatAccountType fiatAccountType;
private final String accountPrimaryID; // like IBAN
private final String accountSecondaryID; // like BIC
private final String accountHolderName;
@ -47,9 +47,9 @@ public class BankAccount implements Serializable {
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
public BankAccount(BankAccountType bankAccountType, Currency currency, Country country, String nameOfBank,
public FiatAccount(FiatAccountType fiatAccountType, Currency currency, Country country, String nameOfBank,
String accountHolderName, String accountPrimaryID, String accountSecondaryID) {
this.bankAccountType = bankAccountType;
this.fiatAccountType = fiatAccountType;
this.currency = currency;
this.country = country;
this.nameOfBank = nameOfBank;
@ -75,8 +75,8 @@ public class BankAccount implements Serializable {
return accountHolderName;
}
public BankAccountType getBankAccountType() {
return bankAccountType;
public FiatAccountType getFiatAccountType() {
return fiatAccountType;
}
public Currency getCurrency() {
@ -108,17 +108,17 @@ public class BankAccount implements Serializable {
@Override
public boolean equals(Object obj) {
if (!(obj instanceof BankAccount)) return false;
if (!(obj instanceof FiatAccount)) return false;
if (obj == this) return true;
final BankAccount other = (BankAccount) obj;
final FiatAccount other = (FiatAccount) obj;
return nameOfBank.equals(other.getUid());
}
@Override
public String toString() {
return "BankAccount{" +
"bankAccountType=" + bankAccountType +
"bankAccountType=" + fiatAccountType +
", accountPrimaryID='" + accountPrimaryID + '\'' +
", accountSecondaryID='" + accountSecondaryID + '\'' +
", accountHolderName='" + accountHolderName + '\'' +

10
core/src/main/java/io/bitsquare/bank/BankAccountType.java → core/src/main/java/io/bitsquare/fiat/FiatAccountType.java
View File

@ -15,12 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.bank;
package io.bitsquare.fiat;
import java.util.ArrayList;
import java.util.Arrays;
public enum BankAccountType {
public enum FiatAccountType {
IRC("", ""),
SEPA("IBAN", "BIC"),
WIRE("primary ID", "secondary ID"),
@ -32,13 +32,13 @@ public enum BankAccountType {
private final String primaryId;
private final String secondaryId;
BankAccountType(String primaryId, String secondaryId) {
FiatAccountType(String primaryId, String secondaryId) {
this.primaryId = primaryId;
this.secondaryId = secondaryId;
}
public static ArrayList<BankAccountType> getAllBankAccountTypes() {
return new ArrayList<>(Arrays.asList(BankAccountType.values()));
public static ArrayList<FiatAccountType> getAllBankAccountTypes() {
return new ArrayList<>(Arrays.asList(FiatAccountType.values()));
}
public String getPrimaryId() {

10
core/src/main/java/io/bitsquare/gui/GuiModule.java
View File

@ -29,11 +29,11 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator;
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 io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.ViewFactory;
import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.fxml.FxmlViewLoader;
import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
import com.google.inject.Singleton;
import com.google.inject.name.Names;

4
core/src/main/java/io/bitsquare/gui/Navigation.java
View File

@ -20,8 +20,8 @@ package io.bitsquare.gui;
import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.trade.BuyView;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewPath;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewPath;
import com.google.inject.Inject;

14
core/src/main/java/io/bitsquare/gui/main/MainView.java
View File

@ -18,7 +18,7 @@
package io.bitsquare.gui.main;
import io.bitsquare.BitsquareException;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.Popups;
@ -32,11 +32,11 @@ import io.bitsquare.gui.main.settings.SettingsView;
import io.bitsquare.gui.main.trade.BuyView;
import io.bitsquare.gui.main.trade.SellView;
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 io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;
import javax.inject.Named;
@ -301,7 +301,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
}
private VBox createBankAccountComboBox() {
final ComboBox<BankAccount> comboBox = new ComboBox<>(model.getBankAccounts());
final ComboBox<FiatAccount> comboBox = new ComboBox<>(model.getBankAccounts());
comboBox.setLayoutY(12);
comboBox.setVisibleRowCount(5);
comboBox.setConverter(model.getBankAccountsConverter());

46
core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View File

@ -17,13 +17,13 @@
package io.bitsquare.gui.main;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.app.gui.UpdateProcess;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.app.UpdateProcess;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitration.Reputation;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter;
@ -37,7 +37,7 @@ import io.bitsquare.trade.TradeManager;
import io.bitsquare.trade.TradeMessageService;
import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
@ -91,7 +91,7 @@ class MainViewModel implements ViewModel {
final StringProperty bankAccountsComboBoxPrompt = new SimpleStringProperty();
final BooleanProperty bankAccountsComboBoxDisable = new SimpleBooleanProperty();
final ObjectProperty<BankAccount> currentBankAccount = new SimpleObjectProperty<>();
final ObjectProperty<FiatAccount> currentBankAccount = new SimpleObjectProperty<>();
final BooleanProperty showAppScreen = new SimpleBooleanProperty();
final StringProperty numPendingTradesAsString = new SimpleStringProperty();
@ -133,12 +133,12 @@ class MainViewModel implements ViewModel {
user.getCurrentBankAccount().addListener((observable, oldValue, newValue) -> persistence.write(user));
currentBankAccount.bind(user.currentBankAccountProperty());
user.getBankAccounts().addListener((ListChangeListener<BankAccount>) change -> {
user.getFiatAccounts().addListener((ListChangeListener<FiatAccount>) change -> {
bankAccountsComboBoxDisable.set(change.getList().isEmpty());
bankAccountsComboBoxPrompt.set(change.getList().isEmpty() ? "No accounts" : "");
});
bankAccountsComboBoxDisable.set(user.getBankAccounts().isEmpty());
bankAccountsComboBoxPrompt.set(user.getBankAccounts().isEmpty() ? "No accounts" : "");
bankAccountsComboBoxDisable.set(user.getFiatAccounts().isEmpty());
bankAccountsComboBoxPrompt.set(user.getFiatAccounts().isEmpty() ? "No accounts" : "");
}
public void restart() {
@ -218,14 +218,14 @@ class MainViewModel implements ViewModel {
// For alpha version
if (!user.isRegistered()) {
BankAccount bankAccount = new BankAccount(BankAccountType.IRC,
FiatAccount fiatAccount = new FiatAccount(FiatAccountType.IRC,
Currency.getInstance("EUR"),
CountryUtil.getDefaultCountry(),
"Demo (Name of bank)",
"Demo (Account holder name)",
"Demo (E.g. IBAN) ",
"Demo (E.g. BIC) ");
user.setBankAccount(bankAccount);
user.setBankAccount(fiatAccount);
persistence.write(user);
user.setAccountID(walletService.getRegistrationAddressEntry().toString());
@ -306,26 +306,26 @@ class MainViewModel implements ViewModel {
}
public StringConverter<BankAccount> getBankAccountsConverter() {
return new StringConverter<BankAccount>() {
public StringConverter<FiatAccount> getBankAccountsConverter() {
return new StringConverter<FiatAccount>() {
@Override
public String toString(BankAccount bankAccount) {
return bankAccount.getNameOfBank();
public String toString(FiatAccount fiatAccount) {
return fiatAccount.getNameOfBank();
}
@Override
public BankAccount fromString(String s) {
public FiatAccount fromString(String s) {
return null;
}
};
}
public ObservableList<BankAccount> getBankAccounts() {
return user.getBankAccounts();
public ObservableList<FiatAccount> getBankAccounts() {
return user.getFiatAccounts();
}
public void setCurrentBankAccount(BankAccount currentBankAccount) {
user.setCurrentBankAccount(currentBankAccount);
public void setCurrentBankAccount(FiatAccount currentFiatAccount) {
user.setCurrentBankAccount(currentFiatAccount);
}
private void updateNumPendingTrades() {

10
core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
View File

@ -22,11 +22,11 @@ import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView;
import io.bitsquare.gui.main.account.settings.AccountSettingsView;
import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
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 io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

2
core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
View File

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.account;
import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

10
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
View File

@ -18,11 +18,11 @@
package io.bitsquare.gui.main.account.arbitrator;
import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
import io.bitsquare.viewfx.view.AbstractView;
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 io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

18
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
View File

@ -17,18 +17,18 @@
package io.bitsquare.gui.main.account.arbitrator.browser;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.listeners.ArbitratorListener;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitration.listeners.ArbitratorListener;
import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
import io.bitsquare.locale.LanguageUtil;
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 io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import java.util.ArrayList;
import java.util.List;

6
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
View File

@ -17,10 +17,10 @@
package io.bitsquare.gui.main.account.arbitrator.profile;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject;

10
core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
View File

@ -17,9 +17,9 @@
package io.bitsquare.gui.main.account.arbitrator.registration;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitration.Reputation;
import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import io.bitsquare.gui.util.BSFormatter;
@ -29,8 +29,8 @@ import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;

6
core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
View File

@ -19,9 +19,9 @@ package io.bitsquare.gui.main.account.content.changepassword;
import io.bitsquare.gui.main.help.Help;
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 io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject;

2
core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.changepassword;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

52
core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
View File

@ -17,17 +17,17 @@
package io.bitsquare.gui.main.account.content.fiat;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.CurrencyUtil;
import io.bitsquare.locale.Region;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject;
@ -55,13 +55,13 @@ class FiatAccountDataModel implements Activatable, DataModel {
final StringProperty primaryIDPrompt = new SimpleStringProperty();
final StringProperty secondaryIDPrompt = new SimpleStringProperty();
final BooleanProperty countryNotInAcceptedCountriesList = new SimpleBooleanProperty();
final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<Country> country = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
final ObservableList<BankAccountType> allTypes = FXCollections.observableArrayList(BankAccountType
final ObservableList<FiatAccountType> allTypes = FXCollections.observableArrayList(FiatAccountType
.getAllBankAccountTypes());
final ObservableList<BankAccount> allBankAccounts = FXCollections.observableArrayList();
final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil
.getAllCurrencies());
final ObservableList<Region> allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions());
@ -77,7 +77,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
@Override
public void activate() {
allBankAccounts.setAll(user.getBankAccounts());
allFiatAccounts.setAll(user.getFiatAccounts());
}
@Override
@ -87,16 +87,16 @@ class FiatAccountDataModel implements Activatable, DataModel {
void saveBankAccount() {
BankAccount bankAccount = new BankAccount(type.get(),
FiatAccount fiatAccount = new FiatAccount(type.get(),
currency.get(),
country.get(),
title.get(),
holderName.get(),
primaryID.get(),
secondaryID.get());
user.setBankAccount(bankAccount);
user.setBankAccount(fiatAccount);
saveUser();
allBankAccounts.setAll(user.getBankAccounts());
allFiatAccounts.setAll(user.getFiatAccounts());
countryNotInAcceptedCountriesList.set(!accountSettings.getAcceptedCountries().contains(country.get()));
reset();
}
@ -104,7 +104,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
void removeBankAccount() {
user.removeCurrentBankAccount();
saveUser();
allBankAccounts.setAll(user.getBankAccounts());
allFiatAccounts.setAll(user.getFiatAccounts());
reset();
}
@ -116,21 +116,21 @@ class FiatAccountDataModel implements Activatable, DataModel {
countryNotInAcceptedCountriesList.set(false);
}
void selectBankAccount(BankAccount bankAccount) {
user.setCurrentBankAccount(bankAccount);
void selectBankAccount(FiatAccount fiatAccount) {
user.setCurrentBankAccount(fiatAccount);
persistence.write(user);
if (bankAccount != null) {
title.set(bankAccount.getNameOfBank());
holderName.set(bankAccount.getAccountHolderName());
primaryID.set(bankAccount.getAccountPrimaryID());
secondaryID.set(bankAccount.getAccountSecondaryID());
primaryIDPrompt.set(bankAccount.getBankAccountType().getPrimaryId());
secondaryIDPrompt.set(bankAccount.getBankAccountType().getSecondaryId());
if (fiatAccount != null) {
title.set(fiatAccount.getNameOfBank());
holderName.set(fiatAccount.getAccountHolderName());
primaryID.set(fiatAccount.getAccountPrimaryID());
secondaryID.set(fiatAccount.getAccountSecondaryID());
primaryIDPrompt.set(fiatAccount.getFiatAccountType().getPrimaryId());
secondaryIDPrompt.set(fiatAccount.getFiatAccountType().getSecondaryId());
type.set(bankAccount.getBankAccountType());
country.set(bankAccount.getCountry());
currency.set(bankAccount.getCurrency());
type.set(fiatAccount.getFiatAccountType());
country.set(fiatAccount.getCountry());
currency.set(fiatAccount.getCurrency());
}
else {
reset();
@ -143,7 +143,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
}
void setType(BankAccountType type) {
void setType(FiatAccountType type) {
this.type.set(type);
if (type != null) {

16
core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
View File

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.account.content.fiat;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.components.Popups;
@ -28,9 +28,9 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.Wizard;
import java.util.ArrayList;
import java.util.Currency;
@ -58,8 +58,8 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
@FXML ComboBox<Country> countryComboBox;
@FXML InputTextField nameOfBankTextField, holderNameTextField, primaryIDTextField, secondaryIDTextField;
@FXML Button saveButton, completedButton, removeBankAccountButton;
@FXML ComboBox<BankAccount> selectionComboBox;
@FXML ComboBox<BankAccountType> typesComboBox;
@FXML ComboBox<FiatAccount> selectionComboBox;
@FXML ComboBox<FiatAccountType> typesComboBox;
@FXML ComboBox<Currency> currencyComboBox;
private Wizard wizard;
@ -234,7 +234,7 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
}
});
model.getAllBankAccounts().addListener((ListChangeListener<BankAccount>) change ->
model.getAllBankAccounts().addListener((ListChangeListener<FiatAccount>) change ->
completedButton.setDisable(model.getAllBankAccounts().isEmpty()));
completedButton.setDisable(model.getAllBankAccounts().isEmpty());
}

44
core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
View File

@ -17,15 +17,15 @@
package io.bitsquare.gui.main.account.content.fiat;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;
@ -54,7 +54,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
final StringProperty selectionPrompt = new SimpleStringProperty();
final BooleanProperty selectionDisable = new SimpleBooleanProperty();
final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<Country> country = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
@ -87,7 +87,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
@Override
public void doActivate() {
dataModel.allBankAccounts.addListener((ListChangeListener<BankAccount>) change -> applyAllBankAccounts());
dataModel.allFiatAccounts.addListener((ListChangeListener<FiatAccount>) change -> applyAllBankAccounts());
applyAllBankAccounts();
}
@ -108,34 +108,34 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
dataModel.addCountryToAcceptedCountriesList();
}
void selectBankAccount(BankAccount bankAccount) {
dataModel.selectBankAccount(bankAccount);
void selectBankAccount(FiatAccount fiatAccount) {
dataModel.selectBankAccount(fiatAccount);
}
StringConverter<BankAccountType> getTypesConverter() {
return new StringConverter<BankAccountType>() {
StringConverter<FiatAccountType> getTypesConverter() {
return new StringConverter<FiatAccountType>() {
@Override
public String toString(BankAccountType TypeInfo) {
public String toString(FiatAccountType TypeInfo) {
return BSResources.get(TypeInfo.toString());
}
@Override
public BankAccountType fromString(String s) {
public FiatAccountType fromString(String s) {
return null;
}
};
}
StringConverter<BankAccount> getSelectionConverter() {
return new StringConverter<BankAccount>() {
StringConverter<FiatAccount> getSelectionConverter() {
return new StringConverter<FiatAccount>() {
@Override
public String toString(BankAccount bankAccount) {
return bankAccount.getNameOfBank();
public String toString(FiatAccount fiatAccount) {
return fiatAccount.getNameOfBank();
}
@Override
public BankAccount fromString(String s) {
public FiatAccount fromString(String s) {
return null;
}
};
@ -186,12 +186,12 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
}
ObservableList<BankAccountType> getAllTypes() {
ObservableList<FiatAccountType> getAllTypes() {
return dataModel.allTypes;
}
ObservableList<BankAccount> getAllBankAccounts() {
return dataModel.allBankAccounts;
ObservableList<FiatAccount> getAllBankAccounts() {
return dataModel.allFiatAccounts;
}
ObservableList<Currency> getAllCurrencies() {
@ -215,7 +215,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
}
void setType(BankAccountType type) {
void setType(FiatAccountType type) {
dataModel.setType(type);
validateInput();
}
@ -232,7 +232,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
private void applyAllBankAccounts() {
if (dataModel.allBankAccounts.isEmpty()) {
if (dataModel.allFiatAccounts.isEmpty()) {
selectionPrompt.set("No bank account available");
selectionDisable.set(true);
}

34
core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
View File

@ -17,20 +17,20 @@
package io.bitsquare.gui.main.account.content.irc;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitration.Reputation;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.CurrencyUtil;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
@ -57,13 +57,13 @@ class IrcAccountDataModel implements Activatable, DataModel {
private final Persistence persistence;
final StringProperty nickName = new SimpleStringProperty();
final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
final ObservableList<BankAccountType> allTypes =
FXCollections.observableArrayList(BankAccountType.getAllBankAccountTypes());
final ObservableList<FiatAccountType> allTypes =
FXCollections.observableArrayList(FiatAccountType.getAllBankAccountTypes());
final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencies());
final ObservableList<BankAccount> allBankAccounts = FXCollections.observableArrayList();
final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
@Inject
@ -80,7 +80,7 @@ class IrcAccountDataModel implements Activatable, DataModel {
@Override
public void activate() {
allBankAccounts.setAll(user.getBankAccounts());
allFiatAccounts.setAll(user.getFiatAccounts());
}
@Override
@ -89,20 +89,20 @@ class IrcAccountDataModel implements Activatable, DataModel {
}
void saveBankAccount() {
BankAccount bankAccount = new BankAccount(type.get(),
FiatAccount fiatAccount = new FiatAccount(type.get(),
currency.get(),
CountryUtil.getDefaultCountry(),
nickName.get(),
nickName.get(),
"irc",
"irc");
user.setBankAccount(bankAccount);
user.setBankAccount(fiatAccount);
saveUser();
allBankAccounts.setAll(user.getBankAccounts());
allFiatAccounts.setAll(user.getFiatAccounts());
reset();
}
void setType(BankAccountType type) {
void setType(FiatAccountType type) {
this.type.set(type);
}

20
core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
View File

@ -17,15 +17,15 @@
package io.bitsquare.gui.main.account.content.irc;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.Wizard;
import java.util.Currency;
@ -46,7 +46,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
@FXML HBox buttonsHBox;
@FXML InputTextField ircNickNameTextField;
@FXML Button saveButton;
@FXML ComboBox<BankAccountType> typesComboBox;
@FXML ComboBox<FiatAccountType> typesComboBox;
@FXML ComboBox<Currency> currencyComboBox;
private Wizard wizard;
@ -63,13 +63,13 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
typesComboBox.setItems(model.getAllTypes());
typesComboBox.setConverter(model.getTypesConverter());
// we use a custom cell for deactivating non IRC items, later we use the standard cell and the StringConverter
typesComboBox.setCellFactory(new Callback<ListView<BankAccountType>, ListCell<BankAccountType>>() {
typesComboBox.setCellFactory(new Callback<ListView<FiatAccountType>, ListCell<FiatAccountType>>() {
@Override
public ListCell<BankAccountType> call(ListView<BankAccountType> p) {
return new ListCell<BankAccountType>() {
public ListCell<FiatAccountType> call(ListView<FiatAccountType> p) {
return new ListCell<FiatAccountType>() {
@Override
protected void updateItem(BankAccountType item, boolean empty) {
protected void updateItem(FiatAccountType item, boolean empty) {
super.updateItem(item, empty);
setText(model.getBankAccountType(item));
@ -77,7 +77,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
if (item == null || empty) {
setGraphic(null);
}
else if (item != BankAccountType.IRC) {
else if (item != FiatAccountType.IRC) {
setOpacity(0.3);
setDisable(true);
}

24
core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
View File

@ -17,12 +17,12 @@
package io.bitsquare.gui.main.account.content.irc;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;
@ -43,7 +43,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
final StringProperty ircNickName = new SimpleStringProperty();
final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
@ -69,22 +69,22 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
return result;
}
StringConverter<BankAccountType> getTypesConverter() {
return new StringConverter<BankAccountType>() {
StringConverter<FiatAccountType> getTypesConverter() {
return new StringConverter<FiatAccountType>() {
@Override
public String toString(BankAccountType TypeInfo) {
public String toString(FiatAccountType TypeInfo) {
return BSResources.get(TypeInfo.toString());
}
@Override
public BankAccountType fromString(String s) {
public FiatAccountType fromString(String s) {
return null;
}
};
}
String getBankAccountType(BankAccountType bankAccountType) {
return bankAccountType != null ? BSResources.get(bankAccountType.toString()) : "";
String getBankAccountType(FiatAccountType fiatAccountType) {
return fiatAccountType != null ? BSResources.get(fiatAccountType.toString()) : "";
}
StringConverter<Currency> getCurrencyConverter() {
@ -102,7 +102,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
}
ObservableList<BankAccountType> getAllTypes() {
ObservableList<FiatAccountType> getAllTypes() {
return dataModel.allTypes;
}
@ -115,7 +115,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
}
void setType(BankAccountType type) {
void setType(FiatAccountType type) {
dataModel.setType(type);
validateInput();
}

6
core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
View File

@ -19,9 +19,9 @@ package io.bitsquare.gui.main.account.content.password;
import io.bitsquare.gui.main.help.Help;
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 io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject;

2
core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.password;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

2
core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
View File

@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException;

6
core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
View File

@ -24,9 +24,9 @@ import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.locale.BSResources;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.common.viewfx.view.Wizard;
import java.util.ArrayList;
import java.util.List;

4
core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
View File

@ -20,8 +20,8 @@ package io.bitsquare.gui.main.account.content.registration;
import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.BSResources;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.WithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.WithDataModel;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;

12
core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
View File

@ -17,10 +17,10 @@
package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitration.Reputation;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.LanguageUtil;
@ -28,8 +28,8 @@ import io.bitsquare.locale.Region;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;

14
core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
View File

@ -17,19 +17,19 @@
package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.gui.main.account.arbitrator.browser.ArbitratorBrowserView;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
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 io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.Wizard;
import java.util.Locale;

6
core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
View File

@ -17,11 +17,11 @@
package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

6
core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
View File

@ -19,9 +19,9 @@ package io.bitsquare.gui.main.account.content.seedwords;
import io.bitsquare.gui.main.help.Help;
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 io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject;

2
core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.seedwords;
import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

14
core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View File

@ -27,13 +27,13 @@ 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.seedwords.SeedWordsView;
import io.bitsquare.gui.util.Colors;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
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 io.bitsquare.viewfx.view.ViewPath;
import io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.ViewPath;
import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject;

12
core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
View File

@ -25,12 +25,12 @@ 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.seedwords.SeedWordsView;
import io.bitsquare.gui.main.trade.BuyView;
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 io.bitsquare.viewfx.view.Wizard;
import io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject;

6
core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
View File

@ -57,9 +57,9 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
import io.bitsquare.util.taskrunner.Task;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import java.util.Arrays;

12
core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View File

@ -21,12 +21,12 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.funds.transactions.TransactionsView;
import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
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.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
View File

@ -21,8 +21,8 @@ import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.Transaction;

4
core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
View File

@ -25,8 +25,8 @@ import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin;

4
core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
View File

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.home;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.common.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,
// probably overview, event history, news, charts,... -> low prio

4
core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
View File

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

12
core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View File

@ -23,12 +23,12 @@ import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
import io.bitsquare.gui.main.portfolio.offer.OffersView;
import io.bitsquare.gui.main.portfolio.pending.PendingTradesView;
import io.bitsquare.trade.TradeManager;
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.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
View File

@ -22,8 +22,8 @@ import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
View File

@ -18,8 +18,8 @@
package io.bitsquare.gui.main.portfolio.closed;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
View File

@ -18,8 +18,8 @@
package io.bitsquare.gui.main.portfolio.closed;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

8
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
View File

@ -22,10 +22,10 @@ import io.bitsquare.offer.Offer;
import io.bitsquare.offer.OpenOffer;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import io.bitsquare.util.handlers.ErrorMessageHandler;
import io.bitsquare.util.handlers.ResultHandler;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
View File

@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.offer;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.offer.Offer;
import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
View File

@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.offer;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.offer.Offer;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
View File

@ -26,8 +26,8 @@ import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin;

4
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
View File

@ -33,8 +33,8 @@ import io.bitsquare.gui.main.portfolio.PortfolioView;
import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
import io.bitsquare.locale.BSResources;
import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat;

12
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
View File

@ -22,8 +22,8 @@ import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.validation.BtcAddressValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Trade;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat;
@ -166,7 +166,7 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
// payment
String getPaymentMethod() {
return BSResources.get(dataModel.getTrade().getContract().getTakerBankAccount().getBankAccountType().toString());
return BSResources.get(dataModel.getTrade().getContract().getTakerFiatAccount().getFiatAccountType().toString());
}
String getFiatAmount() {
@ -174,15 +174,15 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
}
String getHolderName() {
return dataModel.getTrade().getContract().getTakerBankAccount().getAccountHolderName();
return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountHolderName();
}
String getPrimaryId() {
return dataModel.getTrade().getContract().getTakerBankAccount().getAccountPrimaryID();
return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountPrimaryID();
}
String getSecondaryId() {
return dataModel.getTrade().getContract().getTakerBankAccount().getAccountSecondaryID();
return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountSecondaryID();
}
// summary

14
core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View File

@ -21,13 +21,13 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.settings.application.PreferencesView;
import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
import io.bitsquare.settings.Preferences;
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.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.user.Preferences;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

6
core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
View File

@ -17,9 +17,9 @@
package io.bitsquare.gui.main.settings.application;
import io.bitsquare.settings.Preferences;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.user.Preferences;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
View File

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.settings.application;
import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
View File

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.settings.application;
import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel;
import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
View File

@ -19,8 +19,8 @@ package io.bitsquare.gui.main.settings.network;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.network.ClientNode;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
View File

@ -18,8 +18,8 @@
package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.Navigation;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

4
core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
View File

@ -18,8 +18,8 @@
package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.Navigation;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject;

6
core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
View File

@ -26,9 +26,9 @@ import io.bitsquare.gui.main.trade.offerbook.OfferBookView;
import io.bitsquare.gui.main.trade.takeoffer.TakeOfferView;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewLoader;
import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat;

24
core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
View File

@ -17,9 +17,9 @@
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.WalletService;
@ -28,11 +28,11 @@ import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.Country;
import io.bitsquare.offer.Direction;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.settings.Preferences;
import io.bitsquare.user.Preferences;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.ExchangeRate;
@ -272,13 +272,13 @@ class CreateOfferDataModel implements Activatable, DataModel {
return addressEntry;
}
private void applyBankAccount(BankAccount bankAccount) {
if (bankAccount != null) {
bankAccountType.set(bankAccount.getBankAccountType().toString());
bankAccountCurrency.set(bankAccount.getCurrency().getCurrencyCode());
bankAccountCounty.set(bankAccount.getCountry().getName());
private void applyBankAccount(FiatAccount fiatAccount) {
if (fiatAccount != null) {
bankAccountType.set(fiatAccount.getFiatAccountType().toString());
bankAccountCurrency.set(fiatAccount.getCurrency().getCurrencyCode());
bankAccountCounty.set(fiatAccount.getCountry().getName());
fiatCode.set(bankAccount.getCurrency().getCurrencyCode());
fiatCode.set(fiatAccount.getCurrency().getCurrencyCode());
}
}
}

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