From 35e9d4e5d46cd7efb10a85319d469df0bb32fe40 Mon Sep 17 00:00:00 2001
From: Luca Keidel <info@lucakeidel.de>
Date: Tue, 14 Jun 2016 12:59:43 +0200
Subject: [PATCH] Cleaned up Wallet
---
src/main/java/fucoin/Main.java | 2 +-
src/main/java/fucoin/wallet/WalletImpl.java | 14 +++-----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/fucoin/Main.java b/src/main/java/fucoin/Main.java
index 36991ab..2d9f6c3 100644
--- a/src/main/java/fucoin/Main.java
+++ b/src/main/java/fucoin/Main.java
@@ -16,7 +16,7 @@ import java.util.List;
public class Main {
- private static int numberOfWallets = 1;
+ private static int numberOfWallets = 2;
private static ActorSystem cSystem;
diff --git a/src/main/java/fucoin/wallet/WalletImpl.java b/src/main/java/fucoin/wallet/WalletImpl.java
index dd77244..5cb6e22 100644
--- a/src/main/java/fucoin/wallet/WalletImpl.java
+++ b/src/main/java/fucoin/wallet/WalletImpl.java
@@ -49,12 +49,12 @@ public class WalletImpl extends AbstractWallet {
@Override
public void onReceive(Object message) {
- //log(getSender().path().name() + " invokes " + getSelf().path().name() + " to do " + message.getClass().getSimpleName());
+ log(getSender().path().name() + " invokes " + getSelf().path().name() + " to do " + message.getClass().getSimpleName());
if (message instanceof ActionInvokeRevive) {
((ActionInvokeRevive) message).doAction(this);
}
if (!isActive && !(message instanceof ActionInvokeRevive)) return;
- //System.out.println(message);
+
if (message instanceof ClientAction) {
((ClientAction) message).doAction(this);
}
@@ -67,13 +67,7 @@ public class WalletImpl extends AbstractWallet {
if (gui != null) {
gui.setAddress(getAddress());
}
- String path = "akka.tcp://Core@127.0.0.1:1234/user/Main";
- //System.out.println(getContext().provider().getExternalAddressFor(getSelf().path().address()));
- //log("my address should be "+getAddress());
- //log(""+preKnownNeighbour);
- //knownNeighbors.put(getName(),getSelf());
- //System.out.println(knownNeighbors);
if (preKnownNeighbour != null) {
addKnownNeighbor(preKnownNeighbourName, preKnownNeighbour);
preKnownNeighbour.tell(new ActionJoin(), getSelf());
@@ -83,8 +77,6 @@ public class WalletImpl extends AbstractWallet {
preKnownNeighbour.tell(aja, getSelf());
}
- //setAmount(100);
- //remoteSuperVisorActor.tell(new ServerActionJoin(name), getSelf());
}
@Override
@@ -159,7 +151,7 @@ public class WalletImpl extends AbstractWallet {
@Override
public boolean addKnownNeighbor(String key, ActorRef value) {
- System.out.println(key + " is newNeighbor of " + name + "?" + !getKnownNeighbors().containsKey(key));
+ log(key + " is newNeighbor of " + name + "?" + !getKnownNeighbors().containsKey(key));
if (getKnownNeighbors().containsKey(key) || key.equals(name)) {
return false;
}
--
GitLab