From 8aee8b617d5d5b89d4731cf1eb3877eda6371d34 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 21 Jan 2016 13:08:40 +0100
Subject: [PATCH] Misc. cleanups

---
 .../trade/offer/OpenOfferManager.java         |  5 ---
 .../skin/ConfidenceProgressIndicatorSkin.java |  5 +--
 .../failedtrades/FailedTradesViewModel.java   |  4 +-
 .../app/BitsquareEnvironmentTests.java        |  2 -
 .../p2p/network/LocalhostNetworkNode.java     | 44 +++++++------------
 .../io/bitsquare/p2p/network/NetworkNode.java |  8 +---
 .../bitsquare/p2p/network/TorNetworkNode.java | 33 +++++---------
 7 files changed, 33 insertions(+), 68 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
index 2a7c96e62a..cc228c76bb 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
@@ -149,11 +149,6 @@ public class OpenOfferManager {
             @Override
             public void run() {
                 UserThread.execute(() -> rePublishOffers());
-                try {
-                } catch (Throwable t) {
-                    t.printStackTrace();
-                    log.error("Executing task failed. " + t.getMessage());
-                }
             }
         };
         timer.scheduleAtFixedRate(timerTask, 500, period);
diff --git a/gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java b/gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
index 82f1ec54d4..c004c6cba8 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
@@ -201,8 +201,7 @@ public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<Confidence
                 }
 
                 if (spinner != null) {
-                    if (getSkinnable().impl_isTreeVisible() && getSkinnable().getScene() != null) {
-                    } else {
+                    if (!(getSkinnable().impl_isTreeVisible() && getSkinnable().getScene() != null)) {
                         getChildren().remove(spinner);
                         spinner = null;
                         timelineNulled = true;
@@ -259,8 +258,6 @@ public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<Confidence
             spinner = new IndeterminateSpinner(control, this, spinEnabled.get(), progressColor.get());
             getChildren().clear();
             getChildren().add(spinner);
-            if (getSkinnable().impl_isTreeVisible()) {
-            }
         } else {
             // clean up after spinner
             if (spinner != null) {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
index 8a0a6e749f..506a43a04f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
@@ -45,7 +45,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
 
     String getAmount(FailedTradesListItem item) {
         if (item != null && item.getTrade() instanceof Trade)
-            return formatter.formatCoinWithCode(((Trade) item.getTrade()).getTradeAmount());
+            return formatter.formatCoinWithCode(item.getTrade().getTradeAmount());
         else
             return "";
     }
@@ -56,7 +56,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
 
     String getVolume(FailedTradesListItem item) {
         if (item != null && item.getTrade() instanceof Trade)
-            return formatter.formatFiatWithCode(((Trade) item.getTrade()).getTradeVolume());
+            return formatter.formatFiatWithCode(item.getTrade().getTradeVolume());
         else
             return "";
     }
diff --git a/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java b/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
index 2e08655807..004b43f3ab 100644
--- a/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
+++ b/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
@@ -27,8 +27,6 @@ import static io.bitsquare.app.BitsquareEnvironment.*;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 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 {
 
diff --git a/network/src/main/java/io/bitsquare/p2p/network/LocalhostNetworkNode.java b/network/src/main/java/io/bitsquare/p2p/network/LocalhostNetworkNode.java
index cb206ba5a7..0ae54db0f5 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/LocalhostNetworkNode.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/LocalhostNetworkNode.java
@@ -102,20 +102,14 @@ public class LocalhostNetworkNode extends NetworkNode {
         Log.traceCall();
         ListenableFuture<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>> future = executorService.submit(() -> {
             Utilities.setThreadName("NetworkNode:CreateTorNode");
-            try {
-                long ts = System.currentTimeMillis();
-                if (simulateTorDelayTorNode > 0)
-                    Uninterruptibles.sleepUninterruptibly(simulateTorDelayTorNode, TimeUnit.MILLISECONDS);
-
-                log.info("\n\n############################################################\n" +
-                        "TorNode created [simulation]:" +
-                        "\nTook " + (System.currentTimeMillis() - ts) + " ms"
-                        + "\n############################################################\n");
-                // as we are simulating we return null
-                return null;
-            } catch (Throwable t) {
-                throw t;
-            }
+            long ts = System.currentTimeMillis();
+            if (simulateTorDelayTorNode > 0)
+                Uninterruptibles.sleepUninterruptibly(simulateTorDelayTorNode, TimeUnit.MILLISECONDS);
+            log.info("\n\n############################################################\n" +
+                    "TorNode created [simulation]:" +
+                    "\nTook " + (System.currentTimeMillis() - ts) + " ms"
+                    + "\n############################################################\n");
+            return null;
         });
         Futures.addCallback(future, new FutureCallback<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>>() {
             public void onSuccess(TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode) {
@@ -138,20 +132,14 @@ public class LocalhostNetworkNode extends NetworkNode {
         Log.traceCall();
         ListenableFuture<HiddenServiceDescriptor> future = executorService.submit(() -> {
             Utilities.setThreadName("NetworkNode:CreateHiddenService");
-            try {
-                long ts = System.currentTimeMillis();
-                if (simulateTorDelayHiddenService > 0)
-                    Uninterruptibles.sleepUninterruptibly(simulateTorDelayHiddenService, TimeUnit.MILLISECONDS);
-
-                log.info("\n\n############################################################\n" +
-                        "Hidden service published [simulation]:" +
-                        "\nTook " + (System.currentTimeMillis() - ts) + " ms"
-                        + "\n############################################################\n");
-                // as we are simulating we return null
-                return null;
-            } catch (Throwable t) {
-                throw t;
-            }
+            long ts = System.currentTimeMillis();
+            if (simulateTorDelayHiddenService > 0)
+                Uninterruptibles.sleepUninterruptibly(simulateTorDelayHiddenService, TimeUnit.MILLISECONDS);
+            log.info("\n\n############################################################\n" +
+                    "Hidden service published [simulation]:" +
+                    "\nTook " + (System.currentTimeMillis() - ts) + " ms"
+                    + "\n############################################################\n");
+            return null;
         });
         Futures.addCallback(future, new FutureCallback<HiddenServiceDescriptor>() {
             public void onSuccess(HiddenServiceDescriptor hiddenServiceDescriptor) {
diff --git a/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java b/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
index f0ee0afcc0..d4c88b2a7c 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
@@ -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
         ListenableFuture<Connection> future = executorService.submit(() -> {
             Thread.currentThread().setName("NetworkNode:SendMessage-to-" + connection.getUid());
-            try {
-                connection.sendMessage(message);
-                return connection;
-            } catch (Throwable t) {
-                throw t;
-            }
+            connection.sendMessage(message);
+            return connection;
         });
         final SettableFuture<Connection> resultFuture = SettableFuture.create();
         Futures.addCallback(future, new FutureCallback<Connection>() {
diff --git a/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java b/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java
index 759b4361df..5ce0c48471 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java
@@ -204,22 +204,17 @@ public class TorNetworkNode extends NetworkNode {
         Log.traceCall();
         ListenableFuture<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>> future = executorService.submit(() -> {
             Utilities.setThreadName("TorNetworkNode:CreateTorNode");
-            try {
-                long ts = System.currentTimeMillis();
-                if (torDir.mkdirs())
-                    log.trace("Created directory for tor");
-
-                log.info("TorDir = " + torDir.getAbsolutePath());
-                log.trace("Create TorNode");
-                TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode = new JavaTorNode(torDir);
-                log.info("\n\n############################################################\n" +
-                        "TorNode created:" +
-                        "\nTook " + (System.currentTimeMillis() - ts) + " ms"
-                        + "\n############################################################\n");
-                return torNode;
-            } catch (Throwable t) {
-                throw t;
-            }
+            long ts = System.currentTimeMillis();
+            if (torDir.mkdirs())
+                log.trace("Created directory for tor");
+            log.info("TorDir = " + torDir.getAbsolutePath());
+            log.trace("Create TorNode");
+            TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode = new JavaTorNode(torDir);
+            log.info("\n\n############################################################\n" +
+                    "TorNode created:" +
+                    "\nTook " + (System.currentTimeMillis() - ts) + " ms"
+                    + "\n############################################################\n");
+            return torNode;
         });
         Futures.addCallback(future, new FutureCallback<TorNode<JavaOnionProxyManager, JavaOnionProxyContext>>() {
             public void onSuccess(TorNode<JavaOnionProxyManager, JavaOnionProxyContext> torNode) {
@@ -240,11 +235,10 @@ public class TorNetworkNode extends NetworkNode {
         Log.traceCall();
         ListenableFuture<Object> future = executorService.submit(() -> {
             Utilities.setThreadName("TorNetworkNode:CreateHiddenService");
-            try {
+            {
                 long ts = System.currentTimeMillis();
                 log.debug("Create hidden service");
                 HiddenServiceDescriptor hiddenServiceDescriptor = torNode.createHiddenService(localPort, servicePort);
-
                 torNode.addHiddenServiceReadyListener(hiddenServiceDescriptor, descriptor -> {
                     log.info("\n\n############################################################\n" +
                             "Hidden service published:" +
@@ -254,10 +248,7 @@ public class TorNetworkNode extends NetworkNode {
 
                     UserThread.execute(() -> resultHandler.accept(hiddenServiceDescriptor));
                 });
-
                 return null;
-            } catch (Throwable t) {
-                throw t;
             }
         });
         Futures.addCallback(future, new FutureCallback<Object>() {