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

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
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> <minimizeJar>false</minimizeJar>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.bitsquare.app.gui.BitsquareAppMain</mainClass> <mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
</transformer> </transformer>
</transformers> </transformers>
<filters> <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/>. * 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.SystemTray;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.MainView;
@ -26,10 +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.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.guice.InjectorViewFactory; import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
import com.google.common.base.Throwables; 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/>. * 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.BitsquareException;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.BitsquareExecutable;
import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.network.BootstrapNodes; import io.bitsquare.network.BootstrapNodes;
import io.bitsquare.network.Node; 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/>. * 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.BitsquareModule;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitrator.ArbitratorMessageModule; import io.bitsquare.arbitration.ArbitratorMessageModule;
import io.bitsquare.arbitrator.tomp2p.TomP2PArbitratorMessageModule; import io.bitsquare.arbitration.tomp2p.TomP2PArbitratorMessageModule;
import io.bitsquare.btc.BitcoinModule; import io.bitsquare.btc.BitcoinModule;
import io.bitsquare.crypto.CryptoModule; import io.bitsquare.crypto.CryptoModule;
import io.bitsquare.gui.GuiModule; import io.bitsquare.gui.GuiModule;
@ -29,7 +29,7 @@ import io.bitsquare.network.tomp2p.TomP2PNetworkModule;
import io.bitsquare.offer.OfferModule; import io.bitsquare.offer.OfferModule;
import io.bitsquare.offer.tomp2p.TomP2POfferModule; import io.bitsquare.offer.tomp2p.TomP2POfferModule;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.settings.Preferences; import io.bitsquare.user.Preferences;
import io.bitsquare.trade.TradeMessageModule; import io.bitsquare.trade.TradeMessageModule;
import io.bitsquare.trade.tomp2p.TomP2PTradeMessageModule; import io.bitsquare.trade.tomp2p.TomP2PTradeMessageModule;
import io.bitsquare.user.User; 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; package io.bitsquare.app;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.app.gui.BitsquareAppMain;
import io.bitsquare.btc.UserAgent; import io.bitsquare.btc.UserAgent;
import io.bitsquare.btc.WalletService; import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.main.MainView; 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/>. * 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 io.bitsquare.util.Utilities;
import com.google.inject.Inject; 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/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package io.bitsquare.arbitrator; package io.bitsquare.arbitration;
import org.bitcoinj.core.Coin; 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/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package io.bitsquare.arbitrator; package io.bitsquare.arbitration;
import io.bitsquare.BitsquareModule; 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/>. * 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.Locale;
import java.util.concurrent.Executor; 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/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package io.bitsquare.arbitrator; package io.bitsquare.arbitration;
import java.io.Serializable; 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/>. * 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; 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/>. * 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.arbitration.ArbitratorMessageModule;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.network.tomp2p.TomP2PNode; import io.bitsquare.network.tomp2p.TomP2PNode;
import com.google.inject.Injector; 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/>. * 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.arbitration.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitrator.listeners.ArbitratorListener; import io.bitsquare.arbitration.listeners.ArbitratorListener;
import io.bitsquare.network.tomp2p.TomP2PNode; import io.bitsquare.network.tomp2p.TomP2PNode;
import java.io.IOException; import java.io.IOException;

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

@ -17,7 +17,7 @@
package io.bitsquare.btc; package io.bitsquare.btc;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import javax.inject.Inject; import javax.inject.Inject;
@ -33,7 +33,7 @@ public class BlockChainService {
//TODO //TODO
@SuppressWarnings("SameReturnValue") @SuppressWarnings("SameReturnValue")
public boolean isAccountBlackListed(String accountId, BankAccount bankAccount) { public boolean isAccountBlackListed(String accountId, FiatAccount fiatAccount) {
return false; return false;
} }
@ -69,7 +69,7 @@ public class BlockChainService {
} }
@SuppressWarnings("SameReturnValue") @SuppressWarnings("SameReturnValue")
private boolean isBankAccountBlacklisted(BankAccount bankAccount) { private boolean isBankAccountBlacklisted(FiatAccount fiatAccount) {
// TODO check if accountID is on blacklist // TODO check if accountID is on blacklist
return false; 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/>. * 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) * 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/>. * 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 * 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/>. * 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 * 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/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package io.bitsquare.util.handlers; package io.bitsquare.common.handlers;
public interface ResultHandler { public interface ResultHandler {
void handleResult(); 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/>. * 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.Logger;
import org.slf4j.LoggerFactory; 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/>. * 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.Logger;
import org.slf4j.LoggerFactory; 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/>. * 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.SigningException;
import io.bitsquare.btc.exceptions.TransactionVerificationException; 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/>. * 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.common.handlers.ErrorMessageHandler;
import io.bitsquare.util.handlers.ResultHandler; import io.bitsquare.common.handlers.ResultHandler;
import java.util.Arrays; import java.util.Arrays;
import java.util.Queue; 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/>. * 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; 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/>. * 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 { 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/>. * 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 { 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/>. * 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 { 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/>. * 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 { 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/>. * 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 { 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/>. * 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; 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/>. * 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.fxml.FXML;
import javafx.scene.*; 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/>. * 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.*; 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/>. * 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.*; 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/>. * 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; 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/>. * 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; 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/>. * 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; 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/>. * 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; 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/>. * 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.*; 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/>. * 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; 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/>. * 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 { public interface ViewLoader {
View load(Class<? extends View> viewClass); 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/>. * 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.ArrayList;
import java.util.Arrays; 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/>. * 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 { public interface Wizard extends View {
void nextStep(Step currentStep); 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/>. * 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.common.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewFactory; import io.bitsquare.common.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import java.io.IOException; 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/>. * 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; 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/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package io.bitsquare.bank; package io.bitsquare.fiat;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
@ -27,10 +27,10 @@ import java.util.Objects;
import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.Immutable;
@Immutable @Immutable
public class BankAccount implements Serializable { public class FiatAccount implements Serializable {
private static final long serialVersionUID = 1792577576443221268L; private static final long serialVersionUID = 1792577576443221268L;
private final BankAccountType bankAccountType; private final FiatAccountType fiatAccountType;
private final String accountPrimaryID; // like IBAN private final String accountPrimaryID; // like IBAN
private final String accountSecondaryID; // like BIC private final String accountSecondaryID; // like BIC
private final String accountHolderName; private final String accountHolderName;
@ -47,9 +47,9 @@ public class BankAccount implements Serializable {
// Constructor // 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) { String accountHolderName, String accountPrimaryID, String accountSecondaryID) {
this.bankAccountType = bankAccountType; this.fiatAccountType = fiatAccountType;
this.currency = currency; this.currency = currency;
this.country = country; this.country = country;
this.nameOfBank = nameOfBank; this.nameOfBank = nameOfBank;
@ -75,8 +75,8 @@ public class BankAccount implements Serializable {
return accountHolderName; return accountHolderName;
} }
public BankAccountType getBankAccountType() { public FiatAccountType getFiatAccountType() {
return bankAccountType; return fiatAccountType;
} }
public Currency getCurrency() { public Currency getCurrency() {
@ -108,17 +108,17 @@ public class BankAccount implements Serializable {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!(obj instanceof BankAccount)) return false; if (!(obj instanceof FiatAccount)) return false;
if (obj == this) return true; if (obj == this) return true;
final BankAccount other = (BankAccount) obj; final FiatAccount other = (FiatAccount) obj;
return nameOfBank.equals(other.getUid()); return nameOfBank.equals(other.getUid());
} }
@Override @Override
public String toString() { public String toString() {
return "BankAccount{" + return "BankAccount{" +
"bankAccountType=" + bankAccountType + "bankAccountType=" + fiatAccountType +
", accountPrimaryID='" + accountPrimaryID + '\'' + ", accountPrimaryID='" + accountPrimaryID + '\'' +
", accountSecondaryID='" + accountSecondaryID + '\'' + ", accountSecondaryID='" + accountSecondaryID + '\'' +
", accountHolderName='" + accountHolderName + '\'' + ", 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/>. * 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.ArrayList;
import java.util.Arrays; import java.util.Arrays;
public enum BankAccountType { public enum FiatAccountType {
IRC("", ""), IRC("", ""),
SEPA("IBAN", "BIC"), SEPA("IBAN", "BIC"),
WIRE("primary ID", "secondary ID"), WIRE("primary ID", "secondary ID"),
@ -32,13 +32,13 @@ public enum BankAccountType {
private final String primaryId; private final String primaryId;
private final String secondaryId; private final String secondaryId;
BankAccountType(String primaryId, String secondaryId) { FiatAccountType(String primaryId, String secondaryId) {
this.primaryId = primaryId; this.primaryId = primaryId;
this.secondaryId = secondaryId; this.secondaryId = secondaryId;
} }
public static ArrayList<BankAccountType> getAllBankAccountTypes() { public static ArrayList<FiatAccountType> getAllBankAccountTypes() {
return new ArrayList<>(Arrays.asList(BankAccountType.values())); return new ArrayList<>(Arrays.asList(FiatAccountType.values()));
} }
public String getPrimaryId() { 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.gui.util.validation.PasswordValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.offer.OfferBook; import io.bitsquare.offer.OfferBook;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.ViewFactory; import io.bitsquare.common.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.fxml.FxmlViewLoader; import io.bitsquare.common.viewfx.view.fxml.FxmlViewLoader;
import io.bitsquare.viewfx.view.guice.InjectorViewFactory; import io.bitsquare.common.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;

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.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.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewPath; import io.bitsquare.common.viewfx.view.ViewPath;
import com.google.inject.Inject; 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; package io.bitsquare.gui.main;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.Popups; 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.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.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
@ -301,7 +301,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
} }
private VBox createBankAccountComboBox() { private VBox createBankAccountComboBox() {
final ComboBox<BankAccount> comboBox = new ComboBox<>(model.getBankAccounts()); final ComboBox<FiatAccount> comboBox = new ComboBox<>(model.getBankAccounts());
comboBox.setLayoutY(12); comboBox.setLayoutY(12);
comboBox.setVisibleRowCount(5); comboBox.setVisibleRowCount(5);
comboBox.setConverter(model.getBankAccountsConverter()); 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; package io.bitsquare.gui.main;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.app.gui.UpdateProcess; import io.bitsquare.app.UpdateProcess;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitration.Reputation;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.btc.WalletService; import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
@ -37,7 +37,7 @@ import io.bitsquare.trade.TradeManager;
import io.bitsquare.trade.TradeMessageService; import io.bitsquare.trade.TradeMessageService;
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.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; import org.bitcoinj.core.ECKey;
@ -91,7 +91,7 @@ class MainViewModel implements ViewModel {
final StringProperty bankAccountsComboBoxPrompt = new SimpleStringProperty(); final StringProperty bankAccountsComboBoxPrompt = new SimpleStringProperty();
final BooleanProperty bankAccountsComboBoxDisable = new SimpleBooleanProperty(); final BooleanProperty bankAccountsComboBoxDisable = new SimpleBooleanProperty();
final ObjectProperty<BankAccount> currentBankAccount = new SimpleObjectProperty<>(); final ObjectProperty<FiatAccount> currentBankAccount = new SimpleObjectProperty<>();
final BooleanProperty showAppScreen = new SimpleBooleanProperty(); final BooleanProperty showAppScreen = new SimpleBooleanProperty();
final StringProperty numPendingTradesAsString = new SimpleStringProperty(); final StringProperty numPendingTradesAsString = new SimpleStringProperty();
@ -133,12 +133,12 @@ class MainViewModel implements ViewModel {
user.getCurrentBankAccount().addListener((observable, oldValue, newValue) -> persistence.write(user)); user.getCurrentBankAccount().addListener((observable, oldValue, newValue) -> persistence.write(user));
currentBankAccount.bind(user.currentBankAccountProperty()); currentBankAccount.bind(user.currentBankAccountProperty());
user.getBankAccounts().addListener((ListChangeListener<BankAccount>) change -> { user.getFiatAccounts().addListener((ListChangeListener<FiatAccount>) change -> {
bankAccountsComboBoxDisable.set(change.getList().isEmpty()); bankAccountsComboBoxDisable.set(change.getList().isEmpty());
bankAccountsComboBoxPrompt.set(change.getList().isEmpty() ? "No accounts" : ""); bankAccountsComboBoxPrompt.set(change.getList().isEmpty() ? "No accounts" : "");
}); });
bankAccountsComboBoxDisable.set(user.getBankAccounts().isEmpty()); bankAccountsComboBoxDisable.set(user.getFiatAccounts().isEmpty());
bankAccountsComboBoxPrompt.set(user.getBankAccounts().isEmpty() ? "No accounts" : ""); bankAccountsComboBoxPrompt.set(user.getFiatAccounts().isEmpty() ? "No accounts" : "");
} }
public void restart() { public void restart() {
@ -218,14 +218,14 @@ class MainViewModel implements ViewModel {
// For alpha version // For alpha version
if (!user.isRegistered()) { if (!user.isRegistered()) {
BankAccount bankAccount = new BankAccount(BankAccountType.IRC, FiatAccount fiatAccount = new FiatAccount(FiatAccountType.IRC,
Currency.getInstance("EUR"), Currency.getInstance("EUR"),
CountryUtil.getDefaultCountry(), CountryUtil.getDefaultCountry(),
"Demo (Name of bank)", "Demo (Name of bank)",
"Demo (Account holder name)", "Demo (Account holder name)",
"Demo (E.g. IBAN) ", "Demo (E.g. IBAN) ",
"Demo (E.g. BIC) "); "Demo (E.g. BIC) ");
user.setBankAccount(bankAccount); user.setBankAccount(fiatAccount);
persistence.write(user); persistence.write(user);
user.setAccountID(walletService.getRegistrationAddressEntry().toString()); user.setAccountID(walletService.getRegistrationAddressEntry().toString());
@ -306,26 +306,26 @@ class MainViewModel implements ViewModel {
} }
public StringConverter<BankAccount> getBankAccountsConverter() { public StringConverter<FiatAccount> getBankAccountsConverter() {
return new StringConverter<BankAccount>() { return new StringConverter<FiatAccount>() {
@Override @Override
public String toString(BankAccount bankAccount) { public String toString(FiatAccount fiatAccount) {
return bankAccount.getNameOfBank(); return fiatAccount.getNameOfBank();
} }
@Override @Override
public BankAccount fromString(String s) { public FiatAccount fromString(String s) {
return null; return null;
} }
}; };
} }
public ObservableList<BankAccount> getBankAccounts() { public ObservableList<FiatAccount> getBankAccounts() {
return user.getBankAccounts(); return user.getFiatAccounts();
} }
public void setCurrentBankAccount(BankAccount currentBankAccount) { public void setCurrentBankAccount(FiatAccount currentFiatAccount) {
user.setCurrentBankAccount(currentBankAccount); user.setCurrentBankAccount(currentFiatAccount);
} }
private void updateNumPendingTrades() { 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.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 io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.account;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; 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; 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 io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.account.arbitrator.browser;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitrator.listeners.ArbitratorListener; import io.bitsquare.arbitration.listeners.ArbitratorListener;
import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView; import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
import io.bitsquare.locale.LanguageUtil; import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.viewfx.view.ActivatableView; import io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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; 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.gui.util.BSFormatter;
import io.bitsquare.viewfx.view.AbstractView; import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.account.arbitrator.registration;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitration.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;
@ -29,8 +29,8 @@ 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.common.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; 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.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject; 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.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator; 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; 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; package io.bitsquare.gui.main.account.content.fiat;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.CurrencyUtil; 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.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -55,13 +55,13 @@ class FiatAccountDataModel implements Activatable, DataModel {
final StringProperty primaryIDPrompt = new SimpleStringProperty(); final StringProperty primaryIDPrompt = new SimpleStringProperty();
final StringProperty secondaryIDPrompt = new SimpleStringProperty(); final StringProperty secondaryIDPrompt = new SimpleStringProperty();
final BooleanProperty countryNotInAcceptedCountriesList = new SimpleBooleanProperty(); 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<Country> country = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>(); final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
final ObservableList<BankAccountType> allTypes = FXCollections.observableArrayList(BankAccountType final ObservableList<FiatAccountType> allTypes = FXCollections.observableArrayList(FiatAccountType
.getAllBankAccountTypes()); .getAllBankAccountTypes());
final ObservableList<BankAccount> allBankAccounts = FXCollections.observableArrayList(); final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil
.getAllCurrencies()); .getAllCurrencies());
final ObservableList<Region> allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); final ObservableList<Region> allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions());
@ -77,7 +77,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
@Override @Override
public void activate() { public void activate() {
allBankAccounts.setAll(user.getBankAccounts()); allFiatAccounts.setAll(user.getFiatAccounts());
} }
@Override @Override
@ -87,16 +87,16 @@ class FiatAccountDataModel implements Activatable, DataModel {
void saveBankAccount() { void saveBankAccount() {
BankAccount bankAccount = new BankAccount(type.get(), FiatAccount fiatAccount = new FiatAccount(type.get(),
currency.get(), currency.get(),
country.get(), country.get(),
title.get(), title.get(),
holderName.get(), holderName.get(),
primaryID.get(), primaryID.get(),
secondaryID.get()); secondaryID.get());
user.setBankAccount(bankAccount); user.setBankAccount(fiatAccount);
saveUser(); saveUser();
allBankAccounts.setAll(user.getBankAccounts()); allFiatAccounts.setAll(user.getFiatAccounts());
countryNotInAcceptedCountriesList.set(!accountSettings.getAcceptedCountries().contains(country.get())); countryNotInAcceptedCountriesList.set(!accountSettings.getAcceptedCountries().contains(country.get()));
reset(); reset();
} }
@ -104,7 +104,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
void removeBankAccount() { void removeBankAccount() {
user.removeCurrentBankAccount(); user.removeCurrentBankAccount();
saveUser(); saveUser();
allBankAccounts.setAll(user.getBankAccounts()); allFiatAccounts.setAll(user.getFiatAccounts());
reset(); reset();
} }
@ -116,21 +116,21 @@ class FiatAccountDataModel implements Activatable, DataModel {
countryNotInAcceptedCountriesList.set(false); countryNotInAcceptedCountriesList.set(false);
} }
void selectBankAccount(BankAccount bankAccount) { void selectBankAccount(FiatAccount fiatAccount) {
user.setCurrentBankAccount(bankAccount); user.setCurrentBankAccount(fiatAccount);
persistence.write(user); persistence.write(user);
if (bankAccount != null) { if (fiatAccount != null) {
title.set(bankAccount.getNameOfBank()); title.set(fiatAccount.getNameOfBank());
holderName.set(bankAccount.getAccountHolderName()); holderName.set(fiatAccount.getAccountHolderName());
primaryID.set(bankAccount.getAccountPrimaryID()); primaryID.set(fiatAccount.getAccountPrimaryID());
secondaryID.set(bankAccount.getAccountSecondaryID()); secondaryID.set(fiatAccount.getAccountSecondaryID());
primaryIDPrompt.set(bankAccount.getBankAccountType().getPrimaryId()); primaryIDPrompt.set(fiatAccount.getFiatAccountType().getPrimaryId());
secondaryIDPrompt.set(bankAccount.getBankAccountType().getSecondaryId()); secondaryIDPrompt.set(fiatAccount.getFiatAccountType().getSecondaryId());
type.set(bankAccount.getBankAccountType()); type.set(fiatAccount.getFiatAccountType());
country.set(bankAccount.getCountry()); country.set(fiatAccount.getCountry());
currency.set(bankAccount.getCurrency()); currency.set(fiatAccount.getCurrency());
} }
else { else {
reset(); reset();
@ -143,7 +143,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
} }
void setType(BankAccountType type) { void setType(FiatAccountType type) {
this.type.set(type); this.type.set(type);
if (type != null) { 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; package io.bitsquare.gui.main.account.content.fiat;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.components.Popups; 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.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.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Currency; import java.util.Currency;
@ -58,8 +58,8 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
@FXML ComboBox<Country> countryComboBox; @FXML ComboBox<Country> countryComboBox;
@FXML InputTextField nameOfBankTextField, holderNameTextField, primaryIDTextField, secondaryIDTextField; @FXML InputTextField nameOfBankTextField, holderNameTextField, primaryIDTextField, secondaryIDTextField;
@FXML Button saveButton, completedButton, removeBankAccountButton; @FXML Button saveButton, completedButton, removeBankAccountButton;
@FXML ComboBox<BankAccount> selectionComboBox; @FXML ComboBox<FiatAccount> selectionComboBox;
@FXML ComboBox<BankAccountType> typesComboBox; @FXML ComboBox<FiatAccountType> typesComboBox;
@FXML ComboBox<Currency> currencyComboBox; @FXML ComboBox<Currency> currencyComboBox;
private Wizard wizard; 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()));
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; package io.bitsquare.gui.main.account.content.fiat;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.fiat.FiatAccountType;
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.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.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -54,7 +54,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
final StringProperty selectionPrompt = new SimpleStringProperty(); final StringProperty selectionPrompt = new SimpleStringProperty();
final BooleanProperty selectionDisable = new SimpleBooleanProperty(); final BooleanProperty selectionDisable = new SimpleBooleanProperty();
final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true); 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<Country> country = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>(); final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
@ -87,7 +87,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
@Override @Override
public void doActivate() { public void doActivate() {
dataModel.allBankAccounts.addListener((ListChangeListener<BankAccount>) change -> applyAllBankAccounts()); dataModel.allFiatAccounts.addListener((ListChangeListener<FiatAccount>) change -> applyAllBankAccounts());
applyAllBankAccounts(); applyAllBankAccounts();
} }
@ -108,34 +108,34 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
dataModel.addCountryToAcceptedCountriesList(); dataModel.addCountryToAcceptedCountriesList();
} }
void selectBankAccount(BankAccount bankAccount) { void selectBankAccount(FiatAccount fiatAccount) {
dataModel.selectBankAccount(bankAccount); dataModel.selectBankAccount(fiatAccount);
} }
StringConverter<BankAccountType> getTypesConverter() { StringConverter<FiatAccountType> getTypesConverter() {
return new StringConverter<BankAccountType>() { return new StringConverter<FiatAccountType>() {
@Override @Override
public String toString(BankAccountType TypeInfo) { public String toString(FiatAccountType TypeInfo) {
return BSResources.get(TypeInfo.toString()); return BSResources.get(TypeInfo.toString());
} }
@Override @Override
public BankAccountType fromString(String s) { public FiatAccountType fromString(String s) {
return null; return null;
} }
}; };
} }
StringConverter<BankAccount> getSelectionConverter() { StringConverter<FiatAccount> getSelectionConverter() {
return new StringConverter<BankAccount>() { return new StringConverter<FiatAccount>() {
@Override @Override
public String toString(BankAccount bankAccount) { public String toString(FiatAccount fiatAccount) {
return bankAccount.getNameOfBank(); return fiatAccount.getNameOfBank();
} }
@Override @Override
public BankAccount fromString(String s) { public FiatAccount fromString(String s) {
return null; return null;
} }
}; };
@ -186,12 +186,12 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
} }
ObservableList<BankAccountType> getAllTypes() { ObservableList<FiatAccountType> getAllTypes() {
return dataModel.allTypes; return dataModel.allTypes;
} }
ObservableList<BankAccount> getAllBankAccounts() { ObservableList<FiatAccount> getAllBankAccounts() {
return dataModel.allBankAccounts; return dataModel.allFiatAccounts;
} }
ObservableList<Currency> getAllCurrencies() { ObservableList<Currency> getAllCurrencies() {
@ -215,7 +215,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
} }
void setType(BankAccountType type) { void setType(FiatAccountType type) {
dataModel.setType(type); dataModel.setType(type);
validateInput(); validateInput();
} }
@ -232,7 +232,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
private void applyAllBankAccounts() { private void applyAllBankAccounts() {
if (dataModel.allBankAccounts.isEmpty()) { if (dataModel.allFiatAccounts.isEmpty()) {
selectionPrompt.set("No bank account available"); selectionPrompt.set("No bank account available");
selectionDisable.set(true); 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; package io.bitsquare.gui.main.account.content.irc;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitration.Reputation;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.fiat.FiatAccountType;
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.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.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; import org.bitcoinj.core.ECKey;
@ -57,13 +57,13 @@ class IrcAccountDataModel implements Activatable, DataModel {
private final Persistence persistence; private final Persistence persistence;
final StringProperty nickName = new SimpleStringProperty(); final StringProperty nickName = new SimpleStringProperty();
final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>(); final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>(); final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
final ObservableList<BankAccountType> allTypes = final ObservableList<FiatAccountType> allTypes =
FXCollections.observableArrayList(BankAccountType.getAllBankAccountTypes()); FXCollections.observableArrayList(FiatAccountType.getAllBankAccountTypes());
final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencies()); final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencies());
final ObservableList<BankAccount> allBankAccounts = FXCollections.observableArrayList(); final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
@Inject @Inject
@ -80,7 +80,7 @@ class IrcAccountDataModel implements Activatable, DataModel {
@Override @Override
public void activate() { public void activate() {
allBankAccounts.setAll(user.getBankAccounts()); allFiatAccounts.setAll(user.getFiatAccounts());
} }
@Override @Override
@ -89,20 +89,20 @@ class IrcAccountDataModel implements Activatable, DataModel {
} }
void saveBankAccount() { void saveBankAccount() {
BankAccount bankAccount = new BankAccount(type.get(), FiatAccount fiatAccount = new FiatAccount(type.get(),
currency.get(), currency.get(),
CountryUtil.getDefaultCountry(), CountryUtil.getDefaultCountry(),
nickName.get(), nickName.get(),
nickName.get(), nickName.get(),
"irc", "irc",
"irc"); "irc");
user.setBankAccount(bankAccount); user.setBankAccount(fiatAccount);
saveUser(); saveUser();
allBankAccounts.setAll(user.getBankAccounts()); allFiatAccounts.setAll(user.getFiatAccounts());
reset(); reset();
} }
void setType(BankAccountType type) { void setType(FiatAccountType type) {
this.type.set(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; 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.InputTextField;
import io.bitsquare.gui.components.Popups; 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.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import java.util.Currency; import java.util.Currency;
@ -46,7 +46,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
@FXML HBox buttonsHBox; @FXML HBox buttonsHBox;
@FXML InputTextField ircNickNameTextField; @FXML InputTextField ircNickNameTextField;
@FXML Button saveButton; @FXML Button saveButton;
@FXML ComboBox<BankAccountType> typesComboBox; @FXML ComboBox<FiatAccountType> typesComboBox;
@FXML ComboBox<Currency> currencyComboBox; @FXML ComboBox<Currency> currencyComboBox;
private Wizard wizard; private Wizard wizard;
@ -63,13 +63,13 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
typesComboBox.setItems(model.getAllTypes()); typesComboBox.setItems(model.getAllTypes());
typesComboBox.setConverter(model.getTypesConverter()); typesComboBox.setConverter(model.getTypesConverter());
// we use a custom cell for deactivating non IRC items, later we use the standard cell and the StringConverter // 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 @Override
public ListCell<BankAccountType> call(ListView<BankAccountType> p) { public ListCell<FiatAccountType> call(ListView<FiatAccountType> p) {
return new ListCell<BankAccountType>() { return new ListCell<FiatAccountType>() {
@Override @Override
protected void updateItem(BankAccountType item, boolean empty) { protected void updateItem(FiatAccountType item, boolean empty) {
super.updateItem(item, empty); super.updateItem(item, empty);
setText(model.getBankAccountType(item)); setText(model.getBankAccountType(item));
@ -77,7 +77,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
if (item == null || empty) { if (item == null || empty) {
setGraphic(null); setGraphic(null);
} }
else if (item != BankAccountType.IRC) { else if (item != FiatAccountType.IRC) {
setOpacity(0.3); setOpacity(0.3);
setDisable(true); 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; 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.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.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -43,7 +43,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
final StringProperty ircNickName = new SimpleStringProperty(); final StringProperty ircNickName = new SimpleStringProperty();
final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true); final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>(); final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
final ObjectProperty<Currency> currency = new SimpleObjectProperty<>(); final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
@ -69,22 +69,22 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
return result; return result;
} }
StringConverter<BankAccountType> getTypesConverter() { StringConverter<FiatAccountType> getTypesConverter() {
return new StringConverter<BankAccountType>() { return new StringConverter<FiatAccountType>() {
@Override @Override
public String toString(BankAccountType TypeInfo) { public String toString(FiatAccountType TypeInfo) {
return BSResources.get(TypeInfo.toString()); return BSResources.get(TypeInfo.toString());
} }
@Override @Override
public BankAccountType fromString(String s) { public FiatAccountType fromString(String s) {
return null; return null;
} }
}; };
} }
String getBankAccountType(BankAccountType bankAccountType) { String getBankAccountType(FiatAccountType fiatAccountType) {
return bankAccountType != null ? BSResources.get(bankAccountType.toString()) : ""; return fiatAccountType != null ? BSResources.get(fiatAccountType.toString()) : "";
} }
StringConverter<Currency> getCurrencyConverter() { StringConverter<Currency> getCurrencyConverter() {
@ -102,7 +102,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
} }
ObservableList<BankAccountType> getAllTypes() { ObservableList<FiatAccountType> getAllTypes() {
return dataModel.allTypes; return dataModel.allTypes;
} }
@ -115,7 +115,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
} }
void setType(BankAccountType type) { void setType(FiatAccountType type) {
dataModel.setType(type); dataModel.setType(type);
validateInput(); 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.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject; 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.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator; 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; 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.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 io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException; 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.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.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.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.common.viewfx.model.ViewModel;
import io.bitsquare.viewfx.model.WithDataModel; import io.bitsquare.common.viewfx.model.WithDataModel;
import org.bitcoinj.core.Address; import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin; 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; package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitrator.ArbitratorMessageService; import io.bitsquare.arbitration.ArbitratorMessageService;
import io.bitsquare.arbitrator.Reputation; import io.bitsquare.arbitration.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;
@ -28,8 +28,8 @@ 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.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey; 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; 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.account.arbitrator.browser.ArbitratorBrowserView;
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.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 io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import java.util.Locale; 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; 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.Country;
import io.bitsquare.locale.Region; import io.bitsquare.locale.Region;
import io.bitsquare.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; 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.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject; 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.btc.WalletService;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; 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.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 io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.ViewPath; import io.bitsquare.common.viewfx.view.ViewPath;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject; 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.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 io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import io.bitsquare.viewfx.view.Wizard; import io.bitsquare.common.viewfx.view.Wizard;
import javax.inject.Inject; 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.TakerCreatesAndSignsDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
import io.bitsquare.util.taskrunner.Task; import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import java.util.Arrays; 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.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 io.bitsquare.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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.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.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.Transaction; 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.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.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin; 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; package io.bitsquare.gui.main.home;
import io.bitsquare.viewfx.view.AbstractView; import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView; 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, // 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

4
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.AbstractView; import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.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

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.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 io.bitsquare.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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.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.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject; 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; 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.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject; 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; 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.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; 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.offer.OpenOffer;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.util.handlers.ResultHandler; import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject; 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.gui.components.Popups;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import io.bitsquare.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject; 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.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
import io.bitsquare.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; 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.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.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin; 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.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.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat; 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.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.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat; import org.bitcoinj.utils.Fiat;
@ -166,7 +166,7 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
// payment // payment
String getPaymentMethod() { String getPaymentMethod() {
return BSResources.get(dataModel.getTrade().getContract().getTakerBankAccount().getBankAccountType().toString()); return BSResources.get(dataModel.getTrade().getContract().getTakerFiatAccount().getFiatAccountType().toString());
} }
String getFiatAmount() { String getFiatAmount() {
@ -174,15 +174,15 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
} }
String getHolderName() { String getHolderName() {
return dataModel.getTrade().getContract().getTakerBankAccount().getAccountHolderName(); return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountHolderName();
} }
String getPrimaryId() { String getPrimaryId() {
return dataModel.getTrade().getContract().getTakerBankAccount().getAccountPrimaryID(); return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountPrimaryID();
} }
String getSecondaryId() { String getSecondaryId() {
return dataModel.getTrade().getContract().getTakerBankAccount().getAccountSecondaryID(); return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountSecondaryID();
} }
// summary // 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.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.user.Preferences;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.CachingViewLoader; import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.settings.application;
import io.bitsquare.settings.Preferences; import io.bitsquare.user.Preferences;
import io.bitsquare.viewfx.model.Activatable; import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import com.google.inject.Inject; 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; package io.bitsquare.gui.main.settings.application;
import io.bitsquare.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.settings.application;
import io.bitsquare.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
import io.bitsquare.viewfx.model.ViewModel; import io.bitsquare.common.viewfx.model.ViewModel;
import com.google.inject.Inject; 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.btc.BitcoinNetwork;
import io.bitsquare.network.ClientNode; import io.bitsquare.network.ClientNode;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.InitializableView; import io.bitsquare.common.viewfx.view.InitializableView;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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; package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.viewfx.view.FxmlView; import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import javax.inject.Inject; 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.gui.main.trade.takeoffer.TakeOfferView;
import io.bitsquare.offer.Direction; import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
import io.bitsquare.viewfx.view.ActivatableView; import io.bitsquare.common.viewfx.view.ActivatableView;
import io.bitsquare.viewfx.view.View; import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewLoader; import io.bitsquare.common.viewfx.view.ViewLoader;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat; 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; package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.account.AccountSettings; import io.bitsquare.user.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.bank.BankAccount; import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.WalletService; import io.bitsquare.btc.WalletService;
@ -28,11 +28,11 @@ import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.offer.Direction; import io.bitsquare.offer.Direction;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.settings.Preferences; import io.bitsquare.user.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.common.viewfx.model.Activatable;
import io.bitsquare.viewfx.model.DataModel; import io.bitsquare.common.viewfx.model.DataModel;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
@ -272,13 +272,13 @@ class CreateOfferDataModel implements Activatable, DataModel {
return addressEntry; return addressEntry;
} }
private void applyBankAccount(BankAccount bankAccount) { private void applyBankAccount(FiatAccount fiatAccount) {
if (bankAccount != null) { if (fiatAccount != null) {
bankAccountType.set(bankAccount.getBankAccountType().toString()); bankAccountType.set(fiatAccount.getFiatAccountType().toString());
bankAccountCurrency.set(bankAccount.getCurrency().getCurrencyCode()); bankAccountCurrency.set(fiatAccount.getCurrency().getCurrencyCode());
bankAccountCounty.set(bankAccount.getCountry().getName()); 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