diff --git a/README.md b/README.md index dc764375ed..0dcd8a3f9b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can read about all of this and more in the [whitepaper](https://bitsquare.io Status ------ 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. +For the latest version checkout our [releases page](https://github.com/bitsquare/bitsquare/releases) at Github. Building from source -------------------- diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 0feb62aeef..cc50cbffc7 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.1.3-SNAPSHOT + 0.1.4-SNAPSHOT 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 63caa8b142..f08196836a 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.1.3-SNAPSHOT + 0.1.4-SNAPSHOT core diff --git a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java index 490009f9a5..00fbaf6b61 100644 --- a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java +++ b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java @@ -161,15 +161,12 @@ public class BitsquareEnvironment extends StandardEnvironment { 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/storage/FileManager.java b/core/src/main/java/io/bitsquare/storage/FileManager.java index 5fbc2abba7..4112b6ba89 100644 --- a/core/src/main/java/io/bitsquare/storage/FileManager.java +++ b/core/src/main/java/io/bitsquare/storage/FileManager.java @@ -56,8 +56,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; -import javafx.application.Platform; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -249,7 +247,7 @@ public class FileManager { private void saveNowInternal(T serializable) { long now = System.currentTimeMillis(); saveToFile(serializable, dir, storageFile); - Platform.runLater(() -> log.info("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now)); + Threading.USER_THREAD.execute(() -> log.info("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now)); } private void saveToFile(T serializable, File dir, File storageFile) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java index 3dbf25e651..53762689a9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java @@ -29,11 +29,11 @@ import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress; import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable; +import org.bitcoinj.utils.Threading; + import java.util.Timer; import java.util.TimerTask; -import javafx.application.Platform; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -135,7 +135,7 @@ public class CheckOfferAvailabilityProtocol { TimerTask task = new TimerTask() { @Override public void run() { - Platform.runLater(() -> { + Threading.USER_THREAD.execute(() -> { log.debug("Timeout reached"); errorMessageHandler.handleErrorMessage("Timeout reached: Peer has not responded."); model.offer.setState(Offer.State.OFFERER_OFFLINE); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java index 32950759d7..76ce8efb57 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java @@ -74,7 +74,7 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol public void applyMailboxMessage(MailboxMessage mailboxMessage, Trade trade) { if (trade == null) this.trade = trade; - + log.debug("setMailboxMessage " + mailboxMessage); // Might be called twice, so check that its only processed once if (!processModel.isMailboxMessageProcessed()) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java index c8a47399a3..9710a5a299 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java @@ -26,11 +26,11 @@ import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReach import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.TakerTradeState; +import org.bitcoinj.utils.Threading; + import java.util.Timer; import java.util.TimerTask; -import javafx.application.Platform; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,7 +88,7 @@ public abstract class TradeProtocol { TimerTask task = new TimerTask() { @Override public void run() { - Platform.runLater(() -> { + Threading.USER_THREAD.execute(() -> { log.debug("Timeout reached"); if (trade instanceof TakerTrade) trade.setProcessState(TakerTradeState.ProcessState.TIMEOUT); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendRequestDepositTxInputsMessage.java index d780be238d..65ed9e40da 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendRequestDepositTxInputsMessage.java @@ -24,7 +24,7 @@ import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; import io.bitsquare.trade.states.StateUtil; -import javafx.application.Platform; +import org.bitcoinj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,7 +62,7 @@ public class SendRequestDepositTxInputsMessage extends TradeTask { // We try to repeat once and if that fails as well we persist the state for a later retry. if (retryCounter == 0) { retryCounter++; - Platform.runLater(SendRequestDepositTxInputsMessage.this::doRun); + Threading.USER_THREAD.execute(SendRequestDepositTxInputsMessage.this::doRun); } else { appendToErrorMessage("Sending TakeOfferFeePayedMessage to offerer failed. Maybe the network connection was " + diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java index 651f734ec4..0ae9df1536 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java @@ -27,14 +27,13 @@ import io.bitsquare.trade.states.TakerTradeState; import org.bitcoinj.core.StoredBlock; import org.bitcoinj.core.Transaction; +import org.bitcoinj.utils.Threading; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.ExecutionException; -import javafx.application.Platform; - import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; @@ -64,7 +63,7 @@ public class SetupPayoutTxLockTimeReachedListener extends TradeTask { } broadcastTx(); }, - Platform::runLater); + Threading.USER_THREAD::execute); } } catch (Throwable t) { t.printStackTrace(); diff --git a/core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java b/core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java index da9970396a..729dce4de7 100644 --- a/core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java +++ b/core/src/main/java/io/bitsquare/trade/states/OffererTradeState.java @@ -44,7 +44,7 @@ public class OffererTradeState { PAYOUT_FINALIZED_MSG_SENT, PAYOUT_BROAD_CASTED, PAYOUT_BROAD_CASTED_FAILED, - + MESSAGE_SENDING_FAILED, TIMEOUT, EXCEPTION diff --git a/core/src/main/java/io/bitsquare/util/Utilities.java b/core/src/main/java/io/bitsquare/util/Utilities.java index 33090d522a..73e32ad662 100644 --- a/core/src/main/java/io/bitsquare/util/Utilities.java +++ b/core/src/main/java/io/bitsquare/util/Utilities.java @@ -40,15 +40,10 @@ import java.net.URI; import java.security.PublicKey; import java.security.spec.X509EncodedKeySpec; -import java.util.function.Function; - -import javafx.animation.AnimationTimer; -import javafx.application.Platform; -import javafx.scene.input.*; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; + /** * General utilities */ @@ -78,15 +73,6 @@ public class Utilities { return System.getProperty("os.name").toLowerCase(); } - public static void copyToClipboard(String content) { - if (content != null && content.length() > 0) { - Clipboard clipboard = Clipboard.getSystemClipboard(); - ClipboardContent clipboardContent = new ClipboardContent(); - clipboardContent.putString(content); - clipboard.setContent(clipboardContent); - } - } - public static void openURI(URI uri) throws IOException { if (!isLinux() && Desktop.isDesktopSupported() @@ -262,38 +248,6 @@ public class Utilities { } } - public static AnimationTimer setTimeout(int delay, Function callback) { - AnimationTimer animationTimer = new AnimationTimer() { - final long lastTimeStamp = System.currentTimeMillis(); - - @Override - public void handle(long arg0) { - if (System.currentTimeMillis() > delay + lastTimeStamp) { - Platform.runLater(() -> callback.apply(this)); - this.stop(); - } - } - }; - animationTimer.start(); - return animationTimer; - } - - public static AnimationTimer setInterval(int delay, Function callback) { - AnimationTimer animationTimer = new AnimationTimer() { - long lastTimeStamp = System.currentTimeMillis(); - - @Override - public void handle(long arg0) { - if (System.currentTimeMillis() > delay + lastTimeStamp) { - lastTimeStamp = System.currentTimeMillis(); - callback.apply(this); - } - } - }; - animationTimer.start(); - return animationTimer; - } - public static String getHexFromPubKey(PublicKey publicKey) { final X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(publicKey.getEncoded()); return Utils.HEX.encode(x509EncodedKeySpec.getEncoded()); diff --git a/gui/src/main/resources/bitsquare.properties b/core/src/main/resources/bitsquare.properties similarity index 100% rename from gui/src/main/resources/bitsquare.properties rename to core/src/main/resources/bitsquare.properties diff --git a/core/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java b/core/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java index 73af6802d3..c782ee2b73 100644 --- a/core/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java +++ b/core/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java @@ -64,7 +64,7 @@ public class EncryptionServiceTests { byte[] result = encryptionService.decrypt(p2pEncryptKeyPair.getPrivate(), bucket); assertEquals("", result, data); } - + @Test public void testEncryptionWithLargeData() throws Exception { EncryptionService encryptionService = new EncryptionService(); @@ -72,7 +72,7 @@ public class EncryptionServiceTests { byte[] data = new byte[2000]; new Random().nextBytes(data); - + Bucket bucket = encryptionService.encrypt(p2pEncryptKeyPair.getPublic(), data); byte[] result = encryptionService.decrypt(p2pEncryptKeyPair.getPrivate(), bucket); assertEquals("", result, data); diff --git a/gui/pom.xml b/gui/pom.xml index 43ed1ebe3f..a213947cfe 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.1.3-SNAPSHOT + 0.1.4-SNAPSHOT 4.0.0 diff --git a/core/src/main/java/eu/hansolo/enzo/notification/Notification.java b/gui/src/main/java/eu/hansolo/enzo/notification/Notification.java similarity index 100% rename from core/src/main/java/eu/hansolo/enzo/notification/Notification.java rename to gui/src/main/java/eu/hansolo/enzo/notification/Notification.java diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java index 44ae83ade7..ee0b27f092 100644 --- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java @@ -17,11 +17,11 @@ package io.bitsquare.app; -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.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; +import io.bitsquare.gui.common.view.guice.InjectorViewFactory; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.debug.DebugView; @@ -29,6 +29,8 @@ import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.storage.FileManager; import io.bitsquare.util.Utilities; +import org.bitcoinj.utils.Threading; + import com.google.common.base.Throwables; import com.google.inject.Guice; @@ -73,6 +75,8 @@ public class BitsquareApp extends Application { log.trace("BitsquareApp.start"); try { + Threading.USER_THREAD = Platform::runLater; + bitsquareAppModule = new BitsquareAppModule(env, primaryStage); injector = Guice.createInjector(bitsquareAppModule); injector.getInstance(InjectorViewFactory.class).setInjector(injector); diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java index d26d801ebf..1c5c33685d 100644 --- a/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java @@ -137,7 +137,7 @@ public class BitsquareAppMain extends BitsquareExecutable { .ofType(RegTestHost.class) .withValuesConvertedBy(new EnumValueConverter(RegTestHost.class)); - + parser.accepts(BOOTSTRAP_NODE_NAME_KEY, description("", BootstrapNodes.DEFAULT.getName())) .withRequiredArg(); parser.accepts(BOOTSTRAP_NODE_IP_KEY, description("", BootstrapNodes.DEFAULT.getIp())) diff --git a/gui/src/main/java/io/bitsquare/app/UpdateProcess.java b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java index 629ee2cb19..bcf1e87ce7 100644 --- a/gui/src/main/java/io/bitsquare/app/UpdateProcess.java +++ b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java @@ -17,7 +17,7 @@ package io.bitsquare.app; -import io.bitsquare.util.Utilities; +import io.bitsquare.gui.util.GUIUtil; import com.google.inject.Inject; @@ -95,7 +95,7 @@ public class UpdateProcess { log.info("UpdateFX current version " + BUILD_VERSION); // process.timeout() will cause an error state back but we don't want to break startup in case of an timeout - timeoutTimer = Utilities.setTimeout(10000, animationTimer -> { + timeoutTimer = GUIUtil.setTimeout(10000, animationTimer -> { process.onCompleted(); return null; }); diff --git a/gui/src/main/java/io/bitsquare/gui/GuiModule.java b/gui/src/main/java/io/bitsquare/gui/GuiModule.java index 6014c87a32..061151e1f7 100644 --- a/gui/src/main/java/io/bitsquare/gui/GuiModule.java +++ b/gui/src/main/java/io/bitsquare/gui/GuiModule.java @@ -18,11 +18,11 @@ package io.bitsquare.gui; import io.bitsquare.BitsquareModule; -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.common.fxml.FxmlViewLoader; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.ViewFactory; +import io.bitsquare.gui.common.view.ViewLoader; +import io.bitsquare.gui.common.view.guice.InjectorViewFactory; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.offer.offerbook.OfferBook; diff --git a/gui/src/main/java/io/bitsquare/gui/Navigation.java b/gui/src/main/java/io/bitsquare/gui/Navigation.java index 6fe3a46786..eb3c15d52f 100644 --- a/gui/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.view.View; -import io.bitsquare.common.view.ViewPath; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewPath; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.offer.BuyOfferView; import io.bitsquare.storage.Storage; diff --git a/gui/src/main/java/io/bitsquare/common/ViewfxException.java b/gui/src/main/java/io/bitsquare/gui/common/ViewfxException.java similarity index 97% rename from gui/src/main/java/io/bitsquare/common/ViewfxException.java rename to gui/src/main/java/io/bitsquare/gui/common/ViewfxException.java index fd7747f94b..b0b0c8b953 100644 --- a/gui/src/main/java/io/bitsquare/common/ViewfxException.java +++ b/gui/src/main/java/io/bitsquare/gui/common/ViewfxException.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common; +package io.bitsquare.gui.common; import static java.lang.String.format; diff --git a/gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java b/gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java similarity index 93% rename from gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java rename to gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java index 4bee6d2bf5..5c931e4c85 100644 --- a/gui/src/main/java/io/bitsquare/common/fxml/FxmlViewLoader.java +++ b/gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.fxml; +package io.bitsquare.gui.common.fxml; -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 io.bitsquare.gui.common.ViewfxException; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewFactory; +import io.bitsquare.gui.common.view.ViewLoader; import java.io.IOException; diff --git a/gui/src/main/java/io/bitsquare/common/model/Activatable.java b/gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java similarity index 96% rename from gui/src/main/java/io/bitsquare/common/model/Activatable.java rename to gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java index d338472191..f05b6283cb 100644 --- a/gui/src/main/java/io/bitsquare/common/model/Activatable.java +++ b/gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.model; +package io.bitsquare.gui.common.model; public interface Activatable { diff --git a/gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java b/gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java similarity index 96% rename from gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java rename to gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java index 4fc13dea8c..85b0ec83a2 100644 --- a/gui/src/main/java/io/bitsquare/common/model/ActivatableWithDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.model; +package io.bitsquare.gui.common.model; public abstract class ActivatableWithDataModel extends WithDataModel implements Activatable { diff --git a/gui/src/main/java/io/bitsquare/common/model/DataModel.java b/gui/src/main/java/io/bitsquare/gui/common/model/DataModel.java similarity index 95% rename from gui/src/main/java/io/bitsquare/common/model/DataModel.java rename to gui/src/main/java/io/bitsquare/gui/common/model/DataModel.java index 9915cba2d2..9e2d5e0370 100644 --- a/gui/src/main/java/io/bitsquare/common/model/DataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/common/model/DataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.model; +package io.bitsquare.gui.common.model; public interface DataModel extends Model { } diff --git a/gui/src/main/java/io/bitsquare/common/model/Model.java b/gui/src/main/java/io/bitsquare/gui/common/model/Model.java similarity index 94% rename from gui/src/main/java/io/bitsquare/common/model/Model.java rename to gui/src/main/java/io/bitsquare/gui/common/model/Model.java index e39de82c51..13690377f4 100644 --- a/gui/src/main/java/io/bitsquare/common/model/Model.java +++ b/gui/src/main/java/io/bitsquare/gui/common/model/Model.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.model; +package io.bitsquare.gui.common.model; public interface Model { } diff --git a/gui/src/main/java/io/bitsquare/common/model/ViewModel.java b/gui/src/main/java/io/bitsquare/gui/common/model/ViewModel.java similarity index 95% rename from gui/src/main/java/io/bitsquare/common/model/ViewModel.java rename to gui/src/main/java/io/bitsquare/gui/common/model/ViewModel.java index 08b8032b2c..f7d67a68d1 100644 --- a/gui/src/main/java/io/bitsquare/common/model/ViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/common/model/ViewModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.model; +package io.bitsquare.gui.common.model; public interface ViewModel extends Model { } diff --git a/gui/src/main/java/io/bitsquare/common/model/WithDataModel.java b/gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java similarity index 96% rename from gui/src/main/java/io/bitsquare/common/model/WithDataModel.java rename to gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java index 7d7415c0b7..4919beed4a 100644 --- a/gui/src/main/java/io/bitsquare/common/model/WithDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.model; +package io.bitsquare.gui.common.model; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gui/src/main/java/io/bitsquare/common/view/AbstractView.java b/gui/src/main/java/io/bitsquare/gui/common/view/AbstractView.java similarity index 96% rename from gui/src/main/java/io/bitsquare/common/view/AbstractView.java rename to gui/src/main/java/io/bitsquare/gui/common/view/AbstractView.java index 8f96ccdbd7..e94403a1c5 100644 --- a/gui/src/main/java/io/bitsquare/common/view/AbstractView.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/AbstractView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import javafx.fxml.FXML; import javafx.scene.*; diff --git a/gui/src/main/java/io/bitsquare/common/view/ActivatableView.java b/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/common/view/ActivatableView.java rename to gui/src/main/java/io/bitsquare/gui/common/view/ActivatableView.java index fac7bf9b0c..81d9cab0db 100644 --- a/gui/src/main/java/io/bitsquare/common/view/ActivatableView.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import javafx.scene.*; diff --git a/gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java b/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java rename to gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java index c7bf85ea33..4c7c2ef5e5 100644 --- a/gui/src/main/java/io/bitsquare/common/view/ActivatableViewAndModel.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; -import io.bitsquare.common.model.Activatable; +import io.bitsquare.gui.common.model.Activatable; import javafx.scene.*; diff --git a/gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java b/gui/src/main/java/io/bitsquare/gui/common/view/CachingViewLoader.java similarity index 97% rename from gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java rename to gui/src/main/java/io/bitsquare/gui/common/view/CachingViewLoader.java index 82128c3b4c..3864696d6b 100644 --- a/gui/src/main/java/io/bitsquare/common/view/CachingViewLoader.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/CachingViewLoader.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import java.util.HashMap; diff --git a/gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java b/gui/src/main/java/io/bitsquare/gui/common/view/DefaultPathConvention.java similarity index 96% rename from gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java rename to gui/src/main/java/io/bitsquare/gui/common/view/DefaultPathConvention.java index 343d80d64a..5e798c1d22 100644 --- a/gui/src/main/java/io/bitsquare/common/view/DefaultPathConvention.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/DefaultPathConvention.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import org.springframework.util.ClassUtils; diff --git a/gui/src/main/java/io/bitsquare/common/view/FxmlView.java b/gui/src/main/java/io/bitsquare/gui/common/view/FxmlView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/common/view/FxmlView.java rename to gui/src/main/java/io/bitsquare/gui/common/view/FxmlView.java index 15bbc5d896..fc3f60826a 100644 --- a/gui/src/main/java/io/bitsquare/common/view/FxmlView.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/FxmlView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import java.util.function.Function; diff --git a/gui/src/main/java/io/bitsquare/common/view/InitializableView.java b/gui/src/main/java/io/bitsquare/gui/common/view/InitializableView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/common/view/InitializableView.java rename to gui/src/main/java/io/bitsquare/gui/common/view/InitializableView.java index 8c61057b2e..16e5f7339d 100644 --- a/gui/src/main/java/io/bitsquare/common/view/InitializableView.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/InitializableView.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import java.net.URL; diff --git a/gui/src/main/java/io/bitsquare/common/view/View.java b/gui/src/main/java/io/bitsquare/gui/common/view/View.java similarity index 95% rename from gui/src/main/java/io/bitsquare/common/view/View.java rename to gui/src/main/java/io/bitsquare/gui/common/view/View.java index 0d798a3eb6..bbea71e935 100644 --- a/gui/src/main/java/io/bitsquare/common/view/View.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/View.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import javafx.scene.*; diff --git a/gui/src/main/java/io/bitsquare/common/view/ViewFactory.java b/gui/src/main/java/io/bitsquare/gui/common/view/ViewFactory.java similarity index 95% rename from gui/src/main/java/io/bitsquare/common/view/ViewFactory.java rename to gui/src/main/java/io/bitsquare/gui/common/view/ViewFactory.java index 579a505848..441dd98908 100644 --- a/gui/src/main/java/io/bitsquare/common/view/ViewFactory.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/ViewFactory.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import javafx.util.Callback; diff --git a/gui/src/main/java/io/bitsquare/common/view/ViewLoader.java b/gui/src/main/java/io/bitsquare/gui/common/view/ViewLoader.java similarity index 95% rename from gui/src/main/java/io/bitsquare/common/view/ViewLoader.java rename to gui/src/main/java/io/bitsquare/gui/common/view/ViewLoader.java index bd34480c57..c278baaafa 100644 --- a/gui/src/main/java/io/bitsquare/common/view/ViewLoader.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/ViewLoader.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; public interface ViewLoader { View load(Class viewClass); diff --git a/gui/src/main/java/io/bitsquare/common/view/ViewPath.java b/gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java similarity index 97% rename from gui/src/main/java/io/bitsquare/common/view/ViewPath.java rename to gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java index 9d8f64bed8..6f9f2f5063 100644 --- a/gui/src/main/java/io/bitsquare/common/view/ViewPath.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; import java.io.Serializable; diff --git a/gui/src/main/java/io/bitsquare/common/view/Wizard.java b/gui/src/main/java/io/bitsquare/gui/common/view/Wizard.java similarity index 95% rename from gui/src/main/java/io/bitsquare/common/view/Wizard.java rename to gui/src/main/java/io/bitsquare/gui/common/view/Wizard.java index 41be410436..105e0fc8ac 100644 --- a/gui/src/main/java/io/bitsquare/common/view/Wizard.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/Wizard.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view; +package io.bitsquare.gui.common.view; public interface Wizard extends View { void nextStep(Step currentStep); diff --git a/gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java b/gui/src/main/java/io/bitsquare/gui/common/view/guice/InjectorViewFactory.java similarity index 92% rename from gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java rename to gui/src/main/java/io/bitsquare/gui/common/view/guice/InjectorViewFactory.java index d6dc1ed5f5..662217f0b8 100644 --- a/gui/src/main/java/io/bitsquare/common/view/guice/InjectorViewFactory.java +++ b/gui/src/main/java/io/bitsquare/gui/common/view/guice/InjectorViewFactory.java @@ -15,9 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.common.view.guice; +package io.bitsquare.gui.common.view.guice; -import io.bitsquare.common.view.ViewFactory; +import io.bitsquare.gui.common.view.ViewFactory; import com.google.common.base.Preconditions; diff --git a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java index 2cd8fb3674..6e3eaf919c 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java +++ b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java @@ -18,6 +18,7 @@ package io.bitsquare.gui.components; import io.bitsquare.gui.OverlayManager; +import io.bitsquare.gui.util.GUIUtil; import io.bitsquare.util.Utilities; import org.bitcoinj.core.Coin; @@ -86,7 +87,7 @@ public class AddressTextField extends AnchorPane { AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY); copyIcon.setOnMouseClicked(e -> { if (address.get() != null && address.get().length() > 0) - Utilities.copyToClipboard(address.get()); + GUIUtil.copyToClipboard(address.get()); }); Label qrCode = new Label(); diff --git a/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java b/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java index 7a76bd9ef5..4834c98dd8 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java +++ b/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.components; -import io.bitsquare.util.Utilities; +import io.bitsquare.gui.util.GUIUtil; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; @@ -45,7 +45,7 @@ public class TextFieldWithCopyIcon extends AnchorPane { AnchorPane.setRightAnchor(copyIcon, 0.0); copyIcon.setOnMouseClicked(e -> { if (getText() != null && getText().length() > 0) - Utilities.copyToClipboard(getText()); + GUIUtil.copyToClipboard(getText()); }); TextField txIdLabel = new TextField(); txIdLabel.setEditable(false); diff --git a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java index d9ed7f596f..51fc8c534a 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java +++ b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java @@ -20,6 +20,7 @@ package io.bitsquare.gui.components; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.TxConfidenceListener; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; +import io.bitsquare.gui.util.GUIUtil; import io.bitsquare.util.Utilities; import org.bitcoinj.core.TransactionConfidence; @@ -106,7 +107,7 @@ public class TxIdTextField extends AnchorPane { } }); - copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(txID)); + copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(txID)); } public void cleanup() { diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java index beace6086c..633d5d9308 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java @@ -18,14 +18,14 @@ package io.bitsquare.gui.main; import io.bitsquare.BitsquareException; -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; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.InitializableView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.SystemNotification; import io.bitsquare.gui.main.account.AccountView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index b046f6f747..b8ff5ed9c8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -21,8 +21,8 @@ import io.bitsquare.app.UpdateProcess; import io.bitsquare.arbitration.ArbitrationRepository; import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.btc.WalletService; -import io.bitsquare.common.model.ViewModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.CountryUtil; import io.bitsquare.p2p.BaseP2PService; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java index 98eabd479f..f30c45c18b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -17,12 +17,12 @@ package io.bitsquare.gui.main.account; -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.common.view.ActivatableView; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView; import io.bitsquare.gui.main.account.settings.AccountSettingsView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java index 04b3590927..5861d998fc 100644 --- a/gui/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.model.ViewModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.user.User; import com.google.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java index e9ec307822..07dbb963a2 100644 --- a/gui/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.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.common.view.AbstractView; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView; import javax.inject.Inject; diff --git a/gui/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 index 3ce7a10ff5..4a1b3c548c 100644 --- a/gui/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.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.common.view.ActivatableView; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView; import io.bitsquare.user.AccountSettings; diff --git a/gui/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 index 8316c0884a..ef8b150715 100644 --- a/gui/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.view.AbstractView; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.AbstractView; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.util.BSFormatter; import javax.inject.Inject; diff --git a/gui/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 index 985c88ad92..68da0c016e 100644 --- a/gui/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,13 +20,13 @@ 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.view.ActivatableView; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.ActivatableView; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.util.BSFormatter; +import io.bitsquare.gui.util.GUIUtil; import io.bitsquare.locale.BSResources; import io.bitsquare.locale.LanguageUtil; -import io.bitsquare.util.Utilities; import org.bitcoinj.core.Coin; import org.bitcoinj.core.ECKey; @@ -284,7 +284,7 @@ public class ArbitratorRegistrationView extends ActivatableView Utilities.copyToClipboard(securityDepositAddress)); + copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(securityDepositAddress)); paymentDoneButton.setDisable(walletService.getArbitratorDepositBalance().isZero()); log.debug("getArbitratorDepositBalance " + walletService.getArbitratorDepositBalance()); diff --git a/gui/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 index 2e4f1b7737..d50d4fa399 100644 --- a/gui/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,9 +17,9 @@ package io.bitsquare.gui.main.account.content.altcoin; -import io.bitsquare.common.model.Activatable; -import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.user.User; diff --git a/gui/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 index 57052c62bb..8caa17afc4 100644 --- a/gui/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,10 +17,10 @@ package io.bitsquare.gui.main.account.content.altcoin; -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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.help.Help; diff --git a/gui/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 index cced350994..fd81dd8751 100644 --- a/gui/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,9 +17,9 @@ package io.bitsquare.gui.main.account.content.altcoin; -import io.bitsquare.common.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; diff --git a/gui/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 index 71e2fa172d..61bf9e615e 100644 --- a/gui/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.view.FxmlView; -import io.bitsquare.common.view.InitializableView; -import io.bitsquare.common.view.Wizard; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.InitializableView; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/gui/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 index 9d0eed6349..7f6ebe6600 100644 --- a/gui/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.model.ViewModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; diff --git a/gui/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 index 48559f2337..bf9ad6af23 100644 --- a/gui/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,9 +17,9 @@ package io.bitsquare.gui.main.account.content.fiat; -import io.bitsquare.common.model.Activatable; -import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.CurrencyUtil; diff --git a/gui/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 index 8b7267a77f..6f47d55720 100644 --- a/gui/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,11 +17,11 @@ package io.bitsquare.gui.main.account.content.fiat; -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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.help.Help; diff --git a/gui/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 index c3b27f4b07..ce25314ea1 100644 --- a/gui/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,9 +17,9 @@ package io.bitsquare.gui.main.account.content.fiat; -import io.bitsquare.common.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; diff --git a/gui/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 index 04e498957a..9849ff3df1 100644 --- a/gui/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.view.FxmlView; -import io.bitsquare.common.view.InitializableView; -import io.bitsquare.common.view.Wizard; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.InitializableView; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/gui/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 index 6fff106a0f..e632184618 100644 --- a/gui/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.model.ViewModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; diff --git a/gui/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 index 113eeda94a..c60607050b 100644 --- a/gui/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.model.DataModel; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.user.User; import org.bitcoinj.core.Coin; diff --git a/gui/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 index 1efbecb7f9..56c871bd5c 100644 --- a/gui/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,10 +17,10 @@ package io.bitsquare.gui.main.account.content.registration; -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.common.view.FxmlView; +import io.bitsquare.gui.common.view.InitializableView; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.components.AddressTextField; import io.bitsquare.gui.components.BalanceTextField; import io.bitsquare.gui.components.Popups; diff --git a/gui/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 index 5acdaa4525..aafa74abd2 100644 --- a/gui/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.model.ViewModel; -import io.bitsquare.common.model.WithDataModel; +import io.bitsquare.gui.common.model.ViewModel; +import io.bitsquare.gui.common.model.WithDataModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.BSResources; diff --git a/gui/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 index 4dd87a0fb9..dd79ad1423 100644 --- a/gui/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.model.Activatable; -import io.bitsquare.common.model.DataModel; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.CountryUtil; import io.bitsquare.locale.LanguageUtil; diff --git a/gui/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 index 9230ce01fa..fbf616f4cd 100644 --- a/gui/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.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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; +import io.bitsquare.gui.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/gui/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 index 1c173f5b5c..ac7df0d16a 100644 --- a/gui/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.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; diff --git a/gui/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 index b9f20c9e7f..817cf5bfbd 100644 --- a/gui/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.view.FxmlView; -import io.bitsquare.common.view.InitializableView; -import io.bitsquare.common.view.Wizard; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.InitializableView; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; diff --git a/gui/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 index 9d1365bd80..5d6e1c8c0c 100644 --- a/gui/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.model.ViewModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java index 00fff8dddc..6b297922e6 100644 --- a/gui/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,14 +17,14 @@ package io.bitsquare.gui.main.account.settings; -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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; +import io.bitsquare.gui.common.view.ViewPath; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.account.AccountView; import io.bitsquare.gui.main.account.content.changepassword.ChangePasswordView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java index fe8d994731..6a211463ef 100644 --- a/gui/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,13 +17,13 @@ package io.bitsquare.gui.main.account.setup; -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.common.view.ActivatableView; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; +import io.bitsquare.gui.common.view.Wizard; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.account.content.fiat.FiatAccountView; import io.bitsquare.gui.main.account.content.password.PasswordView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java index 5dd1dbf9e0..d4659df008 100644 --- a/gui/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.view.FxmlView; -import io.bitsquare.common.view.InitializableView; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.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/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java index 30dfe9da1a..d80c33bca1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java @@ -17,13 +17,13 @@ package io.bitsquare.gui.main.funds; -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.common.model.Activatable; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.funds.reserved.ReservedView; import io.bitsquare.gui.main.funds.transactions.TransactionsView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java index 4e62a55f7d..b822b278fa 100644 --- a/gui/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,11 +19,11 @@ package io.bitsquare.gui.main.funds.reserved; import io.bitsquare.btc.WalletService; import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.common.view.ActivatableViewAndModel; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.util.BSFormatter; +import io.bitsquare.gui.util.GUIUtil; import io.bitsquare.trade.TradeManager; -import io.bitsquare.util.Utilities; import org.bitcoinj.core.Coin; @@ -188,7 +188,7 @@ public class ReservedView extends ActivatableViewAndModel { if (item != null && !empty) { setGraphic(copyIcon); - copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(item + copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(item .addressStringProperty().get())); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java index 77b7b8ff66..865771476d 100644 --- a/gui/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.view.ActivatableViewAndModel; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.util.Utilities; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index ac762e8b2f..ee86f4988b 100644 --- a/gui/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,12 +22,12 @@ 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.view.ActivatableViewAndModel; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; +import io.bitsquare.gui.util.GUIUtil; import io.bitsquare.trade.TradeManager; -import io.bitsquare.util.Utilities; import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.Coin; @@ -275,7 +275,7 @@ public class WithdrawalView extends ActivatableViewAndModel { if (item != null && !empty) { setGraphic(copyIcon); - copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(item + copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(item .addressStringProperty().get())); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java index 9808520535..70cdcbcfad 100644 --- a/gui/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.view.AbstractView; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.AbstractView; +import io.bitsquare.gui.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/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java index b19e98d8e6..2f5f34457f 100644 --- a/gui/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.view.AbstractView; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.AbstractView; +import io.bitsquare.gui.common.view.FxmlView; // will be probably only used for arbitration communication, will be renamed and the icon changed @FxmlView diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java index f27e564786..3dd4abf7f3 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.offer; -import io.bitsquare.common.view.FxmlView; -import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.ViewLoader; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java index 18f2d4c68b..5c34c6bcf7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java @@ -17,10 +17,10 @@ package io.bitsquare.gui.main.offer; -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.common.view.ActivatableView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.offer.createoffer.CreateOfferView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java index 6679dcd0aa..8ce407b831 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.offer; -import io.bitsquare.common.view.FxmlView; -import io.bitsquare.common.view.ViewLoader; import io.bitsquare.gui.Navigation; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.ViewLoader; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java index 1d4d8a38ca..24b81d5536 100644 --- a/gui/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,9 +23,9 @@ 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.model.Activatable; -import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; import io.bitsquare.offer.Offer; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java index 1fb261b04f..2baa5f22c0 100644 --- a/gui/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,10 +17,10 @@ package io.bitsquare.gui.main.offer.createoffer; -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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.AddressTextField; import io.bitsquare.gui.components.BalanceTextField; import io.bitsquare.gui.components.InfoDisplay; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java index 559f88255b..673c1db4cb 100644 --- a/gui/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.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcValidator; import io.bitsquare.gui.util.validation.FiatValidator; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java index f5c3fc7abb..67df004a57 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java @@ -18,13 +18,13 @@ package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.util.GUIUtil; 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; import java.util.List; @@ -182,7 +182,7 @@ public class OfferBook { private void startPolling() { addListeners(); setBankAccount(user.currentFiatAccountProperty().get()); - pollingTimer = Utilities.setInterval(POLLING_INTERVAL, (animationTimer) -> { + pollingTimer = GUIUtil.setInterval(POLLING_INTERVAL, (animationTimer) -> { offerBookService.requestInvalidationTimeStampFromDHT(fiatCode); return null; }); diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java index d6e8f10d87..ceafa309db 100644 --- a/gui/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,9 +19,9 @@ package io.bitsquare.gui.main.offer.offerbook; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.model.Activatable; -import io.bitsquare.common.model.DataModel; import io.bitsquare.fiat.FiatAccount; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.locale.Country; import io.bitsquare.locale.CurrencyUtil; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java index 090fe2cabc..54e378e11b 100644 --- a/gui/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,10 +17,10 @@ package io.bitsquare.gui.main.offer.offerbook; -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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java index cebc32732e..7facd46365 100644 --- a/gui/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.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.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/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java index 7f4d6d3ca8..2cf675199f 100644 --- a/gui/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.model.Activatable; -import io.bitsquare.common.model.DataModel; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.offer.Offer; import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.handlers.TakeOfferResultHandler; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java index 51adba89a2..f4d573331c 100644 --- a/gui/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,10 +18,10 @@ package io.bitsquare.gui.main.offer.takeoffer; -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.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.AddressTextField; import io.bitsquare.gui.components.BalanceTextField; import io.bitsquare.gui.components.InfoDisplay; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java index 58904204cd..c9867c6632 100644 --- a/gui/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.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.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/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index 84e1c3943a..0461d8c123 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -17,13 +17,13 @@ package io.bitsquare.gui.main.portfolio; -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.common.model.Activatable; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView; import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java index 706c357491..d8089fe9d4 100644 --- a/gui/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.model.Activatable; -import io.bitsquare.common.model.DataModel; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java index abd2057578..e8d304a291 100644 --- a/gui/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.view.ActivatableViewAndModel; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java index d0045e38b4..0d79441baa 100644 --- a/gui/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.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.common.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.TakerTradeState; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java index 32646e5c94..0df509bce4 100644 --- a/gui/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.model.Activatable; -import io.bitsquare.common.model.DataModel; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java index 185275e9d6..a7e61fc942 100644 --- a/gui/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,15 +17,15 @@ package io.bitsquare.gui.main.portfolio.openoffer; -import io.bitsquare.common.view.ActivatableViewAndModel; -import io.bitsquare.common.view.FxmlView; import io.bitsquare.gui.Navigation; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.funds.FundsView; import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; +import io.bitsquare.gui.util.GUIUtil; import io.bitsquare.offer.Offer; -import io.bitsquare.util.Utilities; import javax.inject.Inject; @@ -86,7 +86,7 @@ public class OpenOffersView extends ActivatableViewAndModel focusedPropertyListener; - + private Label btcTradeAmountLabel; private TextField btcTradeAmountTextField; private Label fiatTradeAmountLabel; diff --git a/gui/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 index a71216f512..1d200a9bbc 100644 --- a/gui/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 @@ -36,7 +36,7 @@ public class ConfirmFiatReceivedView extends TradeStepDetailsView { private static final Logger log = LoggerFactory.getLogger(ConfirmFiatReceivedView.class); private final ChangeListener txIdChangeListener; - + private TxIdTextField txIdTextField; private Label infoLabel; private InfoDisplay infoDisplay; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java index 272ec23fa0..e2a786546d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java @@ -17,13 +17,13 @@ package io.bitsquare.gui.main.settings; -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.common.model.Activatable; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewLoader; import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.settings.application.PreferencesView; import io.bitsquare.gui.main.settings.network.NetworkSettingsView; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java index 16b22c5f7c..f563bbc2c5 100644 --- a/gui/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.model.Activatable; -import io.bitsquare.common.model.DataModel; +import io.bitsquare.gui.common.model.Activatable; +import io.bitsquare.gui.common.model.DataModel; import io.bitsquare.user.Preferences; import com.google.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java index 81292252ed..a5e5080011 100644 --- a/gui/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.view.ActivatableViewAndModel; -import io.bitsquare.common.view.FxmlView; +import io.bitsquare.gui.common.view.ActivatableViewAndModel; +import io.bitsquare.gui.common.view.FxmlView; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java index 10a6e1d4c2..5b3f1f9249 100644 --- a/gui/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.model.ActivatableWithDataModel; -import io.bitsquare.common.model.ViewModel; +import io.bitsquare.gui.common.model.ActivatableWithDataModel; +import io.bitsquare.gui.common.model.ViewModel; import com.google.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java index c6c23268f2..962b6f2c32 100644 --- a/gui/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.view.FxmlView; -import io.bitsquare.common.view.InitializableView; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.InitializableView; import io.bitsquare.p2p.ClientNode; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java b/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java new file mode 100644 index 0000000000..c8ee38dedf --- /dev/null +++ b/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java @@ -0,0 +1,72 @@ +/* + * 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.gui.util; + +import java.util.function.Function; + +import javafx.animation.AnimationTimer; +import javafx.application.Platform; +import javafx.scene.input.*; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class GUIUtil { + private static final Logger log = LoggerFactory.getLogger(GUIUtil.class); + + public static void copyToClipboard(String content) { + if (content != null && content.length() > 0) { + Clipboard clipboard = Clipboard.getSystemClipboard(); + ClipboardContent clipboardContent = new ClipboardContent(); + clipboardContent.putString(content); + clipboard.setContent(clipboardContent); + } + } + + public static AnimationTimer setTimeout(int delay, Function callback) { + AnimationTimer animationTimer = new AnimationTimer() { + final long lastTimeStamp = System.currentTimeMillis(); + + @Override + public void handle(long arg0) { + if (System.currentTimeMillis() > delay + lastTimeStamp) { + Platform.runLater(() -> callback.apply(this)); + this.stop(); + } + } + }; + animationTimer.start(); + return animationTimer; + } + + public static AnimationTimer setInterval(int delay, Function callback) { + AnimationTimer animationTimer = new AnimationTimer() { + long lastTimeStamp = System.currentTimeMillis(); + + @Override + public void handle(long arg0) { + if (System.currentTimeMillis() > delay + lastTimeStamp) { + lastTimeStamp = System.currentTimeMillis(); + callback.apply(this); + } + } + }; + animationTimer.start(); + return animationTimer; + } +} diff --git a/gui/src/main/resources/logback.xml b/gui/src/main/resources/logback.xml index a02853c1d2..b48be5a186 100644 --- a/gui/src/main/resources/logback.xml +++ b/gui/src/main/resources/logback.xml @@ -30,7 +30,7 @@ - + diff --git a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java index 52aa1b8867..83f24def28 100644 --- a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java +++ b/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java @@ -17,12 +17,13 @@ package io.bitsquare.common.fxml; -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 io.bitsquare.gui.common.ViewfxException; +import io.bitsquare.gui.common.fxml.FxmlViewLoader; +import io.bitsquare.gui.common.view.AbstractView; +import io.bitsquare.gui.common.view.FxmlView; +import io.bitsquare.gui.common.view.View; +import io.bitsquare.gui.common.view.ViewFactory; +import io.bitsquare.gui.common.view.ViewLoader; import java.util.ResourceBundle; diff --git a/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java b/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java index d3bb3a1a5f..384d1785ce 100644 --- a/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java +++ b/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java @@ -17,9 +17,9 @@ package io.bitsquare.common.support; -import io.bitsquare.common.view.AbstractView; -import io.bitsquare.common.view.CachingViewLoader; -import io.bitsquare.common.view.ViewLoader; +import io.bitsquare.gui.common.view.AbstractView; +import io.bitsquare.gui.common.view.CachingViewLoader; +import io.bitsquare.gui.common.view.ViewLoader; import org.junit.Test; diff --git a/pom.xml b/pom.xml index 62efc021a9..fc19698457 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.1.3-SNAPSHOT + 0.1.4-SNAPSHOT The decentralized bitcoin exchange https://bitsquare.io