Move gui classes to gui module

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
 --------------------

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;
+    protected final String appName;
-    private final String appDataDir;
+    protected final String appDataDir;
-    private final String bootstrapNodePort;
+    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);
             }

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();
     }
 

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<T> {
     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<T> {
     private final Callable<Void> saver;
     private T serializable;
 
+    public static void setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler uncaughtExceptionHandler) {
+        FileManager.uncaughtExceptionHandler = uncaughtExceptionHandler;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -95,18 +97,12 @@ public class FileManager<T> {
         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(uncaughtExceptionHandler);
-        builder.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(Thread t, Throwable throwable) {
-                Platform.runLater(() -> Popups.handleUncaughtExceptions(Throwables.getRootCause(throwable)));
-            }
-        });
 
         // 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<T> {
         });
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
+    // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**

gui/pom.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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 <http://www.gnu.org/licenses/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>parent</artifactId>
+        <groupId>io.bitsquare</groupId>
+        <version>0.1.3-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>gui</artifactId>
+
+    <build>
+
+        <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/java</directory>
+                <includes>
+                    <include>**/*.fxml</include>
+                    <include>**/*.css</include>
+                </includes>
+            </resource>
+            <resource>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
+                        </transformer>
+                    </transformers>
+                    <filters>
+                        <filter>
+                            <!-- exclude signatures, the bundling process breaks them for some reason -->
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>bundled</shadedClassifierName>
+                            <finalName>shaded</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-enforcer-plugin</artifactId>
+                 <version>1.3.1</version>
+                 <executions>
+                     <execution>
+                         <id>enforce</id>
+                         <configuration>
+                             <rules>
+                                 <DependencyConvergence />
+                             </rules>
+                         </configuration>
+                         <goals>
+                             <goal>enforce</goal>
+                         </goals>
+                     </execution>
+                 </executions>
+             </plugin>-->
+
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.bitsquare</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+</project>

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.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewLoader;
-import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
+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);

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 <http://www.gnu.org/licenses/>.
+ */
+
+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);
+            }
+        });
+    }
+}

gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java

@@ -15,13 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app.gui;
+package io.bitsquare.app;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.app.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);
     }
 }

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;

gui/src/main/java/io/bitsquare/common/ViewfxException.java

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

gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java

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

gui/src/main/java/io/bitsquare/common/model/Activatable.java

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

gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java

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

gui/src/main/java/io/bitsquare/common/model/DataModel.java

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

gui/src/main/java/io/bitsquare/common/model/Model.java

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

gui/src/main/java/io/bitsquare/common/model/ViewModel.java

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

gui/src/main/java/io/bitsquare/common/model/WithDataModel.java

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

gui/src/main/java/io/bitsquare/common/view/AbstractView.java

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

gui/src/main/java/io/bitsquare/common/view/ActivatableView.java

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

gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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.*;
 

gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java

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

gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java

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

gui/src/main/java/io/bitsquare/common/view/FxmlView.java

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

gui/src/main/java/io/bitsquare/common/view/InitializableView.java

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

gui/src/main/java/io/bitsquare/common/view/View.java

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

gui/src/main/java/io/bitsquare/common/view/ViewFactory.java

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

gui/src/main/java/io/bitsquare/common/view/ViewLoader.java

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

gui/src/main/java/io/bitsquare/common/view/ViewPath.java

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

gui/src/main/java/io/bitsquare/common/view/Wizard.java

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

gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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;
 

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.fxml.FxmlViewLoader;
-import io.bitsquare.common.viewfx.view.ViewFactory;
+import io.bitsquare.common.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewFactory;
-import io.bitsquare.common.viewfx.view.fxml.FxmlViewLoader;
+import io.bitsquare.common.view.ViewLoader;
-import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
+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;

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.view.View;
-import io.bitsquare.common.viewfx.view.ViewPath;
+import io.bitsquare.common.view.ViewPath;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.offer.BuyOfferView;
 import io.bitsquare.storage.Storage;

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.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.view.InitializableView;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewLoader;
 import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;

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;

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.view.ActivatableView;
-import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+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;

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;

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

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.view.ActivatableView;
-import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewLoader;
 import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
 import io.bitsquare.user.AccountSettings;
 

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.view.AbstractView;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
 import io.bitsquare.gui.util.BSFormatter;
 
 import javax.inject.Inject;

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.view.ActivatableView;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;

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.model.Activatable;
-import io.bitsquare.common.viewfx.model.DataModel;
+import io.bitsquare.common.model.DataModel;
 import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;

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.view.ActivatableViewAndModel;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;

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.model.ActivatableWithDataModel;
-import io.bitsquare.common.viewfx.model.ViewModel;
+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;

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.view.FxmlView;
-import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.view.InitializableView;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 

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;
 

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.model.Activatable;
-import io.bitsquare.common.viewfx.model.DataModel;
+import io.bitsquare.common.model.DataModel;
 import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;

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.view.ActivatableViewAndModel;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.InputTextField;

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.model.ActivatableWithDataModel;
-import io.bitsquare.common.viewfx.model.ViewModel;
+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;

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.view.FxmlView;
-import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.view.InitializableView;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 

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;
 

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;

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.view.FxmlView;
-import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.view.InitializableView;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.AddressTextField;
 import io.bitsquare.gui.components.BalanceTextField;

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.model.ViewModel;
-import io.bitsquare.common.viewfx.model.WithDataModel;
+import io.bitsquare.common.model.WithDataModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
 

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.model.Activatable;
-import io.bitsquare.common.viewfx.model.DataModel;
+import io.bitsquare.common.model.DataModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;

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.view.ActivatableViewAndModel;
-import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewLoader;
-import io.bitsquare.common.viewfx.view.Wizard;
+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;

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.model.ActivatableWithDataModel;
-import io.bitsquare.common.viewfx.model.ViewModel;
+import io.bitsquare.common.model.ViewModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
 

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.view.FxmlView;
-import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.view.InitializableView;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 

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;

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.view.ActivatableViewAndModel;
-import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewLoader;
-import io.bitsquare.common.viewfx.view.ViewPath;
+import io.bitsquare.common.view.ViewPath;
-import io.bitsquare.common.viewfx.view.Wizard;
+import io.bitsquare.common.view.Wizard;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.account.AccountView;

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.view.ActivatableView;
-import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.view.CachingViewLoader;
-import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.view.FxmlView;
-import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.view.View;
-import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.view.ViewLoader;
-import io.bitsquare.common.viewfx.view.Wizard;
+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;

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