Unified logging (no more chaos on stdout)

src/main/java/fucoin/AbstractNode.java

@@ -66,7 +66,13 @@ public abstract class AbstractNode extends UntypedActor implements Serializable
     }
 
     public void log(String string) {
-        System.out.println(getSelf().path().name() + ": " + string);
+        if (this instanceof AbstractWallet){
+            System.out.println("Yes: "+string);
+            ((AbstractWallet) this).log(string);
+        }else{
+            System.out.println("No: "+this.getClass());
+            System.out.println(getSelf().path().name() + ": " + string);
+        }
     }
 
 }
\ No newline at end of file

src/main/java/fucoin/Main.java

@@ -16,7 +16,7 @@ import java.util.List;
 
 public class Main {
 
-    private static int numberOfWallets = 4;
+    private static int numberOfWallets = 1;
 
     private static ActorSystem cSystem;
 

src/main/java/fucoin/actions/Action.java

@@ -15,9 +15,4 @@ public abstract class Action<T extends AbstractNode> {
 
     protected abstract void onAction(ActorRef sender, ActorRef self,
                                      UntypedActorContext context, T abstractNode);
-
-    public void log(String string) {
-        System.out.println(self.path().name() + ": " + string);
-    }
-
 }

src/main/java/fucoin/actions/join/ActionJoinAnswer.java

@@ -16,7 +16,7 @@ public class ActionJoinAnswer extends ClientAction {
 
     protected void onAction(ActorRef sender, ActorRef self,
                             UntypedActorContext context, AbstractWallet wallet) {
-        log("Addressed to " + self.path().name() + " from " + sender.path().name() + ": someNeighbors:" + someNeighbors);
+        wallet.log("Addressed to " + self.path().name() + " from " + sender.path().name() + ": someNeighbors:" + someNeighbors);
         for (Entry<String, ActorRef> neighbor : someNeighbors.entrySet()) {
             wallet.addKnownNeighbor(neighbor.getKey(), neighbor.getValue());
         }

src/main/java/fucoin/actions/search/ActionSearchWalletReference.java

@@ -23,7 +23,7 @@ public class ActionSearchWalletReference extends Search {
     @Override
     protected void onAction(ActorRef sender, ActorRef self,
                             UntypedActorContext context, AbstractWallet wallet) {
-        log(wallet.getKnownNeighbors() + "contains " + name + "?");
+        wallet.log(wallet.getKnownNeighbors() + "contains " + name + "?");
         ttl.add(self);
         ActionSearchWalletReferenceAnswer answer = null;
         if (this.name.equals(wallet.getName())) {

src/main/java/fucoin/actions/transaction/ActionCommitDistributedCommittedTransfer.java

@@ -39,7 +39,7 @@ public class ActionCommitDistributedCommittedTransfer extends ClientAction {
     @Override
     protected void onAction(ActorRef sender, ActorRef self,
                             UntypedActorContext context, AbstractWallet wallet) {
-        System.out.println(self.path().name() + ": ActionCommitDistributedCommittedTransfer is granted?" + granted);
+        wallet.log("ActionCommitDistributedCommittedTransfer is granted? " + granted);
         if (granted) {
 
             Integer sourceAmount = wallet.amounts.getOrDefault(source, 0);
@@ -56,9 +56,9 @@ public class ActionCommitDistributedCommittedTransfer extends ClientAction {
             }
 
         } else {
-            log("abort transaction with id" + id);
+            wallet.log("abort transaction with id" + id);
         }
-        log("wallet.amounts:" + wallet.amounts);
+        wallet.log("wallet.amounts:" + wallet.amounts);
     }
 
 }

src/main/java/fucoin/actions/transaction/ActionInvokeDistributedCommittedTransfer.java

@@ -21,7 +21,7 @@ public class ActionInvokeDistributedCommittedTransfer extends CoordinatorTransac
     @Override
     protected void onAction(ActorRef sender, ActorRef self,
                             UntypedActorContext context, SuperVisorImpl superVisor) {
-        log("invoke transaction " + source.path().name() +
+        superVisor.log("invoke transaction " + source.path().name() +
                 " sends " + amount +
                 " to " + target.path().name());
 

src/main/java/fucoin/actions/transaction/ActionInvokeSentMoney.java

@@ -18,7 +18,7 @@ public class ActionInvokeSentMoney extends Transaction {
     @Override
     protected void onAction(ActorRef sender, ActorRef self,
                             UntypedActorContext context, AbstractWallet wallet) {
-        log(wallet.getKnownNeighbors() + "");
+        wallet.log(wallet.getKnownNeighbors() + "");
         if (wallet.getKnownNeighbors().containsKey(name)) {
             wallet.getRemoteSuperVisorActor().tell(
                     new ActionInvokeDistributedCommittedTransfer(self, wallet.getKnownNeighbors().get(name), amount), sender);

src/main/java/fucoin/actions/transaction/ActionPrepareDistributedCommittedTransferAnswer.java

@@ -27,14 +27,14 @@ public class ActionPrepareDistributedCommittedTransferAnswer extends Coordinator
 	@Override
 	protected void onAction(ActorRef sender, ActorRef self,
 			UntypedActorContext context, SuperVisorImpl superVisor) {
-		log(""+superVisor.getKnownNeighbors());
-		log("granted?"+granted);
+		superVisor.log(""+superVisor.getKnownNeighbors());
+		superVisor.log("granted?"+granted);
 		DistributedCommittedTransferRequest request = superVisor.getRequest(id);
 		if(granted){
 			if(request==null)//unknown DistributedCommittedTransferRequest ignore
 				return;
 			int newCount = request.addPositiveAnswer(sender);
-			System.out.println(newCount+" have agreed on request"+id);
+
 			if(newCount == superVisor.getKnownNeighbors().size()){
 				ActionCommitDistributedCommittedTransfer acdct = new ActionCommitDistributedCommittedTransfer(source,target,amount,true,timestamp,id);
 				for(ActorRef neighbor : request.getAnswers()){

src/main/java/fucoin/gui/SuperVisorGuiControl.java

@@ -5,4 +5,6 @@ public interface SuperVisorGuiControl {
      * Call from SuperVisorImpl after poison pill or kill
      */
     void onLeave();
+
+    void log(String message);
 }

src/main/java/fucoin/gui/SuperVisorGuiControlImpl.java

@@ -59,4 +59,11 @@ public class SuperVisorGuiControlImpl implements SuperVisorGuiControl {
     public void onLeave() {
         frame.dispose();
     }
+
+    @Override
+    public void log(String message) {
+        // One day, we may have a server log GUI as well..
+        // Until then, we just print it to the console
+        System.out.println(message);
+    }
 }

src/main/java/fucoin/supervisor/SuperVisorImpl.java

@@ -69,7 +69,6 @@ public class SuperVisorImpl extends AbstractNode {
 
     public void addDistributedCommitedTransferRequest(
             DistributedCommittedTransferRequest request) {
-        System.out.println("Add request to queue: " + request.getId());
         requestQueue.put(request.getId(), request);
     }
 
@@ -116,4 +115,12 @@ public class SuperVisorImpl extends AbstractNode {
     public void setAmountTableModel(AmountTableModel amountTableModel) {
         this.amountTableModel = amountTableModel;
     }
+
+    public void log(String message){
+        if (this.gui != null){
+            this.gui.log(message);
+        } else {
+            System.out.println(message);
+        }
+    }
 }