#14: delete unused files like Wallet.java, move methods of WalletControl.java...

#14: delete unused files like Wallet.java, move methods of WalletControl.java interface to AbstractWallet.java and drop WalletControl.java

src/main/java/fucoin/gui/WalletControl.java

-package fucoin.gui;
-
-public interface WalletControl {
-    void leave();
-
-    void send(String address, int amount);
-}

src/main/java/fucoin/gui/WalletControlImpl.java

-package fucoin.gui;
-
-import fucoin.wallet.WalletImpl;
-
-
-public class WalletControlImpl implements WalletControl {
-
-    private WalletImpl wallet;
-
-    public WalletControlImpl(WalletImpl wallet) {
-        this.wallet = wallet;
-    }
-
-    @Override
-    public void leave() {
-        wallet.leave();
-    }
-
-    @Override
-    public void send(String name, int amount) {
-        wallet.send(name, amount);
-    }
-
-}

src/main/java/fucoin/gui/WalletGuiControlImpl.java

 package fucoin.gui;
 
+import fucoin.wallet.AbstractWallet;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -30,7 +32,7 @@ public class WalletGuiControlImpl implements WalletGuiControl {
     private JScrollPane logPane = new JScrollPane(txtLog);
     private JCheckBox showDebug;
 
-    public WalletGuiControlImpl(WalletControl walletControl) {
+    public WalletGuiControlImpl(AbstractWallet wallet) {
 
         window.setSize(400, 600);
         window.setLayout(new GridLayout(3, 1));
@@ -102,7 +104,7 @@ public class WalletGuiControlImpl implements WalletGuiControl {
         window.setVisible(true);
 
         btnSend.addActionListener(e -> {
-            walletControl.send(txtSendTo.getSelectedItem().toString(),
+            wallet.send(txtSendTo.getSelectedItem().toString(),
                     Integer.parseInt(txtSendAmount.getText()));
         });
 
@@ -117,7 +119,7 @@ public class WalletGuiControlImpl implements WalletGuiControl {
             @Override
             public void windowClosing(WindowEvent e) {
                 System.out.println("window closing");
-                walletControl.leave();
+                wallet.leave();
                 super.windowClosing(e);
 
             }
@@ -125,7 +127,7 @@ public class WalletGuiControlImpl implements WalletGuiControl {
             @Override
             public void windowClosed(WindowEvent e) {
                 System.out.println("window closing");
-                walletControl.leave();
+                wallet.leave();
                 super.windowClosing(e);
             }
         });

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

@@ -65,4 +65,6 @@ public abstract class AbstractWallet extends AbstractNode {
     public abstract ActorRef getRemoteSuperVisorActor();
 
     public abstract void logTransaction(String msg);
+
+    public abstract void send(String address, int amount);
 }

src/main/java/fucoin/wallet/Wallet.java

-package fucoin.wallet;
-
-import fucoin.gui.WalletControl;
-
-
-public interface Wallet extends WalletControl {
-    //Vector<WalletPointer> join();
-    void storeOrUpdate(WalletImpl w);
-
-    void invalidateWallet(WalletImpl w);
-
-    void receiveTransaction(int amount);
-    //Vector<WalletPointer> searchWallet(String adress);
-}

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

@@ -9,10 +9,9 @@ import fucoin.actions.persist.ActionInvokeLeave;
 import fucoin.actions.persist.ActionInvokeRevive;
 import fucoin.actions.transaction.ActionGetAmountAnswer;
 import fucoin.actions.transaction.ActionInvokeSentMoney;
-import fucoin.gui.WalletControl;
 import fucoin.gui.WalletGuiControl;
 
-public class WalletImpl extends AbstractWallet implements WalletControl {
+public class WalletImpl extends AbstractWallet {
 
     private ActorRef preKnownNeighbour;
     private ActorRef remoteSuperVisorActor;