diff --git a/README.md b/README.md index 8058079267..dc764375ed 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ You can read about all of this and more in the [whitepaper](https://bitsquare.io Status ------ -Alpha and under heavy development. +The software is Alpha version and still under heavy development. +For the latest version checkout our [release page](https://github.com/bitsquare/bitsquare/releases) at Github. Building from source -------------------- diff --git a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java index 5c0ed58677..490009f9a5 100644 --- a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java +++ b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java @@ -18,12 +18,10 @@ package io.bitsquare.app; import io.bitsquare.BitsquareException; -import io.bitsquare.app.gui.BitsquareAppMain; import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.RegTestHost; import io.bitsquare.btc.UserAgent; import io.bitsquare.btc.WalletService; -import io.bitsquare.gui.main.MainView; import io.bitsquare.p2p.BootstrapNodes; import io.bitsquare.p2p.tomp2p.TomP2PModule; import io.bitsquare.storage.Storage; @@ -69,15 +67,15 @@ public class BitsquareEnvironment extends StandardEnvironment { private final ResourceLoader resourceLoader = new DefaultResourceLoader(); - private final String appName; - private final String appDataDir; - private final String bootstrapNodePort; + protected final String appName; + protected final String appDataDir; + protected final String bootstrapNodePort; public BitsquareEnvironment(OptionSet options) { this(new JOptCommandLinePropertySource(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(options))); } - BitsquareEnvironment(PropertySource commandLineProperties) { + protected BitsquareEnvironment(PropertySource commandLineProperties) { String userDataDir = commandLineProperties.containsProperty(USER_DATA_DIR_KEY) ? (String) commandLineProperties.getProperty(USER_DATA_DIR_KEY) : DEFAULT_USER_DATA_DIR; @@ -152,7 +150,7 @@ public class BitsquareEnvironment extends StandardEnvironment { return new ResourcePropertySource(BITSQUARE_CLASSPATH_PROPERTY_SOURCE_NAME, resource); } - PropertySource defaultProperties() { + protected PropertySource defaultProperties() { return new PropertiesPropertySource(BITSQUARE_DEFAULT_PROPERTY_SOURCE_NAME, new Properties() { private static final long serialVersionUID = -8478089705207326165L; @@ -163,14 +161,14 @@ public class BitsquareEnvironment extends StandardEnvironment { setProperty(APP_NAME_KEY, appName); setProperty(UserAgent.NAME_KEY, appName); - setProperty(UserAgent.VERSION_KEY, BitsquareAppMain.getVersion()); + // setProperty(UserAgent.VERSION_KEY, BitsquareAppMain.getVersion()); setProperty(WalletService.DIR_KEY, appDataDir); setProperty(WalletService.PREFIX_KEY, appName); setProperty(Storage.DIR_KEY, Paths.get(appDataDir, "db").toString()); - setProperty(MainView.TITLE_KEY, appName); + // setProperty(MainView.TITLE_KEY, appName); setProperty(TomP2PModule.BOOTSTRAP_NODE_PORT_KEY, bootstrapNodePort); } diff --git a/core/src/main/java/io/bitsquare/offer/OfferModule.java b/core/src/main/java/io/bitsquare/offer/OfferModule.java index 56a79837a2..ff5a21bb11 100644 --- a/core/src/main/java/io/bitsquare/offer/OfferModule.java +++ b/core/src/main/java/io/bitsquare/offer/OfferModule.java @@ -19,8 +19,6 @@ package io.bitsquare.offer; import io.bitsquare.BitsquareModule; -import com.google.inject.Singleton; - import org.springframework.core.env.Environment; public abstract class OfferModule extends BitsquareModule { @@ -31,9 +29,6 @@ public abstract class OfferModule extends BitsquareModule { @Override protected final void configure() { - bind(OfferBook.class).in(Singleton.class); - bind(OfferBook.class).in(Singleton.class); - doConfigure(); } diff --git a/core/src/main/java/io/bitsquare/storage/FileManager.java b/core/src/main/java/io/bitsquare/storage/FileManager.java index 748dcd6098..5fbc2abba7 100644 --- a/core/src/main/java/io/bitsquare/storage/FileManager.java +++ b/core/src/main/java/io/bitsquare/storage/FileManager.java @@ -35,12 +35,9 @@ package io.bitsquare.storage; -import io.bitsquare.gui.components.Popups; - import org.bitcoinj.core.Utils; import org.bitcoinj.utils.Threading; -import com.google.common.base.Throwables; import com.google.common.io.Files; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -76,6 +73,7 @@ import static com.google.common.base.Preconditions.checkNotNull; public class FileManager { private static final Logger log = LoggerFactory.getLogger(FileManager.class); private static final ReentrantLock lock = Threading.lock("FileManager"); + private static Thread.UncaughtExceptionHandler uncaughtExceptionHandler; private final File dir; private final File storageFile; @@ -86,6 +84,10 @@ public class FileManager { private final Callable saver; private T serializable; + public static void setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler uncaughtExceptionHandler) { + FileManager.uncaughtExceptionHandler = uncaughtExceptionHandler; + } + /////////////////////////////////////////////////////////////////////////////////////////// // Constructor @@ -95,18 +97,12 @@ public class FileManager { this.dir = dir; this.storageFile = storageFile; - final ThreadFactoryBuilder builder = new ThreadFactoryBuilder() + ThreadFactoryBuilder builder = new ThreadFactoryBuilder() .setDaemon(true) .setNameFormat("FileManager thread") .setPriority(Thread.MIN_PRIORITY); // Avoid competing with the GUI thread. - //noinspection Convert2Lambda - builder.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { - @Override - public void uncaughtException(Thread t, Throwable throwable) { - Platform.runLater(() -> Popups.handleUncaughtExceptions(Throwables.getRootCause(throwable))); - } - }); + builder.setUncaughtExceptionHandler(uncaughtExceptionHandler); // An executor that starts up threads when needed and shuts them down later. this.executor = new ScheduledThreadPoolExecutor(1, builder.build()); @@ -141,8 +137,9 @@ public class FileManager { }); } + /////////////////////////////////////////////////////////////////////////////////////////// - // Constructor + // API /////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/gui/pom.xml b/gui/pom.xml new file mode 100644 index 0000000000..43ed1ebe3f --- /dev/null +++ b/gui/pom.xml @@ -0,0 +1,120 @@ + + + + + + parent + io.bitsquare + 0.1.3-SNAPSHOT + + 4.0.0 + + gui + + + + + + false + ${basedir}/src/main/java + + **/*.fxml + **/*.css + + + + false + ${basedir}/src/main/resources + + **/*.* + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + false + + + io.bitsquare.app.BitsquareAppMain + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + true + bundled + shaded + + + + + + + + + + + + + io.bitsquare + core + ${project.parent.version} + + + \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java similarity index 92% rename from core/src/main/java/io/bitsquare/app/BitsquareApp.java rename to gui/src/main/java/io/bitsquare/app/BitsquareApp.java index 3fe6bd0c4d..44ae83ade7 100644 --- a/core/src/main/java/io/bitsquare/app/BitsquareApp.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java @@ -17,15 +17,16 @@ package io.bitsquare.app; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; -import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; +import io.bitsquare.common.view.guice.InjectorViewFactory; import io.bitsquare.gui.SystemTray; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.debug.DebugView; import io.bitsquare.gui.util.ImageUtil; +import io.bitsquare.storage.FileManager; import io.bitsquare.util.Utilities; import com.google.common.base.Throwables; @@ -37,6 +38,7 @@ import java.io.IOException; import java.io.InvalidObjectException; import javafx.application.Application; +import javafx.application.Platform; import javafx.scene.*; import javafx.scene.image.*; import javafx.scene.input.*; @@ -75,11 +77,15 @@ public class BitsquareApp extends Application { injector = Guice.createInjector(bitsquareAppModule); injector.getInstance(InjectorViewFactory.class).setInjector(injector); - // route uncaught exceptions to a user-facing dialog + FileManager.setUncaughtExceptionHandler( + (t, throwable) -> Platform.runLater( + () -> Popups.handleUncaughtExceptions(Throwables.getRootCause(throwable)) + ) + ); + Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> Popups.handleUncaughtExceptions(Throwables.getRootCause(throwable))); - // load the main view and create the main scene log.trace("viewLoader.load(MainView.class)"); CachingViewLoader viewLoader = injector.getInstance(CachingViewLoader.class); diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareAppEnvironment.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppEnvironment.java new file mode 100644 index 0000000000..815740a3f9 --- /dev/null +++ b/gui/src/main/java/io/bitsquare/app/BitsquareAppEnvironment.java @@ -0,0 +1,69 @@ +/* + * This file is part of Bitsquare. + * + * Bitsquare is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bitsquare is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bitsquare. If not, see . + */ + +package io.bitsquare.app; + +import io.bitsquare.btc.UserAgent; +import io.bitsquare.btc.WalletService; +import io.bitsquare.gui.main.MainView; +import io.bitsquare.p2p.tomp2p.TomP2PModule; +import io.bitsquare.storage.Storage; + +import java.nio.file.Paths; + +import java.util.Properties; + +import joptsimple.OptionSet; +import org.springframework.core.env.PropertiesPropertySource; +import org.springframework.core.env.PropertySource; + +public class BitsquareAppEnvironment extends BitsquareEnvironment { + + public BitsquareAppEnvironment(OptionSet options) { + super(options); + } + + BitsquareAppEnvironment(PropertySource commandLineProperties) { + super(commandLineProperties); + } + + @Override + protected PropertySource defaultProperties() { + return new PropertiesPropertySource(BITSQUARE_DEFAULT_PROPERTY_SOURCE_NAME, new Properties() { + private static final long serialVersionUID = -8478089705207326165L; + + { + setProperty(APP_DATA_DIR_KEY, appDataDir); + setProperty(APP_DATA_DIR_CLEAN_KEY, DEFAULT_APP_DATA_DIR_CLEAN); + + setProperty(APP_NAME_KEY, appName); + + setProperty(UserAgent.NAME_KEY, appName); + setProperty(UserAgent.VERSION_KEY, BitsquareAppMain.getVersion()); + + setProperty(WalletService.DIR_KEY, appDataDir); + setProperty(WalletService.PREFIX_KEY, appName); + + setProperty(Storage.DIR_KEY, Paths.get(appDataDir, "db").toString()); + + setProperty(MainView.TITLE_KEY, appName); + + setProperty(TomP2PModule.BOOTSTRAP_NODE_PORT_KEY, bootstrapNodePort); + } + }); + } +} diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java similarity index 94% rename from core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java rename to gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java index 545be06a60..d26d801ebf 100644 --- a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java @@ -15,13 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.app.gui; +package io.bitsquare.app; import io.bitsquare.BitsquareException; -import io.bitsquare.app.BitsquareApp; -import io.bitsquare.app.BitsquareEnvironment; -import io.bitsquare.app.BitsquareExecutable; -import io.bitsquare.app.UpdateProcess; import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.RegTestHost; import io.bitsquare.p2p.BootstrapNodes; @@ -77,7 +73,7 @@ public class BitsquareAppMain extends BitsquareExecutable { System.exit(EXIT_FAILURE); return; } - BitsquareEnvironment bitsquareEnvironment = new BitsquareEnvironment(options); + BitsquareAppEnvironment bitsquareEnvironment = new BitsquareAppEnvironment(options); String updatesDirectory = bitsquareEnvironment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY); // app dir need to be setup before UpdateFX bootstrap @@ -155,7 +151,7 @@ public class BitsquareAppMain extends BitsquareExecutable { @Override protected void doExecute(OptionSet options) { - BitsquareApp.setEnvironment(new BitsquareEnvironment(options)); + BitsquareApp.setEnvironment(new BitsquareAppEnvironment(options)); javafx.application.Application.launch(BitsquareApp.class); } } diff --git a/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java similarity index 100% rename from core/src/main/java/io/bitsquare/app/BitsquareAppModule.java rename to gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java diff --git a/core/src/main/java/io/bitsquare/app/UpdateProcess.java b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java similarity index 99% rename from core/src/main/java/io/bitsquare/app/UpdateProcess.java rename to gui/src/main/java/io/bitsquare/app/UpdateProcess.java index b2e48cc14a..629ee2cb19 100644 --- a/core/src/main/java/io/bitsquare/app/UpdateProcess.java +++ b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java @@ -17,7 +17,6 @@ package io.bitsquare.app; -import io.bitsquare.app.gui.BitsquareAppMain; import io.bitsquare.util.Utilities; import com.google.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java b/gui/src/main/java/io/bitsquare/common/ViewfxException.java similarity index 96% rename from core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java rename to gui/src/main/java/io/bitsquare/common/ViewfxException.java index 3b3275d685..fd7747f94b 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java +++ b/gui/src/main/java/io/bitsquare/common/ViewfxException.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx; +package io.bitsquare.common; import static java.lang.String.format; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java b/gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java similarity index 93% rename from core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java rename to gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java index 6bd8495328..4bee6d2bf5 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java +++ b/gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view.fxml; +package io.bitsquare.common.fxml; -import io.bitsquare.common.viewfx.ViewfxException; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewFactory; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.ViewfxException; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewFactory; +import io.bitsquare.common.view.ViewLoader; import java.io.IOException; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java b/gui/src/main/java/io/bitsquare/common/model/Activatable.java similarity index 95% rename from core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java rename to gui/src/main/java/io/bitsquare/common/model/Activatable.java index a2fcadf2b6..d338472191 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java +++ b/gui/src/main/java/io/bitsquare/common/model/Activatable.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.model; +package io.bitsquare.common.model; public interface Activatable { diff --git a/core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java b/gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java rename to gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java index 5c08b16cb6..4fc13dea8c 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java +++ b/gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.model; +package io.bitsquare.common.model; public abstract class ActivatableWithDataModel extends WithDataModel implements Activatable { diff --git a/core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java b/gui/src/main/java/io/bitsquare/common/model/DataModel.java similarity index 94% rename from core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java rename to gui/src/main/java/io/bitsquare/common/model/DataModel.java index b15e8a5662..9915cba2d2 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java +++ b/gui/src/main/java/io/bitsquare/common/model/DataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.model; +package io.bitsquare.common.model; public interface DataModel extends Model { } diff --git a/core/src/main/java/io/bitsquare/common/viewfx/model/Model.java b/gui/src/main/java/io/bitsquare/common/model/Model.java similarity index 94% rename from core/src/main/java/io/bitsquare/common/viewfx/model/Model.java rename to gui/src/main/java/io/bitsquare/common/model/Model.java index 484d646afe..e39de82c51 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/model/Model.java +++ b/gui/src/main/java/io/bitsquare/common/model/Model.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.model; +package io.bitsquare.common.model; public interface Model { } diff --git a/core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java b/gui/src/main/java/io/bitsquare/common/model/ViewModel.java similarity index 94% rename from core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java rename to gui/src/main/java/io/bitsquare/common/model/ViewModel.java index 3de7fb37b8..08b8032b2c 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java +++ b/gui/src/main/java/io/bitsquare/common/model/ViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.model; +package io.bitsquare.common.model; public interface ViewModel extends Model { } diff --git a/core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java b/gui/src/main/java/io/bitsquare/common/model/WithDataModel.java similarity index 95% rename from core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java rename to gui/src/main/java/io/bitsquare/common/model/WithDataModel.java index 27ea811e97..7d7415c0b7 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java +++ b/gui/src/main/java/io/bitsquare/common/model/WithDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.model; +package io.bitsquare.common.model; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java b/gui/src/main/java/io/bitsquare/common/view/AbstractView.java similarity index 96% rename from core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java rename to gui/src/main/java/io/bitsquare/common/view/AbstractView.java index 6b5591d0b1..8f96ccdbd7 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java +++ b/gui/src/main/java/io/bitsquare/common/view/AbstractView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import javafx.fxml.FXML; import javafx.scene.*; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java b/gui/src/main/java/io/bitsquare/common/view/ActivatableView.java similarity index 97% rename from core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java rename to gui/src/main/java/io/bitsquare/common/view/ActivatableView.java index a2b72b075b..fac7bf9b0c 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java +++ b/gui/src/main/java/io/bitsquare/common/view/ActivatableView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import javafx.scene.*; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java b/gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java similarity index 93% rename from core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java rename to gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java index fba1326655..c7bf85ea33 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java +++ b/gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; -import io.bitsquare.common.viewfx.model.Activatable; +import io.bitsquare.common.model.Activatable; import javafx.scene.*; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java b/gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java similarity index 96% rename from core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java rename to gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java index 2f2f509f8d..82128c3b4c 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java +++ b/gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import java.util.HashMap; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java b/gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java similarity index 96% rename from core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java rename to gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java index 3702d9f68a..343d80d64a 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java +++ b/gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import org.springframework.util.ClassUtils; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java b/gui/src/main/java/io/bitsquare/common/view/FxmlView.java similarity index 97% rename from core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java rename to gui/src/main/java/io/bitsquare/common/view/FxmlView.java index bd095fbab2..15bbc5d896 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java +++ b/gui/src/main/java/io/bitsquare/common/view/FxmlView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import java.util.function.Function; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java b/gui/src/main/java/io/bitsquare/common/view/InitializableView.java similarity index 96% rename from core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java rename to gui/src/main/java/io/bitsquare/common/view/InitializableView.java index 48555ff004..8c61057b2e 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java +++ b/gui/src/main/java/io/bitsquare/common/view/InitializableView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import java.net.URL; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/View.java b/gui/src/main/java/io/bitsquare/common/view/View.java similarity index 94% rename from core/src/main/java/io/bitsquare/common/viewfx/view/View.java rename to gui/src/main/java/io/bitsquare/common/view/View.java index 49ac1b54e1..0d798a3eb6 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/View.java +++ b/gui/src/main/java/io/bitsquare/common/view/View.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import javafx.scene.*; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java b/gui/src/main/java/io/bitsquare/common/view/ViewFactory.java similarity index 95% rename from core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java rename to gui/src/main/java/io/bitsquare/common/view/ViewFactory.java index 42edf31ec3..579a505848 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java +++ b/gui/src/main/java/io/bitsquare/common/view/ViewFactory.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import javafx.util.Callback; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java b/gui/src/main/java/io/bitsquare/common/view/ViewLoader.java similarity index 95% rename from core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java rename to gui/src/main/java/io/bitsquare/common/view/ViewLoader.java index 9823e17300..bd34480c57 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java +++ b/gui/src/main/java/io/bitsquare/common/view/ViewLoader.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; public interface ViewLoader { View load(Class viewClass); diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java b/gui/src/main/java/io/bitsquare/common/view/ViewPath.java similarity index 97% rename from core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java rename to gui/src/main/java/io/bitsquare/common/view/ViewPath.java index ac08955a59..9d8f64bed8 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java +++ b/gui/src/main/java/io/bitsquare/common/view/ViewPath.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; import java.io.Serializable; diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java b/gui/src/main/java/io/bitsquare/common/view/Wizard.java similarity index 95% rename from core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java rename to gui/src/main/java/io/bitsquare/common/view/Wizard.java index 48acd2a713..41be410436 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java +++ b/gui/src/main/java/io/bitsquare/common/view/Wizard.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view; +package io.bitsquare.common.view; public interface Wizard extends View { void nextStep(Step currentStep); diff --git a/core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java b/gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java similarity index 92% rename from core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java rename to gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java index 2c12defe63..d6dc1ed5f5 100644 --- a/core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java +++ b/gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view.guice; +package io.bitsquare.common.view.guice; -import io.bitsquare.common.viewfx.view.ViewFactory; +import io.bitsquare.common.view.ViewFactory; import com.google.common.base.Preconditions; diff --git a/core/src/main/java/io/bitsquare/gui/GuiModule.java b/gui/src/main/java/io/bitsquare/gui/GuiModule.java similarity index 89% rename from core/src/main/java/io/bitsquare/gui/GuiModule.java rename to gui/src/main/java/io/bitsquare/gui/GuiModule.java index 4a23dd5bc8..6014c87a32 100644 --- a/core/src/main/java/io/bitsquare/gui/GuiModule.java +++ b/gui/src/main/java/io/bitsquare/gui/GuiModule.java @@ -18,13 +18,14 @@ package io.bitsquare.gui; import io.bitsquare.BitsquareModule; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.ViewFactory; -import io.bitsquare.common.viewfx.view.ViewLoader; -import io.bitsquare.common.viewfx.view.fxml.FxmlViewLoader; -import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory; +import io.bitsquare.common.fxml.FxmlViewLoader; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.ViewFactory; +import io.bitsquare.common.view.ViewLoader; +import io.bitsquare.common.view.guice.InjectorViewFactory; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; +import io.bitsquare.gui.main.offer.offerbook.OfferBook; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.Transitions; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; @@ -33,7 +34,6 @@ import io.bitsquare.gui.util.validation.FiatValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; import io.bitsquare.locale.BSResources; -import io.bitsquare.offer.OfferBook; import com.google.inject.Singleton; import com.google.inject.name.Names; diff --git a/core/src/main/java/io/bitsquare/gui/Navigation.java b/gui/src/main/java/io/bitsquare/gui/Navigation.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/Navigation.java rename to gui/src/main/java/io/bitsquare/gui/Navigation.java index 9c9a60e903..6fe3a46786 100644 --- a/core/src/main/java/io/bitsquare/gui/Navigation.java +++ b/gui/src/main/java/io/bitsquare/gui/Navigation.java @@ -17,8 +17,8 @@ package io.bitsquare.gui; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewPath; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewPath; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.offer.BuyOfferView; import io.bitsquare.storage.Storage; diff --git a/core/src/main/java/io/bitsquare/gui/OverlayManager.java b/gui/src/main/java/io/bitsquare/gui/OverlayManager.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/OverlayManager.java rename to gui/src/main/java/io/bitsquare/gui/OverlayManager.java diff --git a/core/src/main/java/io/bitsquare/gui/SystemTray.java b/gui/src/main/java/io/bitsquare/gui/SystemTray.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/SystemTray.java rename to gui/src/main/java/io/bitsquare/gui/SystemTray.java diff --git a/core/src/main/java/io/bitsquare/gui/bitsquare.css b/gui/src/main/java/io/bitsquare/gui/bitsquare.css similarity index 100% rename from core/src/main/java/io/bitsquare/gui/bitsquare.css rename to gui/src/main/java/io/bitsquare/gui/bitsquare.css diff --git a/core/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/AddressTextField.java rename to gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java diff --git a/core/src/main/java/io/bitsquare/gui/components/BalanceTextField.java b/gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/BalanceTextField.java rename to gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java diff --git a/core/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java b/gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java rename to gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java diff --git a/core/src/main/java/io/bitsquare/gui/components/InfoDisplay.java b/gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/InfoDisplay.java rename to gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java diff --git a/core/src/main/java/io/bitsquare/gui/components/InputTextField.java b/gui/src/main/java/io/bitsquare/gui/components/InputTextField.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/InputTextField.java rename to gui/src/main/java/io/bitsquare/gui/components/InputTextField.java diff --git a/core/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java b/gui/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java rename to gui/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java diff --git a/core/src/main/java/io/bitsquare/gui/components/Popups.java b/gui/src/main/java/io/bitsquare/gui/components/Popups.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/Popups.java rename to gui/src/main/java/io/bitsquare/gui/components/Popups.java diff --git a/core/src/main/java/io/bitsquare/gui/components/SystemNotification.java b/gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/SystemNotification.java rename to gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java diff --git a/core/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java b/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java rename to gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java diff --git a/core/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java b/gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java rename to gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java diff --git a/core/src/main/java/io/bitsquare/gui/components/TitledSeparator.java b/gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/TitledSeparator.java rename to gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java diff --git a/core/src/main/java/io/bitsquare/gui/components/TxIdTextField.java b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/TxIdTextField.java rename to gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java diff --git a/core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java b/gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java rename to gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java diff --git a/core/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java b/gui/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java rename to gui/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java diff --git a/core/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java b/gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java rename to gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java diff --git a/core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java b/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java rename to gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java diff --git a/core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java b/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java rename to gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java diff --git a/core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java b/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java rename to gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java diff --git a/core/src/main/java/io/bitsquare/gui/images.css b/gui/src/main/java/io/bitsquare/gui/images.css similarity index 100% rename from core/src/main/java/io/bitsquare/gui/images.css rename to gui/src/main/java/io/bitsquare/gui/images.css diff --git a/core/src/main/java/io/bitsquare/gui/main/MainView.fxml b/gui/src/main/java/io/bitsquare/gui/main/MainView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/MainView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/MainView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/MainView.java rename to gui/src/main/java/io/bitsquare/gui/main/MainView.java index 26b0dba84c..beace6086c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java @@ -18,11 +18,11 @@ package io.bitsquare.gui.main; import io.bitsquare.BitsquareException; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; diff --git a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/MainViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index accfa1507d..b046f6f747 100644 --- a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -21,7 +21,7 @@ import io.bitsquare.app.UpdateProcess; import io.bitsquare.arbitration.ArbitrationRepository; import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.CountryUtil; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java similarity index 94% rename from core/src/main/java/io/bitsquare/gui/main/account/AccountView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java index eaa254f608..98eabd479f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -17,11 +17,11 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.common.viewfx.view.ActivatableView; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.ActivatableView; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java similarity index 95% rename from core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java index 0bee1545f7..04b3590927 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.user.User; import com.google.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java similarity index 90% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java index 1be302f66f..e9ec307822 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java @@ -17,11 +17,11 @@ package io.bitsquare.gui.main.account.arbitrator; -import io.bitsquare.common.viewfx.view.AbstractView; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.AbstractView; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java similarity index 94% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java index 199d2aa4ed..3ce7a10ff5 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java @@ -19,11 +19,11 @@ package io.bitsquare.gui.main.account.arbitrator.browser; import io.bitsquare.arbitration.Arbitrator; import io.bitsquare.arbitration.ArbitratorService; -import io.bitsquare.common.viewfx.view.ActivatableView; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.ActivatableView; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView; import io.bitsquare.user.AccountSettings; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java index 0f97c4452b..8316c0884a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.account.arbitrator.profile; import io.bitsquare.arbitration.Arbitrator; -import io.bitsquare.common.viewfx.view.AbstractView; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.AbstractView; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.util.BSFormatter; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java index 01fefa5387..985c88ad92 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java @@ -20,8 +20,8 @@ package io.bitsquare.gui.main.account.arbitrator.registration; import io.bitsquare.arbitration.Arbitrator; import io.bitsquare.arbitration.ArbitratorService; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.view.ActivatableView; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableView; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.BSResources; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java index 2ed4c46d57..2e4f1b7737 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.account.content.altcoin; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CurrencyUtil; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java index d4b5d0cb66..57052c62bb 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.content.altcoin; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.Wizard; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java index 115a106db5..cced350994 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.account.content.altcoin; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.InputValidator; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java similarity index 93% rename from core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java index e873ba450a..71e2fa172d 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.content.changepassword; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java index a18c27c0c1..9d0eed6349 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.content.changepassword; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java index 037df574ac..48559f2337 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.account.content.fiat; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.locale.Country; import io.bitsquare.locale.CountryUtil; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java index d44ca250fc..8b7267a77f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.content.fiat; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.Wizard; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.InputTextField; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java index 47fd16c91a..c3b27f4b07 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.account.content.fiat; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.InputValidator; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java similarity index 93% rename from core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java index 7b68cb14eb..04e498957a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.content.password; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java index 2d9f5a9a79..6fff106a0f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.content.password; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java index 8a6bfa1e20..113eeda94a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java @@ -21,7 +21,7 @@ import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.DataModel; import io.bitsquare.user.User; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java index 57cc10220e..1efbecb7f9 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.content.registration; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.AddressTextField; import io.bitsquare.gui.components.BalanceTextField; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java index a8d2c32a51..5acdaa4525 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.account.content.registration; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.ViewModel; -import io.bitsquare.common.viewfx.model.WithDataModel; +import io.bitsquare.common.model.ViewModel; +import io.bitsquare.common.model.WithDataModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.BSResources; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java index 9797fccd0d..4dd87a0fb9 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitration.Arbitrator; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.LanguageUtil; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java similarity index 97% rename from core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java index 292250e4ad..9230ce01fa 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java @@ -18,12 +18,12 @@ package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitration.Arbitrator; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.main.account.arbitrator.browser.BrowserView; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java index 3837dedae0..1c173f5b5c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.account.content.restrictions; import io.bitsquare.arbitration.Arbitrator; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java similarity index 92% rename from core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java index d0a8c5c157..b9f20c9e7f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.account.content.seedwords; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java index 31e893a280..9d1365bd80 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.account.content.seedwords; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java similarity index 94% rename from core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java rename to gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java index 1f2cb9271f..00fff8dddc 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java @@ -17,13 +17,13 @@ package io.bitsquare.gui.main.account.settings; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; -import io.bitsquare.common.viewfx.view.ViewPath; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; +import io.bitsquare.common.view.ViewPath; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.account.AccountView; diff --git a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml rename to gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java rename to gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java index b211512380..fe8d994731 100644 --- a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java @@ -17,12 +17,12 @@ package io.bitsquare.gui.main.account.setup; -import io.bitsquare.common.viewfx.view.ActivatableView; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; -import io.bitsquare.common.viewfx.view.Wizard; +import io.bitsquare.common.view.ActivatableView; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; +import io.bitsquare.common.view.Wizard; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.account.content.fiat.FiatAccountView; diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java rename to gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java index 1157642366..5dd1dbf9e0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.debug; import io.bitsquare.common.taskrunner.Task; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityProtocol; import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable; diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java similarity index 92% rename from core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java index ee28ae2305..30dfe9da1a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java @@ -17,12 +17,12 @@ package io.bitsquare.gui.main.funds; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.funds.reserved.ReservedView; diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java index 2ef4fec787..4e62a55f7d 100644 --- a/core/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java @@ -19,8 +19,8 @@ package io.bitsquare.gui.main.funds.reserved; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.trade.TradeManager; import io.bitsquare.util.Utilities; diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java index c6016be935..77b7b8ff66 100644 --- a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.funds.transactions; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.util.Utilities; diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java rename to gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index a55db006f7..ac762e8b2f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java @@ -22,8 +22,8 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.Restrictions; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.trade.TradeManager; diff --git a/core/src/main/java/io/bitsquare/gui/main/help/Help.java b/gui/src/main/java/io/bitsquare/gui/main/help/Help.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/help/Help.java rename to gui/src/main/java/io/bitsquare/gui/main/help/Help.java diff --git a/core/src/main/java/io/bitsquare/gui/main/help/HelpId.java b/gui/src/main/java/io/bitsquare/gui/main/help/HelpId.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/help/HelpId.java rename to gui/src/main/java/io/bitsquare/gui/main/help/HelpId.java diff --git a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java similarity index 90% rename from core/src/main/java/io/bitsquare/gui/main/home/HomeView.java rename to gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java index 4d82a3ff1e..9808520535 100644 --- a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.home; -import io.bitsquare.common.viewfx.view.AbstractView; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.AbstractView; +import io.bitsquare.common.view.FxmlView; // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, // probably overview, event history, news, charts,... -> low prio diff --git a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml b/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java similarity index 89% rename from core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java rename to gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java index 220a2fbcc9..b19e98d8e6 100644 --- a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.msg; -import io.bitsquare.common.viewfx.view.AbstractView; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.AbstractView; +import io.bitsquare.common.view.FxmlView; // will be probably only used for arbitration communication, will be renamed and the icon changed @FxmlView diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java similarity index 90% rename from core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java index 762c88d2e0..f27e564786 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.offer; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java index 3a1e89b449..18f2d4c68b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.offer; -import io.bitsquare.common.viewfx.view.ActivatableView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.ActivatableView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.main.MainView; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java similarity index 90% rename from core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java index 4cb4ce3c4f..6679dcd0aa 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.offer; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java index 4c115875a4..1d4d8a38ca 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java @@ -23,8 +23,8 @@ import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java index cb32f1266d..1fb261b04f 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.offer.createoffer; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.AddressTextField; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java index 8245a8bf8f..559f88255b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.offer.createoffer; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcValidator; import io.bitsquare.gui.util.validation.FiatValidator; @@ -34,7 +34,6 @@ import org.bitcoinj.utils.Fiat; import javax.inject.Inject; import javafx.beans.Observable; -import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -354,7 +353,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel formatter.formatCoinWithCode(dataModel.networkFeeAsCoin.get()), dataModel.offerFeeAsCoin)); - bankAccountType.bind(Bindings.createStringBinding(() -> BSResources.get(dataModel.bankAccountType.get()), + bankAccountType.bind(createStringBinding(() -> BSResources.get(dataModel.bankAccountType.get()), dataModel.bankAccountType)); bankAccountCurrency.bind(dataModel.bankAccountCurrency); bankAccountCounty.bind(dataModel.bankAccountCounty); diff --git a/core/src/test/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java similarity index 100% rename from core/src/test/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java diff --git a/core/src/main/java/io/bitsquare/offer/OfferBook.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java similarity index 98% rename from core/src/main/java/io/bitsquare/offer/OfferBook.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java index 1416200ca8..f5c3fc7abb 100644 --- a/core/src/main/java/io/bitsquare/offer/OfferBook.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.offer; +package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.fiat.FiatAccount; -import io.bitsquare.gui.main.offer.offerbook.OfferBookListItem; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; +import io.bitsquare.offer.Offer; +import io.bitsquare.offer.OfferBookService; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; import io.bitsquare.util.Utilities; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java index 7d92dd0a2b..d6e8f10d87 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java @@ -19,14 +19,13 @@ package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.offer.Offer; -import io.bitsquare.offer.OfferBook; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.Preferences; import io.bitsquare.user.User; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java index 7fee4c49f4..090fe2cabc 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.offer.offerbook; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.InputTextField; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java index d35261c68c..cebc32732e 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java @@ -19,8 +19,8 @@ package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.OptionalBtcValidator; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java index 9ffc9b312a..7f4d6d3ca8 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java @@ -21,8 +21,8 @@ import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.offer.Offer; import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.handlers.TakeOfferResultHandler; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java index 262ac1551e..51adba89a2 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.offer.takeoffer; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.components.AddressTextField; diff --git a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java index 54beba6341..58904204cd 100644 --- a/core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.offer.takeoffer; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcValidator; import io.bitsquare.gui.util.validation.InputValidator; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java similarity index 92% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index b6601d21e3..84e1c3943a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -17,12 +17,12 @@ package io.bitsquare.gui.main.portfolio; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java index 8d986727f8..706c357491 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.portfolio.closedtrades; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java similarity index 98% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java index 33a086ec76..abd2057578 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.portfolio.closedtrades; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java index 778ebc5b9a..d0045e38b4 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.portfolio.closedtrades; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.TakerTradeState; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java index 1014af3111..32646e5c94 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java @@ -19,8 +19,8 @@ package io.bitsquare.gui.main.portfolio.openoffer; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java index 39bbce23e9..185275e9d6 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.portfolio.openoffer; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java similarity index 95% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java index 8840da8e98..49074fc2a2 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java @@ -19,8 +19,8 @@ package io.bitsquare.gui.main.portfolio.openoffer; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.offer.Offer; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java index ba01db4921..04cadedbb7 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java index d5c8eb3fa5..0fae2d11d4 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.portfolio.pendingtrades; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import io.bitsquare.trade.Trade; import io.bitsquare.util.Utilities; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java similarity index 99% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java index 272036dac0..bdd9ad3829 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.portfolio.pendingtrades; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcAddressValidator; import io.bitsquare.locale.BSResources; diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java rename to gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java similarity index 91% rename from core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java rename to gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java index f06bcdbce3..272ec23fa0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java @@ -17,12 +17,12 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.settings.application.PreferencesView; diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java rename to gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java index c10b559d6c..16b22c5f7c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.settings.application; -import io.bitsquare.common.viewfx.model.Activatable; -import io.bitsquare.common.viewfx.model.DataModel; +import io.bitsquare.common.model.Activatable; +import io.bitsquare.common.model.DataModel; import io.bitsquare.user.Preferences; import com.google.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java similarity index 94% rename from core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java rename to gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java index b78c5e6090..81292252ed 100644 --- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.settings.application; -import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; -import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.common.view.ActivatableViewAndModel; +import io.bitsquare.common.view.FxmlView; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java similarity index 92% rename from core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java rename to gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java index a69bfaa98f..10a6e1d4c2 100644 --- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java @@ -17,8 +17,8 @@ package io.bitsquare.gui.main.settings.application; -import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; -import io.bitsquare.common.viewfx.model.ViewModel; +import io.bitsquare.common.model.ActivatableWithDataModel; +import io.bitsquare.common.model.ViewModel; import com.google.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml similarity index 100% rename from core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml rename to gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java similarity index 94% rename from core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java rename to gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java index f618394716..c6c23268f2 100644 --- a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.main.settings.network; import io.bitsquare.btc.BitcoinNetwork; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.InitializableView; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.InitializableView; import io.bitsquare.p2p.ClientNode; import javax.inject.Inject; diff --git a/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/BSFormatter.java rename to gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java diff --git a/core/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java b/gui/src/main/java/io/bitsquare/gui/util/BSFormatterTest.java similarity index 100% rename from core/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java rename to gui/src/main/java/io/bitsquare/gui/util/BSFormatterTest.java diff --git a/core/src/main/java/io/bitsquare/gui/util/Colors.java b/gui/src/main/java/io/bitsquare/gui/util/Colors.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/Colors.java rename to gui/src/main/java/io/bitsquare/gui/util/Colors.java diff --git a/core/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java b/gui/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java rename to gui/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java diff --git a/core/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/ImageUtil.java rename to gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java diff --git a/core/src/main/java/io/bitsquare/gui/util/Layout.java b/gui/src/main/java/io/bitsquare/gui/util/Layout.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/Layout.java rename to gui/src/main/java/io/bitsquare/gui/util/Layout.java diff --git a/core/src/main/java/io/bitsquare/gui/util/Profiler.java b/gui/src/main/java/io/bitsquare/gui/util/Profiler.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/Profiler.java rename to gui/src/main/java/io/bitsquare/gui/util/Profiler.java diff --git a/core/src/main/java/io/bitsquare/gui/util/Transitions.java b/gui/src/main/java/io/bitsquare/gui/util/Transitions.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/Transitions.java rename to gui/src/main/java/io/bitsquare/gui/util/Transitions.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java diff --git a/core/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java similarity index 100% rename from core/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java diff --git a/core/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java b/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java similarity index 100% rename from core/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java similarity index 100% rename from core/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java rename to gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java diff --git a/core/src/main/resources/bitsquare.properties b/gui/src/main/resources/bitsquare.properties similarity index 100% rename from core/src/main/resources/bitsquare.properties rename to gui/src/main/resources/bitsquare.properties diff --git a/core/src/main/resources/i18n/displayStrings.properties b/gui/src/main/resources/i18n/displayStrings.properties similarity index 100% rename from core/src/main/resources/i18n/displayStrings.properties rename to gui/src/main/resources/i18n/displayStrings.properties diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/gui/src/main/resources/i18n/displayStrings_de.properties similarity index 100% rename from core/src/main/resources/i18n/displayStrings_de.properties rename to gui/src/main/resources/i18n/displayStrings_de.properties diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/gui/src/main/resources/i18n/displayStrings_es.properties similarity index 100% rename from core/src/main/resources/i18n/displayStrings_es.properties rename to gui/src/main/resources/i18n/displayStrings_es.properties diff --git a/core/src/main/resources/i18n/displayStrings_sv_SE.properties b/gui/src/main/resources/i18n/displayStrings_sv_SE.properties similarity index 100% rename from core/src/main/resources/i18n/displayStrings_sv_SE.properties rename to gui/src/main/resources/i18n/displayStrings_sv_SE.properties diff --git a/core/src/main/resources/images/alert_round.png b/gui/src/main/resources/images/alert_round.png similarity index 100% rename from core/src/main/resources/images/alert_round.png rename to gui/src/main/resources/images/alert_round.png diff --git a/core/src/main/resources/images/alert_round@2x.png b/gui/src/main/resources/images/alert_round@2x.png similarity index 100% rename from core/src/main/resources/images/alert_round@2x.png rename to gui/src/main/resources/images/alert_round@2x.png diff --git a/core/src/main/resources/images/arrow_blue.png b/gui/src/main/resources/images/arrow_blue.png similarity index 100% rename from core/src/main/resources/images/arrow_blue.png rename to gui/src/main/resources/images/arrow_blue.png diff --git a/core/src/main/resources/images/arrow_blue@2x.png b/gui/src/main/resources/images/arrow_blue@2x.png similarity index 100% rename from core/src/main/resources/images/arrow_blue@2x.png rename to gui/src/main/resources/images/arrow_blue@2x.png diff --git a/core/src/main/resources/images/arrow_grey.png b/gui/src/main/resources/images/arrow_grey.png similarity index 100% rename from core/src/main/resources/images/arrow_grey.png rename to gui/src/main/resources/images/arrow_grey.png diff --git a/core/src/main/resources/images/arrow_grey@2x.png b/gui/src/main/resources/images/arrow_grey@2x.png similarity index 100% rename from core/src/main/resources/images/arrow_grey@2x.png rename to gui/src/main/resources/images/arrow_grey@2x.png diff --git a/core/src/main/resources/images/buy.png b/gui/src/main/resources/images/buy.png similarity index 100% rename from core/src/main/resources/images/buy.png rename to gui/src/main/resources/images/buy.png diff --git a/core/src/main/resources/images/buy@2x.png b/gui/src/main/resources/images/buy@2x.png similarity index 100% rename from core/src/main/resources/images/buy@2x.png rename to gui/src/main/resources/images/buy@2x.png diff --git a/core/src/main/resources/images/buy_large.png b/gui/src/main/resources/images/buy_large.png similarity index 100% rename from core/src/main/resources/images/buy_large.png rename to gui/src/main/resources/images/buy_large.png diff --git a/core/src/main/resources/images/buy_large@2x.png b/gui/src/main/resources/images/buy_large@2x.png similarity index 100% rename from core/src/main/resources/images/buy_large@2x.png rename to gui/src/main/resources/images/buy_large@2x.png diff --git a/core/src/main/resources/images/collapse.png b/gui/src/main/resources/images/collapse.png similarity index 100% rename from core/src/main/resources/images/collapse.png rename to gui/src/main/resources/images/collapse.png diff --git a/core/src/main/resources/images/collapse@2x.png b/gui/src/main/resources/images/collapse@2x.png similarity index 100% rename from core/src/main/resources/images/collapse@2x.png rename to gui/src/main/resources/images/collapse@2x.png diff --git a/core/src/main/resources/images/connection/direct.png b/gui/src/main/resources/images/connection/direct.png similarity index 100% rename from core/src/main/resources/images/connection/direct.png rename to gui/src/main/resources/images/connection/direct.png diff --git a/core/src/main/resources/images/connection/direct@2x.png b/gui/src/main/resources/images/connection/direct@2x.png similarity index 100% rename from core/src/main/resources/images/connection/direct@2x.png rename to gui/src/main/resources/images/connection/direct@2x.png diff --git a/core/src/main/resources/images/connection/nat.png b/gui/src/main/resources/images/connection/nat.png similarity index 100% rename from core/src/main/resources/images/connection/nat.png rename to gui/src/main/resources/images/connection/nat.png diff --git a/core/src/main/resources/images/connection/nat@2x.png b/gui/src/main/resources/images/connection/nat@2x.png similarity index 100% rename from core/src/main/resources/images/connection/nat@2x.png rename to gui/src/main/resources/images/connection/nat@2x.png diff --git a/core/src/main/resources/images/connection/relay.png b/gui/src/main/resources/images/connection/relay.png similarity index 100% rename from core/src/main/resources/images/connection/relay.png rename to gui/src/main/resources/images/connection/relay.png diff --git a/core/src/main/resources/images/connection/relay@2x.png b/gui/src/main/resources/images/connection/relay@2x.png similarity index 100% rename from core/src/main/resources/images/connection/relay@2x.png rename to gui/src/main/resources/images/connection/relay@2x.png diff --git a/core/src/main/resources/images/connection/synced.png b/gui/src/main/resources/images/connection/synced.png similarity index 100% rename from core/src/main/resources/images/connection/synced.png rename to gui/src/main/resources/images/connection/synced.png diff --git a/core/src/main/resources/images/connection/synced@2x.png b/gui/src/main/resources/images/connection/synced@2x.png similarity index 100% rename from core/src/main/resources/images/connection/synced@2x.png rename to gui/src/main/resources/images/connection/synced@2x.png diff --git a/core/src/main/resources/images/countries/ad.png b/gui/src/main/resources/images/countries/ad.png similarity index 100% rename from core/src/main/resources/images/countries/ad.png rename to gui/src/main/resources/images/countries/ad.png diff --git a/core/src/main/resources/images/countries/ae.png b/gui/src/main/resources/images/countries/ae.png similarity index 100% rename from core/src/main/resources/images/countries/ae.png rename to gui/src/main/resources/images/countries/ae.png diff --git a/core/src/main/resources/images/countries/af.png b/gui/src/main/resources/images/countries/af.png similarity index 100% rename from core/src/main/resources/images/countries/af.png rename to gui/src/main/resources/images/countries/af.png diff --git a/core/src/main/resources/images/countries/ag.png b/gui/src/main/resources/images/countries/ag.png similarity index 100% rename from core/src/main/resources/images/countries/ag.png rename to gui/src/main/resources/images/countries/ag.png diff --git a/core/src/main/resources/images/countries/ai.png b/gui/src/main/resources/images/countries/ai.png similarity index 100% rename from core/src/main/resources/images/countries/ai.png rename to gui/src/main/resources/images/countries/ai.png diff --git a/core/src/main/resources/images/countries/al.png b/gui/src/main/resources/images/countries/al.png similarity index 100% rename from core/src/main/resources/images/countries/al.png rename to gui/src/main/resources/images/countries/al.png diff --git a/core/src/main/resources/images/countries/am.png b/gui/src/main/resources/images/countries/am.png similarity index 100% rename from core/src/main/resources/images/countries/am.png rename to gui/src/main/resources/images/countries/am.png diff --git a/core/src/main/resources/images/countries/an.png b/gui/src/main/resources/images/countries/an.png similarity index 100% rename from core/src/main/resources/images/countries/an.png rename to gui/src/main/resources/images/countries/an.png diff --git a/core/src/main/resources/images/countries/ao.png b/gui/src/main/resources/images/countries/ao.png similarity index 100% rename from core/src/main/resources/images/countries/ao.png rename to gui/src/main/resources/images/countries/ao.png diff --git a/core/src/main/resources/images/countries/ar.png b/gui/src/main/resources/images/countries/ar.png similarity index 100% rename from core/src/main/resources/images/countries/ar.png rename to gui/src/main/resources/images/countries/ar.png diff --git a/core/src/main/resources/images/countries/as.png b/gui/src/main/resources/images/countries/as.png similarity index 100% rename from core/src/main/resources/images/countries/as.png rename to gui/src/main/resources/images/countries/as.png diff --git a/core/src/main/resources/images/countries/at.png b/gui/src/main/resources/images/countries/at.png similarity index 100% rename from core/src/main/resources/images/countries/at.png rename to gui/src/main/resources/images/countries/at.png diff --git a/core/src/main/resources/images/countries/au.png b/gui/src/main/resources/images/countries/au.png similarity index 100% rename from core/src/main/resources/images/countries/au.png rename to gui/src/main/resources/images/countries/au.png diff --git a/core/src/main/resources/images/countries/aw.png b/gui/src/main/resources/images/countries/aw.png similarity index 100% rename from core/src/main/resources/images/countries/aw.png rename to gui/src/main/resources/images/countries/aw.png diff --git a/core/src/main/resources/images/countries/ax.png b/gui/src/main/resources/images/countries/ax.png similarity index 100% rename from core/src/main/resources/images/countries/ax.png rename to gui/src/main/resources/images/countries/ax.png diff --git a/core/src/main/resources/images/countries/az.png b/gui/src/main/resources/images/countries/az.png similarity index 100% rename from core/src/main/resources/images/countries/az.png rename to gui/src/main/resources/images/countries/az.png diff --git a/core/src/main/resources/images/countries/ba.png b/gui/src/main/resources/images/countries/ba.png similarity index 100% rename from core/src/main/resources/images/countries/ba.png rename to gui/src/main/resources/images/countries/ba.png diff --git a/core/src/main/resources/images/countries/bb.png b/gui/src/main/resources/images/countries/bb.png similarity index 100% rename from core/src/main/resources/images/countries/bb.png rename to gui/src/main/resources/images/countries/bb.png diff --git a/core/src/main/resources/images/countries/bd.png b/gui/src/main/resources/images/countries/bd.png similarity index 100% rename from core/src/main/resources/images/countries/bd.png rename to gui/src/main/resources/images/countries/bd.png diff --git a/core/src/main/resources/images/countries/be.png b/gui/src/main/resources/images/countries/be.png similarity index 100% rename from core/src/main/resources/images/countries/be.png rename to gui/src/main/resources/images/countries/be.png diff --git a/core/src/main/resources/images/countries/bf.png b/gui/src/main/resources/images/countries/bf.png similarity index 100% rename from core/src/main/resources/images/countries/bf.png rename to gui/src/main/resources/images/countries/bf.png diff --git a/core/src/main/resources/images/countries/bg.png b/gui/src/main/resources/images/countries/bg.png similarity index 100% rename from core/src/main/resources/images/countries/bg.png rename to gui/src/main/resources/images/countries/bg.png diff --git a/core/src/main/resources/images/countries/bh.png b/gui/src/main/resources/images/countries/bh.png similarity index 100% rename from core/src/main/resources/images/countries/bh.png rename to gui/src/main/resources/images/countries/bh.png diff --git a/core/src/main/resources/images/countries/bi.png b/gui/src/main/resources/images/countries/bi.png similarity index 100% rename from core/src/main/resources/images/countries/bi.png rename to gui/src/main/resources/images/countries/bi.png diff --git a/core/src/main/resources/images/countries/bj.png b/gui/src/main/resources/images/countries/bj.png similarity index 100% rename from core/src/main/resources/images/countries/bj.png rename to gui/src/main/resources/images/countries/bj.png diff --git a/core/src/main/resources/images/countries/bm.png b/gui/src/main/resources/images/countries/bm.png similarity index 100% rename from core/src/main/resources/images/countries/bm.png rename to gui/src/main/resources/images/countries/bm.png diff --git a/core/src/main/resources/images/countries/bn.png b/gui/src/main/resources/images/countries/bn.png similarity index 100% rename from core/src/main/resources/images/countries/bn.png rename to gui/src/main/resources/images/countries/bn.png diff --git a/core/src/main/resources/images/countries/bo.png b/gui/src/main/resources/images/countries/bo.png similarity index 100% rename from core/src/main/resources/images/countries/bo.png rename to gui/src/main/resources/images/countries/bo.png diff --git a/core/src/main/resources/images/countries/br.png b/gui/src/main/resources/images/countries/br.png similarity index 100% rename from core/src/main/resources/images/countries/br.png rename to gui/src/main/resources/images/countries/br.png diff --git a/core/src/main/resources/images/countries/bs.png b/gui/src/main/resources/images/countries/bs.png similarity index 100% rename from core/src/main/resources/images/countries/bs.png rename to gui/src/main/resources/images/countries/bs.png diff --git a/core/src/main/resources/images/countries/bt.png b/gui/src/main/resources/images/countries/bt.png similarity index 100% rename from core/src/main/resources/images/countries/bt.png rename to gui/src/main/resources/images/countries/bt.png diff --git a/core/src/main/resources/images/countries/bv.png b/gui/src/main/resources/images/countries/bv.png similarity index 100% rename from core/src/main/resources/images/countries/bv.png rename to gui/src/main/resources/images/countries/bv.png diff --git a/core/src/main/resources/images/countries/bw.png b/gui/src/main/resources/images/countries/bw.png similarity index 100% rename from core/src/main/resources/images/countries/bw.png rename to gui/src/main/resources/images/countries/bw.png diff --git a/core/src/main/resources/images/countries/by.png b/gui/src/main/resources/images/countries/by.png similarity index 100% rename from core/src/main/resources/images/countries/by.png rename to gui/src/main/resources/images/countries/by.png diff --git a/core/src/main/resources/images/countries/bz.png b/gui/src/main/resources/images/countries/bz.png similarity index 100% rename from core/src/main/resources/images/countries/bz.png rename to gui/src/main/resources/images/countries/bz.png diff --git a/core/src/main/resources/images/countries/ca.png b/gui/src/main/resources/images/countries/ca.png similarity index 100% rename from core/src/main/resources/images/countries/ca.png rename to gui/src/main/resources/images/countries/ca.png diff --git a/core/src/main/resources/images/countries/catalonia.png b/gui/src/main/resources/images/countries/catalonia.png similarity index 100% rename from core/src/main/resources/images/countries/catalonia.png rename to gui/src/main/resources/images/countries/catalonia.png diff --git a/core/src/main/resources/images/countries/cc.png b/gui/src/main/resources/images/countries/cc.png similarity index 100% rename from core/src/main/resources/images/countries/cc.png rename to gui/src/main/resources/images/countries/cc.png diff --git a/core/src/main/resources/images/countries/cd.png b/gui/src/main/resources/images/countries/cd.png similarity index 100% rename from core/src/main/resources/images/countries/cd.png rename to gui/src/main/resources/images/countries/cd.png diff --git a/core/src/main/resources/images/countries/cf.png b/gui/src/main/resources/images/countries/cf.png similarity index 100% rename from core/src/main/resources/images/countries/cf.png rename to gui/src/main/resources/images/countries/cf.png diff --git a/core/src/main/resources/images/countries/cg.png b/gui/src/main/resources/images/countries/cg.png similarity index 100% rename from core/src/main/resources/images/countries/cg.png rename to gui/src/main/resources/images/countries/cg.png diff --git a/core/src/main/resources/images/countries/ch.png b/gui/src/main/resources/images/countries/ch.png similarity index 100% rename from core/src/main/resources/images/countries/ch.png rename to gui/src/main/resources/images/countries/ch.png diff --git a/core/src/main/resources/images/countries/ci.png b/gui/src/main/resources/images/countries/ci.png similarity index 100% rename from core/src/main/resources/images/countries/ci.png rename to gui/src/main/resources/images/countries/ci.png diff --git a/core/src/main/resources/images/countries/ck.png b/gui/src/main/resources/images/countries/ck.png similarity index 100% rename from core/src/main/resources/images/countries/ck.png rename to gui/src/main/resources/images/countries/ck.png diff --git a/core/src/main/resources/images/countries/cl.png b/gui/src/main/resources/images/countries/cl.png similarity index 100% rename from core/src/main/resources/images/countries/cl.png rename to gui/src/main/resources/images/countries/cl.png diff --git a/core/src/main/resources/images/countries/cm.png b/gui/src/main/resources/images/countries/cm.png similarity index 100% rename from core/src/main/resources/images/countries/cm.png rename to gui/src/main/resources/images/countries/cm.png diff --git a/core/src/main/resources/images/countries/cn.png b/gui/src/main/resources/images/countries/cn.png similarity index 100% rename from core/src/main/resources/images/countries/cn.png rename to gui/src/main/resources/images/countries/cn.png diff --git a/core/src/main/resources/images/countries/co.png b/gui/src/main/resources/images/countries/co.png similarity index 100% rename from core/src/main/resources/images/countries/co.png rename to gui/src/main/resources/images/countries/co.png diff --git a/core/src/main/resources/images/countries/cr.png b/gui/src/main/resources/images/countries/cr.png similarity index 100% rename from core/src/main/resources/images/countries/cr.png rename to gui/src/main/resources/images/countries/cr.png diff --git a/core/src/main/resources/images/countries/cs.png b/gui/src/main/resources/images/countries/cs.png similarity index 100% rename from core/src/main/resources/images/countries/cs.png rename to gui/src/main/resources/images/countries/cs.png diff --git a/core/src/main/resources/images/countries/cu.png b/gui/src/main/resources/images/countries/cu.png similarity index 100% rename from core/src/main/resources/images/countries/cu.png rename to gui/src/main/resources/images/countries/cu.png diff --git a/core/src/main/resources/images/countries/cv.png b/gui/src/main/resources/images/countries/cv.png similarity index 100% rename from core/src/main/resources/images/countries/cv.png rename to gui/src/main/resources/images/countries/cv.png diff --git a/core/src/main/resources/images/countries/cx.png b/gui/src/main/resources/images/countries/cx.png similarity index 100% rename from core/src/main/resources/images/countries/cx.png rename to gui/src/main/resources/images/countries/cx.png diff --git a/core/src/main/resources/images/countries/cy.png b/gui/src/main/resources/images/countries/cy.png similarity index 100% rename from core/src/main/resources/images/countries/cy.png rename to gui/src/main/resources/images/countries/cy.png diff --git a/core/src/main/resources/images/countries/cz.png b/gui/src/main/resources/images/countries/cz.png similarity index 100% rename from core/src/main/resources/images/countries/cz.png rename to gui/src/main/resources/images/countries/cz.png diff --git a/core/src/main/resources/images/countries/de.png b/gui/src/main/resources/images/countries/de.png similarity index 100% rename from core/src/main/resources/images/countries/de.png rename to gui/src/main/resources/images/countries/de.png diff --git a/core/src/main/resources/images/countries/dj.png b/gui/src/main/resources/images/countries/dj.png similarity index 100% rename from core/src/main/resources/images/countries/dj.png rename to gui/src/main/resources/images/countries/dj.png diff --git a/core/src/main/resources/images/countries/dk.png b/gui/src/main/resources/images/countries/dk.png similarity index 100% rename from core/src/main/resources/images/countries/dk.png rename to gui/src/main/resources/images/countries/dk.png diff --git a/core/src/main/resources/images/countries/dm.png b/gui/src/main/resources/images/countries/dm.png similarity index 100% rename from core/src/main/resources/images/countries/dm.png rename to gui/src/main/resources/images/countries/dm.png diff --git a/core/src/main/resources/images/countries/do.png b/gui/src/main/resources/images/countries/do.png similarity index 100% rename from core/src/main/resources/images/countries/do.png rename to gui/src/main/resources/images/countries/do.png diff --git a/core/src/main/resources/images/countries/dz.png b/gui/src/main/resources/images/countries/dz.png similarity index 100% rename from core/src/main/resources/images/countries/dz.png rename to gui/src/main/resources/images/countries/dz.png diff --git a/core/src/main/resources/images/countries/ec.png b/gui/src/main/resources/images/countries/ec.png similarity index 100% rename from core/src/main/resources/images/countries/ec.png rename to gui/src/main/resources/images/countries/ec.png diff --git a/core/src/main/resources/images/countries/ee.png b/gui/src/main/resources/images/countries/ee.png similarity index 100% rename from core/src/main/resources/images/countries/ee.png rename to gui/src/main/resources/images/countries/ee.png diff --git a/core/src/main/resources/images/countries/eg.png b/gui/src/main/resources/images/countries/eg.png similarity index 100% rename from core/src/main/resources/images/countries/eg.png rename to gui/src/main/resources/images/countries/eg.png diff --git a/core/src/main/resources/images/countries/eh.png b/gui/src/main/resources/images/countries/eh.png similarity index 100% rename from core/src/main/resources/images/countries/eh.png rename to gui/src/main/resources/images/countries/eh.png diff --git a/core/src/main/resources/images/countries/england.png b/gui/src/main/resources/images/countries/england.png similarity index 100% rename from core/src/main/resources/images/countries/england.png rename to gui/src/main/resources/images/countries/england.png diff --git a/core/src/main/resources/images/countries/er.png b/gui/src/main/resources/images/countries/er.png similarity index 100% rename from core/src/main/resources/images/countries/er.png rename to gui/src/main/resources/images/countries/er.png diff --git a/core/src/main/resources/images/countries/es.png b/gui/src/main/resources/images/countries/es.png similarity index 100% rename from core/src/main/resources/images/countries/es.png rename to gui/src/main/resources/images/countries/es.png diff --git a/core/src/main/resources/images/countries/et.png b/gui/src/main/resources/images/countries/et.png similarity index 100% rename from core/src/main/resources/images/countries/et.png rename to gui/src/main/resources/images/countries/et.png diff --git a/core/src/main/resources/images/countries/eu.png b/gui/src/main/resources/images/countries/eu.png similarity index 100% rename from core/src/main/resources/images/countries/eu.png rename to gui/src/main/resources/images/countries/eu.png diff --git a/core/src/main/resources/images/countries/fam.png b/gui/src/main/resources/images/countries/fam.png similarity index 100% rename from core/src/main/resources/images/countries/fam.png rename to gui/src/main/resources/images/countries/fam.png diff --git a/core/src/main/resources/images/countries/fi.png b/gui/src/main/resources/images/countries/fi.png similarity index 100% rename from core/src/main/resources/images/countries/fi.png rename to gui/src/main/resources/images/countries/fi.png diff --git a/core/src/main/resources/images/countries/fj.png b/gui/src/main/resources/images/countries/fj.png similarity index 100% rename from core/src/main/resources/images/countries/fj.png rename to gui/src/main/resources/images/countries/fj.png diff --git a/core/src/main/resources/images/countries/fk.png b/gui/src/main/resources/images/countries/fk.png similarity index 100% rename from core/src/main/resources/images/countries/fk.png rename to gui/src/main/resources/images/countries/fk.png diff --git a/core/src/main/resources/images/countries/fm.png b/gui/src/main/resources/images/countries/fm.png similarity index 100% rename from core/src/main/resources/images/countries/fm.png rename to gui/src/main/resources/images/countries/fm.png diff --git a/core/src/main/resources/images/countries/fo.png b/gui/src/main/resources/images/countries/fo.png similarity index 100% rename from core/src/main/resources/images/countries/fo.png rename to gui/src/main/resources/images/countries/fo.png diff --git a/core/src/main/resources/images/countries/fr.png b/gui/src/main/resources/images/countries/fr.png similarity index 100% rename from core/src/main/resources/images/countries/fr.png rename to gui/src/main/resources/images/countries/fr.png diff --git a/core/src/main/resources/images/countries/ga.png b/gui/src/main/resources/images/countries/ga.png similarity index 100% rename from core/src/main/resources/images/countries/ga.png rename to gui/src/main/resources/images/countries/ga.png diff --git a/core/src/main/resources/images/countries/gd.png b/gui/src/main/resources/images/countries/gd.png similarity index 100% rename from core/src/main/resources/images/countries/gd.png rename to gui/src/main/resources/images/countries/gd.png diff --git a/core/src/main/resources/images/countries/ge.png b/gui/src/main/resources/images/countries/ge.png similarity index 100% rename from core/src/main/resources/images/countries/ge.png rename to gui/src/main/resources/images/countries/ge.png diff --git a/core/src/main/resources/images/countries/gf.png b/gui/src/main/resources/images/countries/gf.png similarity index 100% rename from core/src/main/resources/images/countries/gf.png rename to gui/src/main/resources/images/countries/gf.png diff --git a/core/src/main/resources/images/countries/gh.png b/gui/src/main/resources/images/countries/gh.png similarity index 100% rename from core/src/main/resources/images/countries/gh.png rename to gui/src/main/resources/images/countries/gh.png diff --git a/core/src/main/resources/images/countries/gi.png b/gui/src/main/resources/images/countries/gi.png similarity index 100% rename from core/src/main/resources/images/countries/gi.png rename to gui/src/main/resources/images/countries/gi.png diff --git a/core/src/main/resources/images/countries/gl.png b/gui/src/main/resources/images/countries/gl.png similarity index 100% rename from core/src/main/resources/images/countries/gl.png rename to gui/src/main/resources/images/countries/gl.png diff --git a/core/src/main/resources/images/countries/gm.png b/gui/src/main/resources/images/countries/gm.png similarity index 100% rename from core/src/main/resources/images/countries/gm.png rename to gui/src/main/resources/images/countries/gm.png diff --git a/core/src/main/resources/images/countries/gn.png b/gui/src/main/resources/images/countries/gn.png similarity index 100% rename from core/src/main/resources/images/countries/gn.png rename to gui/src/main/resources/images/countries/gn.png diff --git a/core/src/main/resources/images/countries/gp.png b/gui/src/main/resources/images/countries/gp.png similarity index 100% rename from core/src/main/resources/images/countries/gp.png rename to gui/src/main/resources/images/countries/gp.png diff --git a/core/src/main/resources/images/countries/gq.png b/gui/src/main/resources/images/countries/gq.png similarity index 100% rename from core/src/main/resources/images/countries/gq.png rename to gui/src/main/resources/images/countries/gq.png diff --git a/core/src/main/resources/images/countries/gr.png b/gui/src/main/resources/images/countries/gr.png similarity index 100% rename from core/src/main/resources/images/countries/gr.png rename to gui/src/main/resources/images/countries/gr.png diff --git a/core/src/main/resources/images/countries/gs.png b/gui/src/main/resources/images/countries/gs.png similarity index 100% rename from core/src/main/resources/images/countries/gs.png rename to gui/src/main/resources/images/countries/gs.png diff --git a/core/src/main/resources/images/countries/gt.png b/gui/src/main/resources/images/countries/gt.png similarity index 100% rename from core/src/main/resources/images/countries/gt.png rename to gui/src/main/resources/images/countries/gt.png diff --git a/core/src/main/resources/images/countries/gu.png b/gui/src/main/resources/images/countries/gu.png similarity index 100% rename from core/src/main/resources/images/countries/gu.png rename to gui/src/main/resources/images/countries/gu.png diff --git a/core/src/main/resources/images/countries/gw.png b/gui/src/main/resources/images/countries/gw.png similarity index 100% rename from core/src/main/resources/images/countries/gw.png rename to gui/src/main/resources/images/countries/gw.png diff --git a/core/src/main/resources/images/countries/gy.png b/gui/src/main/resources/images/countries/gy.png similarity index 100% rename from core/src/main/resources/images/countries/gy.png rename to gui/src/main/resources/images/countries/gy.png diff --git a/core/src/main/resources/images/countries/hk.png b/gui/src/main/resources/images/countries/hk.png similarity index 100% rename from core/src/main/resources/images/countries/hk.png rename to gui/src/main/resources/images/countries/hk.png diff --git a/core/src/main/resources/images/countries/hm.png b/gui/src/main/resources/images/countries/hm.png similarity index 100% rename from core/src/main/resources/images/countries/hm.png rename to gui/src/main/resources/images/countries/hm.png diff --git a/core/src/main/resources/images/countries/hn.png b/gui/src/main/resources/images/countries/hn.png similarity index 100% rename from core/src/main/resources/images/countries/hn.png rename to gui/src/main/resources/images/countries/hn.png diff --git a/core/src/main/resources/images/countries/hr.png b/gui/src/main/resources/images/countries/hr.png similarity index 100% rename from core/src/main/resources/images/countries/hr.png rename to gui/src/main/resources/images/countries/hr.png diff --git a/core/src/main/resources/images/countries/ht.png b/gui/src/main/resources/images/countries/ht.png similarity index 100% rename from core/src/main/resources/images/countries/ht.png rename to gui/src/main/resources/images/countries/ht.png diff --git a/core/src/main/resources/images/countries/hu.png b/gui/src/main/resources/images/countries/hu.png similarity index 100% rename from core/src/main/resources/images/countries/hu.png rename to gui/src/main/resources/images/countries/hu.png diff --git a/core/src/main/resources/images/countries/id.png b/gui/src/main/resources/images/countries/id.png similarity index 100% rename from core/src/main/resources/images/countries/id.png rename to gui/src/main/resources/images/countries/id.png diff --git a/core/src/main/resources/images/countries/ie.png b/gui/src/main/resources/images/countries/ie.png similarity index 100% rename from core/src/main/resources/images/countries/ie.png rename to gui/src/main/resources/images/countries/ie.png diff --git a/core/src/main/resources/images/countries/il.png b/gui/src/main/resources/images/countries/il.png similarity index 100% rename from core/src/main/resources/images/countries/il.png rename to gui/src/main/resources/images/countries/il.png diff --git a/core/src/main/resources/images/countries/in.png b/gui/src/main/resources/images/countries/in.png similarity index 100% rename from core/src/main/resources/images/countries/in.png rename to gui/src/main/resources/images/countries/in.png diff --git a/core/src/main/resources/images/countries/io.png b/gui/src/main/resources/images/countries/io.png similarity index 100% rename from core/src/main/resources/images/countries/io.png rename to gui/src/main/resources/images/countries/io.png diff --git a/core/src/main/resources/images/countries/iq.png b/gui/src/main/resources/images/countries/iq.png similarity index 100% rename from core/src/main/resources/images/countries/iq.png rename to gui/src/main/resources/images/countries/iq.png diff --git a/core/src/main/resources/images/countries/ir.png b/gui/src/main/resources/images/countries/ir.png similarity index 100% rename from core/src/main/resources/images/countries/ir.png rename to gui/src/main/resources/images/countries/ir.png diff --git a/core/src/main/resources/images/countries/is.png b/gui/src/main/resources/images/countries/is.png similarity index 100% rename from core/src/main/resources/images/countries/is.png rename to gui/src/main/resources/images/countries/is.png diff --git a/core/src/main/resources/images/countries/it.png b/gui/src/main/resources/images/countries/it.png similarity index 100% rename from core/src/main/resources/images/countries/it.png rename to gui/src/main/resources/images/countries/it.png diff --git a/core/src/main/resources/images/countries/jm.png b/gui/src/main/resources/images/countries/jm.png similarity index 100% rename from core/src/main/resources/images/countries/jm.png rename to gui/src/main/resources/images/countries/jm.png diff --git a/core/src/main/resources/images/countries/jo.png b/gui/src/main/resources/images/countries/jo.png similarity index 100% rename from core/src/main/resources/images/countries/jo.png rename to gui/src/main/resources/images/countries/jo.png diff --git a/core/src/main/resources/images/countries/jp.png b/gui/src/main/resources/images/countries/jp.png similarity index 100% rename from core/src/main/resources/images/countries/jp.png rename to gui/src/main/resources/images/countries/jp.png diff --git a/core/src/main/resources/images/countries/ke.png b/gui/src/main/resources/images/countries/ke.png similarity index 100% rename from core/src/main/resources/images/countries/ke.png rename to gui/src/main/resources/images/countries/ke.png diff --git a/core/src/main/resources/images/countries/kg.png b/gui/src/main/resources/images/countries/kg.png similarity index 100% rename from core/src/main/resources/images/countries/kg.png rename to gui/src/main/resources/images/countries/kg.png diff --git a/core/src/main/resources/images/countries/kh.png b/gui/src/main/resources/images/countries/kh.png similarity index 100% rename from core/src/main/resources/images/countries/kh.png rename to gui/src/main/resources/images/countries/kh.png diff --git a/core/src/main/resources/images/countries/ki.png b/gui/src/main/resources/images/countries/ki.png similarity index 100% rename from core/src/main/resources/images/countries/ki.png rename to gui/src/main/resources/images/countries/ki.png diff --git a/core/src/main/resources/images/countries/km.png b/gui/src/main/resources/images/countries/km.png similarity index 100% rename from core/src/main/resources/images/countries/km.png rename to gui/src/main/resources/images/countries/km.png diff --git a/core/src/main/resources/images/countries/kn.png b/gui/src/main/resources/images/countries/kn.png similarity index 100% rename from core/src/main/resources/images/countries/kn.png rename to gui/src/main/resources/images/countries/kn.png diff --git a/core/src/main/resources/images/countries/kp.png b/gui/src/main/resources/images/countries/kp.png similarity index 100% rename from core/src/main/resources/images/countries/kp.png rename to gui/src/main/resources/images/countries/kp.png diff --git a/core/src/main/resources/images/countries/kr.png b/gui/src/main/resources/images/countries/kr.png similarity index 100% rename from core/src/main/resources/images/countries/kr.png rename to gui/src/main/resources/images/countries/kr.png diff --git a/core/src/main/resources/images/countries/kw.png b/gui/src/main/resources/images/countries/kw.png similarity index 100% rename from core/src/main/resources/images/countries/kw.png rename to gui/src/main/resources/images/countries/kw.png diff --git a/core/src/main/resources/images/countries/ky.png b/gui/src/main/resources/images/countries/ky.png similarity index 100% rename from core/src/main/resources/images/countries/ky.png rename to gui/src/main/resources/images/countries/ky.png diff --git a/core/src/main/resources/images/countries/kz.png b/gui/src/main/resources/images/countries/kz.png similarity index 100% rename from core/src/main/resources/images/countries/kz.png rename to gui/src/main/resources/images/countries/kz.png diff --git a/core/src/main/resources/images/countries/la.png b/gui/src/main/resources/images/countries/la.png similarity index 100% rename from core/src/main/resources/images/countries/la.png rename to gui/src/main/resources/images/countries/la.png diff --git a/core/src/main/resources/images/countries/lb.png b/gui/src/main/resources/images/countries/lb.png similarity index 100% rename from core/src/main/resources/images/countries/lb.png rename to gui/src/main/resources/images/countries/lb.png diff --git a/core/src/main/resources/images/countries/lc.png b/gui/src/main/resources/images/countries/lc.png similarity index 100% rename from core/src/main/resources/images/countries/lc.png rename to gui/src/main/resources/images/countries/lc.png diff --git a/core/src/main/resources/images/countries/li.png b/gui/src/main/resources/images/countries/li.png similarity index 100% rename from core/src/main/resources/images/countries/li.png rename to gui/src/main/resources/images/countries/li.png diff --git a/core/src/main/resources/images/countries/lk.png b/gui/src/main/resources/images/countries/lk.png similarity index 100% rename from core/src/main/resources/images/countries/lk.png rename to gui/src/main/resources/images/countries/lk.png diff --git a/core/src/main/resources/images/countries/lr.png b/gui/src/main/resources/images/countries/lr.png similarity index 100% rename from core/src/main/resources/images/countries/lr.png rename to gui/src/main/resources/images/countries/lr.png diff --git a/core/src/main/resources/images/countries/ls.png b/gui/src/main/resources/images/countries/ls.png similarity index 100% rename from core/src/main/resources/images/countries/ls.png rename to gui/src/main/resources/images/countries/ls.png diff --git a/core/src/main/resources/images/countries/lt.png b/gui/src/main/resources/images/countries/lt.png similarity index 100% rename from core/src/main/resources/images/countries/lt.png rename to gui/src/main/resources/images/countries/lt.png diff --git a/core/src/main/resources/images/countries/lu.png b/gui/src/main/resources/images/countries/lu.png similarity index 100% rename from core/src/main/resources/images/countries/lu.png rename to gui/src/main/resources/images/countries/lu.png diff --git a/core/src/main/resources/images/countries/lv.png b/gui/src/main/resources/images/countries/lv.png similarity index 100% rename from core/src/main/resources/images/countries/lv.png rename to gui/src/main/resources/images/countries/lv.png diff --git a/core/src/main/resources/images/countries/ly.png b/gui/src/main/resources/images/countries/ly.png similarity index 100% rename from core/src/main/resources/images/countries/ly.png rename to gui/src/main/resources/images/countries/ly.png diff --git a/core/src/main/resources/images/countries/ma.png b/gui/src/main/resources/images/countries/ma.png similarity index 100% rename from core/src/main/resources/images/countries/ma.png rename to gui/src/main/resources/images/countries/ma.png diff --git a/core/src/main/resources/images/countries/mc.png b/gui/src/main/resources/images/countries/mc.png similarity index 100% rename from core/src/main/resources/images/countries/mc.png rename to gui/src/main/resources/images/countries/mc.png diff --git a/core/src/main/resources/images/countries/md.png b/gui/src/main/resources/images/countries/md.png similarity index 100% rename from core/src/main/resources/images/countries/md.png rename to gui/src/main/resources/images/countries/md.png diff --git a/core/src/main/resources/images/countries/me.png b/gui/src/main/resources/images/countries/me.png similarity index 100% rename from core/src/main/resources/images/countries/me.png rename to gui/src/main/resources/images/countries/me.png diff --git a/core/src/main/resources/images/countries/mg.png b/gui/src/main/resources/images/countries/mg.png similarity index 100% rename from core/src/main/resources/images/countries/mg.png rename to gui/src/main/resources/images/countries/mg.png diff --git a/core/src/main/resources/images/countries/mh.png b/gui/src/main/resources/images/countries/mh.png similarity index 100% rename from core/src/main/resources/images/countries/mh.png rename to gui/src/main/resources/images/countries/mh.png diff --git a/core/src/main/resources/images/countries/mk.png b/gui/src/main/resources/images/countries/mk.png similarity index 100% rename from core/src/main/resources/images/countries/mk.png rename to gui/src/main/resources/images/countries/mk.png diff --git a/core/src/main/resources/images/countries/ml.png b/gui/src/main/resources/images/countries/ml.png similarity index 100% rename from core/src/main/resources/images/countries/ml.png rename to gui/src/main/resources/images/countries/ml.png diff --git a/core/src/main/resources/images/countries/mm.png b/gui/src/main/resources/images/countries/mm.png similarity index 100% rename from core/src/main/resources/images/countries/mm.png rename to gui/src/main/resources/images/countries/mm.png diff --git a/core/src/main/resources/images/countries/mn.png b/gui/src/main/resources/images/countries/mn.png similarity index 100% rename from core/src/main/resources/images/countries/mn.png rename to gui/src/main/resources/images/countries/mn.png diff --git a/core/src/main/resources/images/countries/mo.png b/gui/src/main/resources/images/countries/mo.png similarity index 100% rename from core/src/main/resources/images/countries/mo.png rename to gui/src/main/resources/images/countries/mo.png diff --git a/core/src/main/resources/images/countries/mp.png b/gui/src/main/resources/images/countries/mp.png similarity index 100% rename from core/src/main/resources/images/countries/mp.png rename to gui/src/main/resources/images/countries/mp.png diff --git a/core/src/main/resources/images/countries/mq.png b/gui/src/main/resources/images/countries/mq.png similarity index 100% rename from core/src/main/resources/images/countries/mq.png rename to gui/src/main/resources/images/countries/mq.png diff --git a/core/src/main/resources/images/countries/mr.png b/gui/src/main/resources/images/countries/mr.png similarity index 100% rename from core/src/main/resources/images/countries/mr.png rename to gui/src/main/resources/images/countries/mr.png diff --git a/core/src/main/resources/images/countries/ms.png b/gui/src/main/resources/images/countries/ms.png similarity index 100% rename from core/src/main/resources/images/countries/ms.png rename to gui/src/main/resources/images/countries/ms.png diff --git a/core/src/main/resources/images/countries/mt.png b/gui/src/main/resources/images/countries/mt.png similarity index 100% rename from core/src/main/resources/images/countries/mt.png rename to gui/src/main/resources/images/countries/mt.png diff --git a/core/src/main/resources/images/countries/mu.png b/gui/src/main/resources/images/countries/mu.png similarity index 100% rename from core/src/main/resources/images/countries/mu.png rename to gui/src/main/resources/images/countries/mu.png diff --git a/core/src/main/resources/images/countries/mv.png b/gui/src/main/resources/images/countries/mv.png similarity index 100% rename from core/src/main/resources/images/countries/mv.png rename to gui/src/main/resources/images/countries/mv.png diff --git a/core/src/main/resources/images/countries/mw.png b/gui/src/main/resources/images/countries/mw.png similarity index 100% rename from core/src/main/resources/images/countries/mw.png rename to gui/src/main/resources/images/countries/mw.png diff --git a/core/src/main/resources/images/countries/mx.png b/gui/src/main/resources/images/countries/mx.png similarity index 100% rename from core/src/main/resources/images/countries/mx.png rename to gui/src/main/resources/images/countries/mx.png diff --git a/core/src/main/resources/images/countries/my.png b/gui/src/main/resources/images/countries/my.png similarity index 100% rename from core/src/main/resources/images/countries/my.png rename to gui/src/main/resources/images/countries/my.png diff --git a/core/src/main/resources/images/countries/mz.png b/gui/src/main/resources/images/countries/mz.png similarity index 100% rename from core/src/main/resources/images/countries/mz.png rename to gui/src/main/resources/images/countries/mz.png diff --git a/core/src/main/resources/images/countries/na.png b/gui/src/main/resources/images/countries/na.png similarity index 100% rename from core/src/main/resources/images/countries/na.png rename to gui/src/main/resources/images/countries/na.png diff --git a/core/src/main/resources/images/countries/nc.png b/gui/src/main/resources/images/countries/nc.png similarity index 100% rename from core/src/main/resources/images/countries/nc.png rename to gui/src/main/resources/images/countries/nc.png diff --git a/core/src/main/resources/images/countries/ne.png b/gui/src/main/resources/images/countries/ne.png similarity index 100% rename from core/src/main/resources/images/countries/ne.png rename to gui/src/main/resources/images/countries/ne.png diff --git a/core/src/main/resources/images/countries/nf.png b/gui/src/main/resources/images/countries/nf.png similarity index 100% rename from core/src/main/resources/images/countries/nf.png rename to gui/src/main/resources/images/countries/nf.png diff --git a/core/src/main/resources/images/countries/ng.png b/gui/src/main/resources/images/countries/ng.png similarity index 100% rename from core/src/main/resources/images/countries/ng.png rename to gui/src/main/resources/images/countries/ng.png diff --git a/core/src/main/resources/images/countries/ni.png b/gui/src/main/resources/images/countries/ni.png similarity index 100% rename from core/src/main/resources/images/countries/ni.png rename to gui/src/main/resources/images/countries/ni.png diff --git a/core/src/main/resources/images/countries/nl.png b/gui/src/main/resources/images/countries/nl.png similarity index 100% rename from core/src/main/resources/images/countries/nl.png rename to gui/src/main/resources/images/countries/nl.png diff --git a/core/src/main/resources/images/countries/no.png b/gui/src/main/resources/images/countries/no.png similarity index 100% rename from core/src/main/resources/images/countries/no.png rename to gui/src/main/resources/images/countries/no.png diff --git a/core/src/main/resources/images/countries/np.png b/gui/src/main/resources/images/countries/np.png similarity index 100% rename from core/src/main/resources/images/countries/np.png rename to gui/src/main/resources/images/countries/np.png diff --git a/core/src/main/resources/images/countries/nr.png b/gui/src/main/resources/images/countries/nr.png similarity index 100% rename from core/src/main/resources/images/countries/nr.png rename to gui/src/main/resources/images/countries/nr.png diff --git a/core/src/main/resources/images/countries/nu.png b/gui/src/main/resources/images/countries/nu.png similarity index 100% rename from core/src/main/resources/images/countries/nu.png rename to gui/src/main/resources/images/countries/nu.png diff --git a/core/src/main/resources/images/countries/nz.png b/gui/src/main/resources/images/countries/nz.png similarity index 100% rename from core/src/main/resources/images/countries/nz.png rename to gui/src/main/resources/images/countries/nz.png diff --git a/core/src/main/resources/images/countries/om.png b/gui/src/main/resources/images/countries/om.png similarity index 100% rename from core/src/main/resources/images/countries/om.png rename to gui/src/main/resources/images/countries/om.png diff --git a/core/src/main/resources/images/countries/pa.png b/gui/src/main/resources/images/countries/pa.png similarity index 100% rename from core/src/main/resources/images/countries/pa.png rename to gui/src/main/resources/images/countries/pa.png diff --git a/core/src/main/resources/images/countries/pe.png b/gui/src/main/resources/images/countries/pe.png similarity index 100% rename from core/src/main/resources/images/countries/pe.png rename to gui/src/main/resources/images/countries/pe.png diff --git a/core/src/main/resources/images/countries/pf.png b/gui/src/main/resources/images/countries/pf.png similarity index 100% rename from core/src/main/resources/images/countries/pf.png rename to gui/src/main/resources/images/countries/pf.png diff --git a/core/src/main/resources/images/countries/pg.png b/gui/src/main/resources/images/countries/pg.png similarity index 100% rename from core/src/main/resources/images/countries/pg.png rename to gui/src/main/resources/images/countries/pg.png diff --git a/core/src/main/resources/images/countries/ph.png b/gui/src/main/resources/images/countries/ph.png similarity index 100% rename from core/src/main/resources/images/countries/ph.png rename to gui/src/main/resources/images/countries/ph.png diff --git a/core/src/main/resources/images/countries/pk.png b/gui/src/main/resources/images/countries/pk.png similarity index 100% rename from core/src/main/resources/images/countries/pk.png rename to gui/src/main/resources/images/countries/pk.png diff --git a/core/src/main/resources/images/countries/pl.png b/gui/src/main/resources/images/countries/pl.png similarity index 100% rename from core/src/main/resources/images/countries/pl.png rename to gui/src/main/resources/images/countries/pl.png diff --git a/core/src/main/resources/images/countries/pm.png b/gui/src/main/resources/images/countries/pm.png similarity index 100% rename from core/src/main/resources/images/countries/pm.png rename to gui/src/main/resources/images/countries/pm.png diff --git a/core/src/main/resources/images/countries/pn.png b/gui/src/main/resources/images/countries/pn.png similarity index 100% rename from core/src/main/resources/images/countries/pn.png rename to gui/src/main/resources/images/countries/pn.png diff --git a/core/src/main/resources/images/countries/pr.png b/gui/src/main/resources/images/countries/pr.png similarity index 100% rename from core/src/main/resources/images/countries/pr.png rename to gui/src/main/resources/images/countries/pr.png diff --git a/core/src/main/resources/images/countries/ps.png b/gui/src/main/resources/images/countries/ps.png similarity index 100% rename from core/src/main/resources/images/countries/ps.png rename to gui/src/main/resources/images/countries/ps.png diff --git a/core/src/main/resources/images/countries/pt.png b/gui/src/main/resources/images/countries/pt.png similarity index 100% rename from core/src/main/resources/images/countries/pt.png rename to gui/src/main/resources/images/countries/pt.png diff --git a/core/src/main/resources/images/countries/pw.png b/gui/src/main/resources/images/countries/pw.png similarity index 100% rename from core/src/main/resources/images/countries/pw.png rename to gui/src/main/resources/images/countries/pw.png diff --git a/core/src/main/resources/images/countries/py.png b/gui/src/main/resources/images/countries/py.png similarity index 100% rename from core/src/main/resources/images/countries/py.png rename to gui/src/main/resources/images/countries/py.png diff --git a/core/src/main/resources/images/countries/qa.png b/gui/src/main/resources/images/countries/qa.png similarity index 100% rename from core/src/main/resources/images/countries/qa.png rename to gui/src/main/resources/images/countries/qa.png diff --git a/core/src/main/resources/images/countries/re.png b/gui/src/main/resources/images/countries/re.png similarity index 100% rename from core/src/main/resources/images/countries/re.png rename to gui/src/main/resources/images/countries/re.png diff --git a/core/src/main/resources/images/countries/ro.png b/gui/src/main/resources/images/countries/ro.png similarity index 100% rename from core/src/main/resources/images/countries/ro.png rename to gui/src/main/resources/images/countries/ro.png diff --git a/core/src/main/resources/images/countries/rs.png b/gui/src/main/resources/images/countries/rs.png similarity index 100% rename from core/src/main/resources/images/countries/rs.png rename to gui/src/main/resources/images/countries/rs.png diff --git a/core/src/main/resources/images/countries/ru.png b/gui/src/main/resources/images/countries/ru.png similarity index 100% rename from core/src/main/resources/images/countries/ru.png rename to gui/src/main/resources/images/countries/ru.png diff --git a/core/src/main/resources/images/countries/rw.png b/gui/src/main/resources/images/countries/rw.png similarity index 100% rename from core/src/main/resources/images/countries/rw.png rename to gui/src/main/resources/images/countries/rw.png diff --git a/core/src/main/resources/images/countries/sa.png b/gui/src/main/resources/images/countries/sa.png similarity index 100% rename from core/src/main/resources/images/countries/sa.png rename to gui/src/main/resources/images/countries/sa.png diff --git a/core/src/main/resources/images/countries/sb.png b/gui/src/main/resources/images/countries/sb.png similarity index 100% rename from core/src/main/resources/images/countries/sb.png rename to gui/src/main/resources/images/countries/sb.png diff --git a/core/src/main/resources/images/countries/sc.png b/gui/src/main/resources/images/countries/sc.png similarity index 100% rename from core/src/main/resources/images/countries/sc.png rename to gui/src/main/resources/images/countries/sc.png diff --git a/core/src/main/resources/images/countries/scotland.png b/gui/src/main/resources/images/countries/scotland.png similarity index 100% rename from core/src/main/resources/images/countries/scotland.png rename to gui/src/main/resources/images/countries/scotland.png diff --git a/core/src/main/resources/images/countries/sd.png b/gui/src/main/resources/images/countries/sd.png similarity index 100% rename from core/src/main/resources/images/countries/sd.png rename to gui/src/main/resources/images/countries/sd.png diff --git a/core/src/main/resources/images/countries/se.png b/gui/src/main/resources/images/countries/se.png similarity index 100% rename from core/src/main/resources/images/countries/se.png rename to gui/src/main/resources/images/countries/se.png diff --git a/core/src/main/resources/images/countries/sg.png b/gui/src/main/resources/images/countries/sg.png similarity index 100% rename from core/src/main/resources/images/countries/sg.png rename to gui/src/main/resources/images/countries/sg.png diff --git a/core/src/main/resources/images/countries/sh.png b/gui/src/main/resources/images/countries/sh.png similarity index 100% rename from core/src/main/resources/images/countries/sh.png rename to gui/src/main/resources/images/countries/sh.png diff --git a/core/src/main/resources/images/countries/si.png b/gui/src/main/resources/images/countries/si.png similarity index 100% rename from core/src/main/resources/images/countries/si.png rename to gui/src/main/resources/images/countries/si.png diff --git a/core/src/main/resources/images/countries/sj.png b/gui/src/main/resources/images/countries/sj.png similarity index 100% rename from core/src/main/resources/images/countries/sj.png rename to gui/src/main/resources/images/countries/sj.png diff --git a/core/src/main/resources/images/countries/sk.png b/gui/src/main/resources/images/countries/sk.png similarity index 100% rename from core/src/main/resources/images/countries/sk.png rename to gui/src/main/resources/images/countries/sk.png diff --git a/core/src/main/resources/images/countries/sl.png b/gui/src/main/resources/images/countries/sl.png similarity index 100% rename from core/src/main/resources/images/countries/sl.png rename to gui/src/main/resources/images/countries/sl.png diff --git a/core/src/main/resources/images/countries/sm.png b/gui/src/main/resources/images/countries/sm.png similarity index 100% rename from core/src/main/resources/images/countries/sm.png rename to gui/src/main/resources/images/countries/sm.png diff --git a/core/src/main/resources/images/countries/sn.png b/gui/src/main/resources/images/countries/sn.png similarity index 100% rename from core/src/main/resources/images/countries/sn.png rename to gui/src/main/resources/images/countries/sn.png diff --git a/core/src/main/resources/images/countries/so.png b/gui/src/main/resources/images/countries/so.png similarity index 100% rename from core/src/main/resources/images/countries/so.png rename to gui/src/main/resources/images/countries/so.png diff --git a/core/src/main/resources/images/countries/sr.png b/gui/src/main/resources/images/countries/sr.png similarity index 100% rename from core/src/main/resources/images/countries/sr.png rename to gui/src/main/resources/images/countries/sr.png diff --git a/core/src/main/resources/images/countries/st.png b/gui/src/main/resources/images/countries/st.png similarity index 100% rename from core/src/main/resources/images/countries/st.png rename to gui/src/main/resources/images/countries/st.png diff --git a/core/src/main/resources/images/countries/sv.png b/gui/src/main/resources/images/countries/sv.png similarity index 100% rename from core/src/main/resources/images/countries/sv.png rename to gui/src/main/resources/images/countries/sv.png diff --git a/core/src/main/resources/images/countries/sy.png b/gui/src/main/resources/images/countries/sy.png similarity index 100% rename from core/src/main/resources/images/countries/sy.png rename to gui/src/main/resources/images/countries/sy.png diff --git a/core/src/main/resources/images/countries/sz.png b/gui/src/main/resources/images/countries/sz.png similarity index 100% rename from core/src/main/resources/images/countries/sz.png rename to gui/src/main/resources/images/countries/sz.png diff --git a/core/src/main/resources/images/countries/tc.png b/gui/src/main/resources/images/countries/tc.png similarity index 100% rename from core/src/main/resources/images/countries/tc.png rename to gui/src/main/resources/images/countries/tc.png diff --git a/core/src/main/resources/images/countries/td.png b/gui/src/main/resources/images/countries/td.png similarity index 100% rename from core/src/main/resources/images/countries/td.png rename to gui/src/main/resources/images/countries/td.png diff --git a/core/src/main/resources/images/countries/tf.png b/gui/src/main/resources/images/countries/tf.png similarity index 100% rename from core/src/main/resources/images/countries/tf.png rename to gui/src/main/resources/images/countries/tf.png diff --git a/core/src/main/resources/images/countries/tg.png b/gui/src/main/resources/images/countries/tg.png similarity index 100% rename from core/src/main/resources/images/countries/tg.png rename to gui/src/main/resources/images/countries/tg.png diff --git a/core/src/main/resources/images/countries/th.png b/gui/src/main/resources/images/countries/th.png similarity index 100% rename from core/src/main/resources/images/countries/th.png rename to gui/src/main/resources/images/countries/th.png diff --git a/core/src/main/resources/images/countries/tj.png b/gui/src/main/resources/images/countries/tj.png similarity index 100% rename from core/src/main/resources/images/countries/tj.png rename to gui/src/main/resources/images/countries/tj.png diff --git a/core/src/main/resources/images/countries/tk.png b/gui/src/main/resources/images/countries/tk.png similarity index 100% rename from core/src/main/resources/images/countries/tk.png rename to gui/src/main/resources/images/countries/tk.png diff --git a/core/src/main/resources/images/countries/tl.png b/gui/src/main/resources/images/countries/tl.png similarity index 100% rename from core/src/main/resources/images/countries/tl.png rename to gui/src/main/resources/images/countries/tl.png diff --git a/core/src/main/resources/images/countries/tm.png b/gui/src/main/resources/images/countries/tm.png similarity index 100% rename from core/src/main/resources/images/countries/tm.png rename to gui/src/main/resources/images/countries/tm.png diff --git a/core/src/main/resources/images/countries/tn.png b/gui/src/main/resources/images/countries/tn.png similarity index 100% rename from core/src/main/resources/images/countries/tn.png rename to gui/src/main/resources/images/countries/tn.png diff --git a/core/src/main/resources/images/countries/to.png b/gui/src/main/resources/images/countries/to.png similarity index 100% rename from core/src/main/resources/images/countries/to.png rename to gui/src/main/resources/images/countries/to.png diff --git a/core/src/main/resources/images/countries/tr.png b/gui/src/main/resources/images/countries/tr.png similarity index 100% rename from core/src/main/resources/images/countries/tr.png rename to gui/src/main/resources/images/countries/tr.png diff --git a/core/src/main/resources/images/countries/tt.png b/gui/src/main/resources/images/countries/tt.png similarity index 100% rename from core/src/main/resources/images/countries/tt.png rename to gui/src/main/resources/images/countries/tt.png diff --git a/core/src/main/resources/images/countries/tv.png b/gui/src/main/resources/images/countries/tv.png similarity index 100% rename from core/src/main/resources/images/countries/tv.png rename to gui/src/main/resources/images/countries/tv.png diff --git a/core/src/main/resources/images/countries/tw.png b/gui/src/main/resources/images/countries/tw.png similarity index 100% rename from core/src/main/resources/images/countries/tw.png rename to gui/src/main/resources/images/countries/tw.png diff --git a/core/src/main/resources/images/countries/tz.png b/gui/src/main/resources/images/countries/tz.png similarity index 100% rename from core/src/main/resources/images/countries/tz.png rename to gui/src/main/resources/images/countries/tz.png diff --git a/core/src/main/resources/images/countries/ua.png b/gui/src/main/resources/images/countries/ua.png similarity index 100% rename from core/src/main/resources/images/countries/ua.png rename to gui/src/main/resources/images/countries/ua.png diff --git a/core/src/main/resources/images/countries/ug.png b/gui/src/main/resources/images/countries/ug.png similarity index 100% rename from core/src/main/resources/images/countries/ug.png rename to gui/src/main/resources/images/countries/ug.png diff --git a/core/src/main/resources/images/countries/uk.png b/gui/src/main/resources/images/countries/uk.png similarity index 100% rename from core/src/main/resources/images/countries/uk.png rename to gui/src/main/resources/images/countries/uk.png diff --git a/core/src/main/resources/images/countries/um.png b/gui/src/main/resources/images/countries/um.png similarity index 100% rename from core/src/main/resources/images/countries/um.png rename to gui/src/main/resources/images/countries/um.png diff --git a/core/src/main/resources/images/countries/us.png b/gui/src/main/resources/images/countries/us.png similarity index 100% rename from core/src/main/resources/images/countries/us.png rename to gui/src/main/resources/images/countries/us.png diff --git a/core/src/main/resources/images/countries/uy.png b/gui/src/main/resources/images/countries/uy.png similarity index 100% rename from core/src/main/resources/images/countries/uy.png rename to gui/src/main/resources/images/countries/uy.png diff --git a/core/src/main/resources/images/countries/uz.png b/gui/src/main/resources/images/countries/uz.png similarity index 100% rename from core/src/main/resources/images/countries/uz.png rename to gui/src/main/resources/images/countries/uz.png diff --git a/core/src/main/resources/images/countries/va.png b/gui/src/main/resources/images/countries/va.png similarity index 100% rename from core/src/main/resources/images/countries/va.png rename to gui/src/main/resources/images/countries/va.png diff --git a/core/src/main/resources/images/countries/vc.png b/gui/src/main/resources/images/countries/vc.png similarity index 100% rename from core/src/main/resources/images/countries/vc.png rename to gui/src/main/resources/images/countries/vc.png diff --git a/core/src/main/resources/images/countries/ve.png b/gui/src/main/resources/images/countries/ve.png similarity index 100% rename from core/src/main/resources/images/countries/ve.png rename to gui/src/main/resources/images/countries/ve.png diff --git a/core/src/main/resources/images/countries/vg.png b/gui/src/main/resources/images/countries/vg.png similarity index 100% rename from core/src/main/resources/images/countries/vg.png rename to gui/src/main/resources/images/countries/vg.png diff --git a/core/src/main/resources/images/countries/vi.png b/gui/src/main/resources/images/countries/vi.png similarity index 100% rename from core/src/main/resources/images/countries/vi.png rename to gui/src/main/resources/images/countries/vi.png diff --git a/core/src/main/resources/images/countries/vn.png b/gui/src/main/resources/images/countries/vn.png similarity index 100% rename from core/src/main/resources/images/countries/vn.png rename to gui/src/main/resources/images/countries/vn.png diff --git a/core/src/main/resources/images/countries/vu.png b/gui/src/main/resources/images/countries/vu.png similarity index 100% rename from core/src/main/resources/images/countries/vu.png rename to gui/src/main/resources/images/countries/vu.png diff --git a/core/src/main/resources/images/countries/wales.png b/gui/src/main/resources/images/countries/wales.png similarity index 100% rename from core/src/main/resources/images/countries/wales.png rename to gui/src/main/resources/images/countries/wales.png diff --git a/core/src/main/resources/images/countries/wf.png b/gui/src/main/resources/images/countries/wf.png similarity index 100% rename from core/src/main/resources/images/countries/wf.png rename to gui/src/main/resources/images/countries/wf.png diff --git a/core/src/main/resources/images/countries/ws.png b/gui/src/main/resources/images/countries/ws.png similarity index 100% rename from core/src/main/resources/images/countries/ws.png rename to gui/src/main/resources/images/countries/ws.png diff --git a/core/src/main/resources/images/countries/ye.png b/gui/src/main/resources/images/countries/ye.png similarity index 100% rename from core/src/main/resources/images/countries/ye.png rename to gui/src/main/resources/images/countries/ye.png diff --git a/core/src/main/resources/images/countries/yt.png b/gui/src/main/resources/images/countries/yt.png similarity index 100% rename from core/src/main/resources/images/countries/yt.png rename to gui/src/main/resources/images/countries/yt.png diff --git a/core/src/main/resources/images/countries/za.png b/gui/src/main/resources/images/countries/za.png similarity index 100% rename from core/src/main/resources/images/countries/za.png rename to gui/src/main/resources/images/countries/za.png diff --git a/core/src/main/resources/images/countries/zm.png b/gui/src/main/resources/images/countries/zm.png similarity index 100% rename from core/src/main/resources/images/countries/zm.png rename to gui/src/main/resources/images/countries/zm.png diff --git a/core/src/main/resources/images/countries/zw.png b/gui/src/main/resources/images/countries/zw.png similarity index 100% rename from core/src/main/resources/images/countries/zw.png rename to gui/src/main/resources/images/countries/zw.png diff --git a/core/src/main/resources/images/expand.png b/gui/src/main/resources/images/expand.png similarity index 100% rename from core/src/main/resources/images/expand.png rename to gui/src/main/resources/images/expand.png diff --git a/core/src/main/resources/images/expand@2x.png b/gui/src/main/resources/images/expand@2x.png similarity index 100% rename from core/src/main/resources/images/expand@2x.png rename to gui/src/main/resources/images/expand@2x.png diff --git a/core/src/main/resources/images/info.png b/gui/src/main/resources/images/info.png similarity index 100% rename from core/src/main/resources/images/info.png rename to gui/src/main/resources/images/info.png diff --git a/core/src/main/resources/images/info@2x.png b/gui/src/main/resources/images/info@2x.png similarity index 100% rename from core/src/main/resources/images/info@2x.png rename to gui/src/main/resources/images/info@2x.png diff --git a/core/src/main/resources/images/logo_splash.png b/gui/src/main/resources/images/logo_splash.png similarity index 100% rename from core/src/main/resources/images/logo_splash.png rename to gui/src/main/resources/images/logo_splash.png diff --git a/core/src/main/resources/images/logo_splash@2x.png b/gui/src/main/resources/images/logo_splash@2x.png similarity index 100% rename from core/src/main/resources/images/logo_splash@2x.png rename to gui/src/main/resources/images/logo_splash@2x.png diff --git a/core/src/main/resources/images/nav/account.png b/gui/src/main/resources/images/nav/account.png similarity index 100% rename from core/src/main/resources/images/nav/account.png rename to gui/src/main/resources/images/nav/account.png diff --git a/core/src/main/resources/images/nav/account@2x.png b/gui/src/main/resources/images/nav/account@2x.png similarity index 100% rename from core/src/main/resources/images/nav/account@2x.png rename to gui/src/main/resources/images/nav/account@2x.png diff --git a/core/src/main/resources/images/nav/account_active.png b/gui/src/main/resources/images/nav/account_active.png similarity index 100% rename from core/src/main/resources/images/nav/account_active.png rename to gui/src/main/resources/images/nav/account_active.png diff --git a/core/src/main/resources/images/nav/account_active@2x.png b/gui/src/main/resources/images/nav/account_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/account_active@2x.png rename to gui/src/main/resources/images/nav/account_active@2x.png diff --git a/core/src/main/resources/images/nav/buyoffer.png b/gui/src/main/resources/images/nav/buyoffer.png similarity index 100% rename from core/src/main/resources/images/nav/buyoffer.png rename to gui/src/main/resources/images/nav/buyoffer.png diff --git a/core/src/main/resources/images/nav/buyoffer@2x.png b/gui/src/main/resources/images/nav/buyoffer@2x.png similarity index 100% rename from core/src/main/resources/images/nav/buyoffer@2x.png rename to gui/src/main/resources/images/nav/buyoffer@2x.png diff --git a/core/src/main/resources/images/nav/buyoffer_active.png b/gui/src/main/resources/images/nav/buyoffer_active.png similarity index 100% rename from core/src/main/resources/images/nav/buyoffer_active.png rename to gui/src/main/resources/images/nav/buyoffer_active.png diff --git a/core/src/main/resources/images/nav/buyoffer_active@2x.png b/gui/src/main/resources/images/nav/buyoffer_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/buyoffer_active@2x.png rename to gui/src/main/resources/images/nav/buyoffer_active@2x.png diff --git a/core/src/main/resources/images/nav/funds.png b/gui/src/main/resources/images/nav/funds.png similarity index 100% rename from core/src/main/resources/images/nav/funds.png rename to gui/src/main/resources/images/nav/funds.png diff --git a/core/src/main/resources/images/nav/funds@2x.png b/gui/src/main/resources/images/nav/funds@2x.png similarity index 100% rename from core/src/main/resources/images/nav/funds@2x.png rename to gui/src/main/resources/images/nav/funds@2x.png diff --git a/core/src/main/resources/images/nav/funds_active.png b/gui/src/main/resources/images/nav/funds_active.png similarity index 100% rename from core/src/main/resources/images/nav/funds_active.png rename to gui/src/main/resources/images/nav/funds_active.png diff --git a/core/src/main/resources/images/nav/funds_active@2x.png b/gui/src/main/resources/images/nav/funds_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/funds_active@2x.png rename to gui/src/main/resources/images/nav/funds_active@2x.png diff --git a/core/src/main/resources/images/nav/home.png b/gui/src/main/resources/images/nav/home.png similarity index 100% rename from core/src/main/resources/images/nav/home.png rename to gui/src/main/resources/images/nav/home.png diff --git a/core/src/main/resources/images/nav/home@2x.png b/gui/src/main/resources/images/nav/home@2x.png similarity index 100% rename from core/src/main/resources/images/nav/home@2x.png rename to gui/src/main/resources/images/nav/home@2x.png diff --git a/core/src/main/resources/images/nav/home_active.png b/gui/src/main/resources/images/nav/home_active.png similarity index 100% rename from core/src/main/resources/images/nav/home_active.png rename to gui/src/main/resources/images/nav/home_active.png diff --git a/core/src/main/resources/images/nav/home_active@2x.png b/gui/src/main/resources/images/nav/home_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/home_active@2x.png rename to gui/src/main/resources/images/nav/home_active@2x.png diff --git a/core/src/main/resources/images/nav/msg.png b/gui/src/main/resources/images/nav/msg.png similarity index 100% rename from core/src/main/resources/images/nav/msg.png rename to gui/src/main/resources/images/nav/msg.png diff --git a/core/src/main/resources/images/nav/msg@2x.png b/gui/src/main/resources/images/nav/msg@2x.png similarity index 100% rename from core/src/main/resources/images/nav/msg@2x.png rename to gui/src/main/resources/images/nav/msg@2x.png diff --git a/core/src/main/resources/images/nav/msg_active.png b/gui/src/main/resources/images/nav/msg_active.png similarity index 100% rename from core/src/main/resources/images/nav/msg_active.png rename to gui/src/main/resources/images/nav/msg_active.png diff --git a/core/src/main/resources/images/nav/msg_active@2x.png b/gui/src/main/resources/images/nav/msg_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/msg_active@2x.png rename to gui/src/main/resources/images/nav/msg_active@2x.png diff --git a/core/src/main/resources/images/nav/portfolio.png b/gui/src/main/resources/images/nav/portfolio.png similarity index 100% rename from core/src/main/resources/images/nav/portfolio.png rename to gui/src/main/resources/images/nav/portfolio.png diff --git a/core/src/main/resources/images/nav/portfolio@2x.png b/gui/src/main/resources/images/nav/portfolio@2x.png similarity index 100% rename from core/src/main/resources/images/nav/portfolio@2x.png rename to gui/src/main/resources/images/nav/portfolio@2x.png diff --git a/core/src/main/resources/images/nav/portfolio_active.png b/gui/src/main/resources/images/nav/portfolio_active.png similarity index 100% rename from core/src/main/resources/images/nav/portfolio_active.png rename to gui/src/main/resources/images/nav/portfolio_active.png diff --git a/core/src/main/resources/images/nav/portfolio_active@2x.png b/gui/src/main/resources/images/nav/portfolio_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/portfolio_active@2x.png rename to gui/src/main/resources/images/nav/portfolio_active@2x.png diff --git a/core/src/main/resources/images/nav/selloffer.png b/gui/src/main/resources/images/nav/selloffer.png similarity index 100% rename from core/src/main/resources/images/nav/selloffer.png rename to gui/src/main/resources/images/nav/selloffer.png diff --git a/core/src/main/resources/images/nav/selloffer@2x.png b/gui/src/main/resources/images/nav/selloffer@2x.png similarity index 100% rename from core/src/main/resources/images/nav/selloffer@2x.png rename to gui/src/main/resources/images/nav/selloffer@2x.png diff --git a/core/src/main/resources/images/nav/selloffer_active.png b/gui/src/main/resources/images/nav/selloffer_active.png similarity index 100% rename from core/src/main/resources/images/nav/selloffer_active.png rename to gui/src/main/resources/images/nav/selloffer_active.png diff --git a/core/src/main/resources/images/nav/selloffer_active@2x.png b/gui/src/main/resources/images/nav/selloffer_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/selloffer_active@2x.png rename to gui/src/main/resources/images/nav/selloffer_active@2x.png diff --git a/core/src/main/resources/images/nav/settings.png b/gui/src/main/resources/images/nav/settings.png similarity index 100% rename from core/src/main/resources/images/nav/settings.png rename to gui/src/main/resources/images/nav/settings.png diff --git a/core/src/main/resources/images/nav/settings@2x.png b/gui/src/main/resources/images/nav/settings@2x.png similarity index 100% rename from core/src/main/resources/images/nav/settings@2x.png rename to gui/src/main/resources/images/nav/settings@2x.png diff --git a/core/src/main/resources/images/nav/settings_active.png b/gui/src/main/resources/images/nav/settings_active.png similarity index 100% rename from core/src/main/resources/images/nav/settings_active.png rename to gui/src/main/resources/images/nav/settings_active.png diff --git a/core/src/main/resources/images/nav/settings_active@2x.png b/gui/src/main/resources/images/nav/settings_active@2x.png similarity index 100% rename from core/src/main/resources/images/nav/settings_active@2x.png rename to gui/src/main/resources/images/nav/settings_active@2x.png diff --git a/core/src/main/resources/images/notification_logo.png b/gui/src/main/resources/images/notification_logo.png similarity index 100% rename from core/src/main/resources/images/notification_logo.png rename to gui/src/main/resources/images/notification_logo.png diff --git a/core/src/main/resources/images/notification_logo@2x.png b/gui/src/main/resources/images/notification_logo@2x.png similarity index 100% rename from core/src/main/resources/images/notification_logo@2x.png rename to gui/src/main/resources/images/notification_logo@2x.png diff --git a/core/src/main/resources/images/offer/offer_state_available.png b/gui/src/main/resources/images/offer/offer_state_available.png similarity index 100% rename from core/src/main/resources/images/offer/offer_state_available.png rename to gui/src/main/resources/images/offer/offer_state_available.png diff --git a/core/src/main/resources/images/offer/offer_state_available@2x.png b/gui/src/main/resources/images/offer/offer_state_available@2x.png similarity index 100% rename from core/src/main/resources/images/offer/offer_state_available@2x.png rename to gui/src/main/resources/images/offer/offer_state_available@2x.png diff --git a/core/src/main/resources/images/offer/offer_state_not_available.png b/gui/src/main/resources/images/offer/offer_state_not_available.png similarity index 100% rename from core/src/main/resources/images/offer/offer_state_not_available.png rename to gui/src/main/resources/images/offer/offer_state_not_available.png diff --git a/core/src/main/resources/images/offer/offer_state_not_available@2x.png b/gui/src/main/resources/images/offer/offer_state_not_available@2x.png similarity index 100% rename from core/src/main/resources/images/offer/offer_state_not_available@2x.png rename to gui/src/main/resources/images/offer/offer_state_not_available@2x.png diff --git a/core/src/main/resources/images/offer/offer_state_unknown.png b/gui/src/main/resources/images/offer/offer_state_unknown.png similarity index 100% rename from core/src/main/resources/images/offer/offer_state_unknown.png rename to gui/src/main/resources/images/offer/offer_state_unknown.png diff --git a/core/src/main/resources/images/offer/offer_state_unknown@2x.png b/gui/src/main/resources/images/offer/offer_state_unknown@2x.png similarity index 100% rename from core/src/main/resources/images/offer/offer_state_unknown@2x.png rename to gui/src/main/resources/images/offer/offer_state_unknown@2x.png diff --git a/core/src/main/resources/images/remove.png b/gui/src/main/resources/images/remove.png similarity index 100% rename from core/src/main/resources/images/remove.png rename to gui/src/main/resources/images/remove.png diff --git a/core/src/main/resources/images/remove@2x.png b/gui/src/main/resources/images/remove@2x.png similarity index 100% rename from core/src/main/resources/images/remove@2x.png rename to gui/src/main/resources/images/remove@2x.png diff --git a/core/src/main/resources/images/sell.png b/gui/src/main/resources/images/sell.png similarity index 100% rename from core/src/main/resources/images/sell.png rename to gui/src/main/resources/images/sell.png diff --git a/core/src/main/resources/images/sell@2x.png b/gui/src/main/resources/images/sell@2x.png similarity index 100% rename from core/src/main/resources/images/sell@2x.png rename to gui/src/main/resources/images/sell@2x.png diff --git a/core/src/main/resources/images/sell_large.png b/gui/src/main/resources/images/sell_large.png similarity index 100% rename from core/src/main/resources/images/sell_large.png rename to gui/src/main/resources/images/sell_large.png diff --git a/core/src/main/resources/images/sell_large@2x.png b/gui/src/main/resources/images/sell_large@2x.png similarity index 100% rename from core/src/main/resources/images/sell_large@2x.png rename to gui/src/main/resources/images/sell_large@2x.png diff --git a/core/src/main/resources/images/system_tray_icon.png b/gui/src/main/resources/images/system_tray_icon.png similarity index 100% rename from core/src/main/resources/images/system_tray_icon.png rename to gui/src/main/resources/images/system_tray_icon.png diff --git a/core/src/main/resources/images/system_tray_icon@2x.png b/gui/src/main/resources/images/system_tray_icon@2x.png similarity index 100% rename from core/src/main/resources/images/system_tray_icon@2x.png rename to gui/src/main/resources/images/system_tray_icon@2x.png diff --git a/core/src/main/resources/images/system_tray_icon_linux.png b/gui/src/main/resources/images/system_tray_icon_linux.png similarity index 100% rename from core/src/main/resources/images/system_tray_icon_linux.png rename to gui/src/main/resources/images/system_tray_icon_linux.png diff --git a/core/src/main/resources/images/system_tray_icon_windows.png b/gui/src/main/resources/images/system_tray_icon_windows.png similarity index 100% rename from core/src/main/resources/images/system_tray_icon_windows.png rename to gui/src/main/resources/images/system_tray_icon_windows.png diff --git a/core/src/main/resources/images/task_bar_icon_linux.png b/gui/src/main/resources/images/task_bar_icon_linux.png similarity index 100% rename from core/src/main/resources/images/task_bar_icon_linux.png rename to gui/src/main/resources/images/task_bar_icon_linux.png diff --git a/core/src/main/resources/images/task_bar_icon_windows.png b/gui/src/main/resources/images/task_bar_icon_windows.png similarity index 100% rename from core/src/main/resources/images/task_bar_icon_windows.png rename to gui/src/main/resources/images/task_bar_icon_windows.png diff --git a/core/src/main/resources/images/tick.png b/gui/src/main/resources/images/tick.png similarity index 100% rename from core/src/main/resources/images/tick.png rename to gui/src/main/resources/images/tick.png diff --git a/core/src/main/resources/images/tick@2x.png b/gui/src/main/resources/images/tick@2x.png similarity index 100% rename from core/src/main/resources/images/tick@2x.png rename to gui/src/main/resources/images/tick@2x.png diff --git a/core/src/main/resources/images/update/update_available.png b/gui/src/main/resources/images/update/update_available.png similarity index 100% rename from core/src/main/resources/images/update/update_available.png rename to gui/src/main/resources/images/update/update_available.png diff --git a/core/src/main/resources/images/update/update_available@2x.png b/gui/src/main/resources/images/update/update_available@2x.png similarity index 100% rename from core/src/main/resources/images/update/update_available@2x.png rename to gui/src/main/resources/images/update/update_available@2x.png diff --git a/core/src/main/resources/images/update/update_failed.png b/gui/src/main/resources/images/update/update_failed.png similarity index 100% rename from core/src/main/resources/images/update/update_failed.png rename to gui/src/main/resources/images/update/update_failed.png diff --git a/core/src/main/resources/images/update/update_failed@2x.png b/gui/src/main/resources/images/update/update_failed@2x.png similarity index 100% rename from core/src/main/resources/images/update/update_failed@2x.png rename to gui/src/main/resources/images/update/update_failed@2x.png diff --git a/core/src/main/resources/images/update/update_in_progress.png b/gui/src/main/resources/images/update/update_in_progress.png similarity index 100% rename from core/src/main/resources/images/update/update_in_progress.png rename to gui/src/main/resources/images/update/update_in_progress.png diff --git a/core/src/main/resources/images/update/update_in_progress@2x.png b/gui/src/main/resources/images/update/update_in_progress@2x.png similarity index 100% rename from core/src/main/resources/images/update/update_in_progress@2x.png rename to gui/src/main/resources/images/update/update_in_progress@2x.png diff --git a/core/src/main/resources/images/update/update_up_to_date.png b/gui/src/main/resources/images/update/update_up_to_date.png similarity index 100% rename from core/src/main/resources/images/update/update_up_to_date.png rename to gui/src/main/resources/images/update/update_up_to_date.png diff --git a/core/src/main/resources/images/update/update_up_to_date@2x.png b/gui/src/main/resources/images/update/update_up_to_date@2x.png similarity index 100% rename from core/src/main/resources/images/update/update_up_to_date@2x.png rename to gui/src/main/resources/images/update/update_up_to_date@2x.png diff --git a/core/src/main/resources/images/window_icon.png b/gui/src/main/resources/images/window_icon.png similarity index 100% rename from core/src/main/resources/images/window_icon.png rename to gui/src/main/resources/images/window_icon.png diff --git a/core/src/main/resources/images/window_icon@2x.png b/gui/src/main/resources/images/window_icon@2x.png similarity index 100% rename from core/src/main/resources/images/window_icon@2x.png rename to gui/src/main/resources/images/window_icon@2x.png diff --git a/core/src/main/resources/logback.xml b/gui/src/main/resources/logback.xml similarity index 100% rename from core/src/main/resources/logback.xml rename to gui/src/main/resources/logback.xml diff --git a/core/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java b/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java similarity index 100% rename from core/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java rename to gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java diff --git a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$Malformed.fxml similarity index 100% rename from core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml rename to gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$Malformed.fxml diff --git a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml similarity index 100% rename from core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml rename to gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml diff --git a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml similarity index 86% rename from core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml rename to gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml index a6220a6cad..c83560c564 100644 --- a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml +++ b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml @@ -16,6 +16,6 @@ --> - diff --git a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml similarity index 88% rename from core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml rename to gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml index 23a8b4b06a..c00e764f48 100644 --- a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml +++ b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml @@ -16,6 +16,6 @@ --> - diff --git a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests.java b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java similarity index 91% rename from core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests.java rename to gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java index b271dc513a..52aa1b8867 100644 --- a/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests.java +++ b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java @@ -15,14 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view.fxml; +package io.bitsquare.common.fxml; -import io.bitsquare.common.viewfx.ViewfxException; -import io.bitsquare.common.viewfx.view.AbstractView; -import io.bitsquare.common.viewfx.view.FxmlView; -import io.bitsquare.common.viewfx.view.View; -import io.bitsquare.common.viewfx.view.ViewFactory; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.ViewfxException; +import io.bitsquare.common.view.AbstractView; +import io.bitsquare.common.view.FxmlView; +import io.bitsquare.common.view.View; +import io.bitsquare.common.view.ViewFactory; +import io.bitsquare.common.view.ViewLoader; import java.util.ResourceBundle; diff --git a/core/src/test/java/io/bitsquare/common/viewfx/view/support/CachingViewLoaderTests.java b/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java similarity index 88% rename from core/src/test/java/io/bitsquare/common/viewfx/view/support/CachingViewLoaderTests.java rename to gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java index 40e04bc56d..d3bb3a1a5f 100644 --- a/core/src/test/java/io/bitsquare/common/viewfx/view/support/CachingViewLoaderTests.java +++ b/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.viewfx.view.support; +package io.bitsquare.common.support; -import io.bitsquare.common.viewfx.view.AbstractView; -import io.bitsquare.common.viewfx.view.CachingViewLoader; -import io.bitsquare.common.viewfx.view.ViewLoader; +import io.bitsquare.common.view.AbstractView; +import io.bitsquare.common.view.CachingViewLoader; +import io.bitsquare.common.view.ViewLoader; import org.junit.Test; diff --git a/pom.xml b/pom.xml index 26e4b91fba..62efc021a9 100755 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ core bootstrap + gui