mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-04-19 07:15:54 -04:00
Removed javafx Platform dependencies from core
This commit is contained in:
Manfred Karrer
parent
7d4b30e8db
commit
7e6098bdaf
@ -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
|
||||
--------------------
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bitsquare</groupId>
|
||||
<version>0.1.3-SNAPSHOT</version>
|
||||
<version>0.1.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bitsquare</groupId>
|
||||
<version>0.1.3-SNAPSHOT</version>
|
||||
<version>0.1.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>core</artifactId>
|
||||
|
||||
@ -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);
|
||||
}
|
||||
});
|
||||
|
||||
@ -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<T> {
|
||||
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) {
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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()) {
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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 " +
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -44,7 +44,7 @@ public class OffererTradeState {
|
||||
PAYOUT_FINALIZED_MSG_SENT,
|
||||
PAYOUT_BROAD_CASTED,
|
||||
PAYOUT_BROAD_CASTED_FAILED,
|
||||
|
||||
|
||||
MESSAGE_SENDING_FAILED,
|
||||
TIMEOUT,
|
||||
EXCEPTION
|
||||
|
||||
@ -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<AnimationTimer, Void> 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<AnimationTimer, Void> 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());
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bitsquare</groupId>
|
||||
<version>0.1.3-SNAPSHOT</version>
|
||||
<version>0.1.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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()))
|
||||
|
||||
@ -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;
|
||||
});
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common;
|
||||
package io.bitsquare.gui.common;
|
||||
|
||||
import static java.lang.String.format;
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.model;
|
||||
package io.bitsquare.gui.common.model;
|
||||
|
||||
public interface Activatable {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.model;
|
||||
package io.bitsquare.gui.common.model;
|
||||
|
||||
public abstract class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.model;
|
||||
package io.bitsquare.gui.common.model;
|
||||
|
||||
public interface DataModel extends Model {
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.model;
|
||||
package io.bitsquare.gui.common.model;
|
||||
|
||||
public interface Model {
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.model;
|
||||
package io.bitsquare.gui.common.model;
|
||||
|
||||
public interface ViewModel extends Model {
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.model;
|
||||
package io.bitsquare.gui.common.model;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.*;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import javafx.scene.*;
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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.*;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import org.springframework.util.ClassUtils;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import javafx.scene.*;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import javafx.util.Callback;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
public interface ViewLoader {
|
||||
View load(Class<? extends View> viewClass);
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bitsquare.common.view;
|
||||
package io.bitsquare.gui.common.view;
|
||||
|
||||
public interface Wizard extends View {
|
||||
void nextStep(Step currentStep);
|
||||
@ -15,9 +15,9 @@
|
||||
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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;
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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<AnchorPane, Void
|
||||
securityDepositAddressTextField.setText(securityDepositAddress);
|
||||
|
||||
AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
|
||||
copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(securityDepositAddress));
|
||||
copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(securityDepositAddress));
|
||||
|
||||
paymentDoneButton.setDisable(walletService.getArbitratorDepositBalance().isZero());
|
||||
log.debug("getArbitratorDepositBalance " + walletService.getArbitratorDepositBalance());
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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()));
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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()));
|
||||
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
});
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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<GridPane, OpenOffers
|
||||
private void openOfferDetails(OpenOfferListItem item) {
|
||||
// TODO Open popup with details view
|
||||
log.debug("openOfferDetails " + item);
|
||||
Utilities.copyToClipboard(item.getOffer().getId());
|
||||
GUIUtil.copyToClipboard(item.getOffer().getId());
|
||||
Popups.openWarningPopup("Under construction",
|
||||
"The offer ID was copied to the clipboard. " +
|
||||
"Use that to identify your trading peer in the IRC chat room \n\n" +
|
||||
|
||||
@ -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.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.offer.Offer;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user