From 7a9de65e866c3ce17eb7d0539a6c4f387ee58d9d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 17 May 2015 15:17:17 +0200 Subject: [PATCH] Ready for Version 0.2.1 deployment --- core/src/main/java/io/bitsquare/p2p/Node.java | 10 +--------- .../main/java/io/bitsquare/gui/main/MainViewModel.java | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/io/bitsquare/p2p/Node.java b/core/src/main/java/io/bitsquare/p2p/Node.java index 177a86b867..4881448194 100644 --- a/core/src/main/java/io/bitsquare/p2p/Node.java +++ b/core/src/main/java/io/bitsquare/p2p/Node.java @@ -145,17 +145,9 @@ public final class Node { return Objects.hashCode(name, ip, port); } - public String getClientNodeInfo() { - return "Node with: " + - ", ip='" + ip + '\'' + - ", p2pId='" + p2pId + '\'' + - ", port=" + port; - } - @Override public String toString() { - return "Node with: " + - "Name='" + name + '\'' + + return "Name='" + name + '\'' + "; IP='" + ip + '\'' + "; P2P network ID=" + p2pId + "; port=" + port; 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 283afb050e..55e252e81b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -423,8 +423,8 @@ class MainViewModel implements ViewModel { } private void stopBlockchainSyncTimeout() { - log.trace("stopBlockchainSyncTimeout"); if (blockchainSyncTimeoutTimer != null) { + log.trace("stopBlockchainSyncTimeout"); blockchainSyncTimeoutTimer.cancel(); blockchainSyncTimeoutTimer = null; }