Fixed merge conflicts

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

@@ -2,9 +2,13 @@ package fucoin.actions.join;
 
 import akka.actor.ActorRef;
 import akka.actor.UntypedActorContext;
+import akka.dispatch.OnSuccess;
 import fucoin.actions.ClientAction;
 import fucoin.actions.persist.ActionSearchMyWallet;
 import fucoin.wallet.AbstractWallet;
+import scala.Function1;
+import scala.concurrent.Future;
+import scala.runtime.BoxedUnit;
 
 import java.util.HashMap;
 import java.util.Map.Entry;

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

@@ -15,6 +15,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import static akka.dispatch.Futures.future;
+
 public class SuperVisorImpl extends AbstractNode implements TransactionLogger{
 
     private AmountTableModel amountTableModel;

src/main/java/fucoin/wallet/AbstractWallet.java

@@ -3,6 +3,7 @@ package fucoin.wallet;
 import akka.actor.ActorRef;
 import fucoin.AbstractNode;
 import fucoin.gui.TransactionLogger;
+import scala.concurrent.Future;
 
 import java.io.Serializable;
 

src/main/java/fucoin/wallet/WalletImpl.java

@@ -12,6 +12,9 @@ import fucoin.actions.persist.ActionInvokeRevive;
 import fucoin.actions.transaction.ActionGetAmountAnswer;
 import fucoin.actions.transaction.ActionInvokeSentMoney;
 import fucoin.gui.WalletGuiControl;
+import scala.concurrent.Future;
+
+import static akka.dispatch.Futures.future;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
@@ -153,6 +156,11 @@ public class WalletImpl extends AbstractWallet {
         return remoteSuperVisorActor;
     }
 
+    public Future<ActorRef> resolveSuperVisorActor() {
+        // TODO: this should return only, if getRemoteSuperVisorActor() != null
+        return future(() -> getRemoteSuperVisorActor(), context().system().dispatcher());
+    }
+
     @Override
     public void setRemoteSuperVisorActor(ActorRef remoteSuperVisorActor) {
         if (this.remoteSuperVisorActor == null) {