Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-09-20 04:54:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Misc. cleanups

Browse source
This commit is contained in:
Manfred Karrer 2016-01-21 13:08:40 +01:00
parent b5f22fdcdc
commit 8aee8b617d
7 changed files with 33 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
View file

@ -149,11 +149,6 @@ public class OpenOfferManager {
@Override @Override
public void run() { public void run() {
UserThread.execute(() -> rePublishOffers()); UserThread.execute(() -> rePublishOffers());
try {
} catch (Throwable t) {
t.printStackTrace();
log.error("Executing task failed. " + t.getMessage());
}
} }
}; };
timer.scheduleAtFixedRate(timerTask, 500, period); timer.scheduleAtFixedRate(timerTask, 500, period);

5
gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
View file

@ -201,8 +201,7 @@ public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<Confidence
} }
if (spinner != null) { if (spinner != null) {
if (getSkinnable().impl_isTreeVisible() && getSkinnable().getScene() != null) { if (!(getSkinnable().impl_isTreeVisible() && getSkinnable().getScene() != null)) {
} else {
getChildren().remove(spinner); getChildren().remove(spinner);
spinner = null; spinner = null;
timelineNulled = true; timelineNulled = true;
@ -259,8 +258,6 @@ public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<Confidence
spinner = new IndeterminateSpinner(control, this, spinEnabled.get(), progressColor.get()); spinner = new IndeterminateSpinner(control, this, spinEnabled.get(), progressColor.get());
getChildren().clear(); getChildren().clear();
getChildren().add(spinner); getChildren().add(spinner);
if (getSkinnable().impl_isTreeVisible()) {
}
} else { } else {
// clean up after spinner // clean up after spinner
if (spinner != null) { if (spinner != null) {

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
View file

@ -45,7 +45,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
String getAmount(FailedTradesListItem item) { String getAmount(FailedTradesListItem item) {
if (item != null && item.getTrade() instanceof Trade) if (item != null && item.getTrade() instanceof Trade)
return formatter.formatCoinWithCode(((Trade) item.getTrade()).getTradeAmount()); return formatter.formatCoinWithCode(item.getTrade().getTradeAmount());
else else
return ""; return "";
} }
@ -56,7 +56,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
String getVolume(FailedTradesListItem item) { String getVolume(FailedTradesListItem item) {
if (item != null && item.getTrade() instanceof Trade) if (item != null && item.getTrade() instanceof Trade)
return formatter.formatFiatWithCode(((Trade) item.getTrade()).getTradeVolume()); return formatter.formatFiatWithCode(item.getTrade().getTradeVolume());
else else
return ""; return "";
} }

2
gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
View file

@ -27,8 +27,6 @@ import static io.bitsquare.app.BitsquareEnvironment.*;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.springframework.core.env.PropertySource.named; import static org.springframework.core.env.PropertySource.named;
import static org.springframework.core.env.StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME;
import static org.springframework.core.env.StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME;
public class BitsquareEnvironmentTests { public class BitsquareEnvironmentTests {

44
network/src/main/java/io/bitsquare/p2p/network/LocalhostNetworkNode.java
View file

@ -102,20 +102,14 @@ public class LocalhostNetworkNode extends NetworkNode {
Log.traceCall(); Log.traceCall();
ListenableFuture<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>> future = executorService.submit(() -> { ListenableFuture<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>> future = executorService.submit(() -> {
Utilities.setThreadName("NetworkNode:CreateTorNode"); Utilities.setThreadName("NetworkNode:CreateTorNode");
try { long ts = System.currentTimeMillis();
long ts = System.currentTimeMillis(); if (simulateTorDelayTorNode > 0)
if (simulateTorDelayTorNode > 0) Uninterruptibles.sleepUninterruptibly(simulateTorDelayTorNode, TimeUnit.MILLISECONDS);
Uninterruptibles.sleepUninterruptibly(simulateTorDelayTorNode, TimeUnit.MILLISECONDS); log.info("\n\n############################################################\n" +
"TorNode created [simulation]:" +
log.info("\n\n############################################################\n" + "\nTook " + (System.currentTimeMillis() - ts) + " ms"
"TorNode created [simulation]:" + + "\n############################################################\n");
"\nTook " + (System.currentTimeMillis() - ts) + " ms" return null;
+ "\n############################################################\n");
// as we are simulating we return null
return null;
} catch (Throwable t) {
throw t;
}
}); });
Futures.addCallback(future, new FutureCallback<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>>() { Futures.addCallback(future, new FutureCallback<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>>() {
public void onSuccess(TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode) { public void onSuccess(TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode) {
@ -138,20 +132,14 @@ public class LocalhostNetworkNode extends NetworkNode {
Log.traceCall(); Log.traceCall();
ListenableFuture<HiddenServiceDescriptor> future = executorService.submit(() -> { ListenableFuture<HiddenServiceDescriptor> future = executorService.submit(() -> {
Utilities.setThreadName("NetworkNode:CreateHiddenService"); Utilities.setThreadName("NetworkNode:CreateHiddenService");
try { long ts = System.currentTimeMillis();
long ts = System.currentTimeMillis(); if (simulateTorDelayHiddenService > 0)
if (simulateTorDelayHiddenService > 0) Uninterruptibles.sleepUninterruptibly(simulateTorDelayHiddenService, TimeUnit.MILLISECONDS);
Uninterruptibles.sleepUninterruptibly(simulateTorDelayHiddenService, TimeUnit.MILLISECONDS); log.info("\n\n############################################################\n" +
"Hidden service published [simulation]:" +
log.info("\n\n############################################################\n" + "\nTook " + (System.currentTimeMillis() - ts) + " ms"
"Hidden service published [simulation]:" + + "\n############################################################\n");
"\nTook " + (System.currentTimeMillis() - ts) + " ms" return null;
+ "\n############################################################\n");
// as we are simulating we return null
return null;
} catch (Throwable t) {
throw t;
}
}); });
Futures.addCallback(future, new FutureCallback<HiddenServiceDescriptor>() { Futures.addCallback(future, new FutureCallback<HiddenServiceDescriptor>() {
public void onSuccess(HiddenServiceDescriptor hiddenServiceDescriptor) { public void onSuccess(HiddenServiceDescriptor hiddenServiceDescriptor) {

8
network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
View file

@ -165,12 +165,8 @@ public abstract class NetworkNode implements MessageListener, ConnectionListener
// connection.sendMessage might take a bit (compression, write to stream), so we use a thread to not block // connection.sendMessage might take a bit (compression, write to stream), so we use a thread to not block
ListenableFuture<Connection> future = executorService.submit(() -> { ListenableFuture<Connection> future = executorService.submit(() -> {
Thread.currentThread().setName("NetworkNode:SendMessage-to-" + connection.getUid()); Thread.currentThread().setName("NetworkNode:SendMessage-to-" + connection.getUid());
try { connection.sendMessage(message);
connection.sendMessage(message); return connection;
return connection;
} catch (Throwable t) {
throw t;
}
}); });
final SettableFuture<Connection> resultFuture = SettableFuture.create(); final SettableFuture<Connection> resultFuture = SettableFuture.create();
Futures.addCallback(future, new FutureCallback<Connection>() { Futures.addCallback(future, new FutureCallback<Connection>() {

33
network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java
View file

@ -204,22 +204,17 @@ public class TorNetworkNode extends NetworkNode {
Log.traceCall(); Log.traceCall();
ListenableFuture<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>> future = executorService.submit(() -> { ListenableFuture<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>> future = executorService.submit(() -> {
Utilities.setThreadName("TorNetworkNode:CreateTorNode"); Utilities.setThreadName("TorNetworkNode:CreateTorNode");
try { long ts = System.currentTimeMillis();
long ts = System.currentTimeMillis(); if (torDir.mkdirs())
if (torDir.mkdirs()) log.trace("Created directory for tor");
log.trace("Created directory for tor"); log.info("TorDir = " + torDir.getAbsolutePath());
log.trace("Create TorNode");
log.info("TorDir = " + torDir.getAbsolutePath()); TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode = new JavaTorNode(torDir);
log.trace("Create TorNode"); log.info("\n\n############################################################\n" +
TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode = new JavaTorNode(torDir); "TorNode created:" +
log.info("\n\n############################################################\n" + "\nTook " + (System.currentTimeMillis() - ts) + " ms"
"TorNode created:" + + "\n############################################################\n");
"\nTook " + (System.currentTimeMillis() - ts) + " ms" return torNode;
+ "\n############################################################\n");
return torNode;
} catch (Throwable t) {
throw t;
}
}); });
Futures.addCallback(future, new FutureCallback<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>>() { Futures.addCallback(future, new FutureCallback<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>>() {
public void onSuccess(TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode) { public void onSuccess(TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode) {
@ -240,11 +235,10 @@ public class TorNetworkNode extends NetworkNode {
Log.traceCall(); Log.traceCall();
ListenableFuture<Object> future = executorService.submit(() -> { ListenableFuture<Object> future = executorService.submit(() -> {
Utilities.setThreadName("TorNetworkNode:CreateHiddenService"); Utilities.setThreadName("TorNetworkNode:CreateHiddenService");
try { {
long ts = System.currentTimeMillis(); long ts = System.currentTimeMillis();
log.debug("Create hidden service"); log.debug("Create hidden service");
HiddenServiceDescriptor hiddenServiceDescriptor = torNode.createHiddenService(localPort, servicePort); HiddenServiceDescriptor hiddenServiceDescriptor = torNode.createHiddenService(localPort, servicePort);
torNode.addHiddenServiceReadyListener(hiddenServiceDescriptor, descriptor -> { torNode.addHiddenServiceReadyListener(hiddenServiceDescriptor, descriptor -> {
log.info("\n\n############################################################\n" + log.info("\n\n############################################################\n" +
"Hidden service published:" + "Hidden service published:" +
@ -254,10 +248,7 @@ public class TorNetworkNode extends NetworkNode {
UserThread.execute(() -> resultHandler.accept(hiddenServiceDescriptor)); UserThread.execute(() -> resultHandler.accept(hiddenServiceDescriptor));
}); });
return null; return null;
} catch (Throwable t) {
throw t;
} }
}); });
Futures.addCallback(future, new FutureCallback<Object>() { Futures.addCallback(future, new FutureCallback<Object>() {