From 9e677fd5f24f45cf10cbccad8339fcb2889ea860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=B6nnecke?= <simonkoennecke@gmail.com>
Date: Tue, 14 Jun 2016 10:41:36 +0200
Subject: [PATCH] #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 | 7 ------
.../java/fucoin/gui/WalletControlImpl.java | 24 -------------------
.../java/fucoin/gui/WalletGuiControlImpl.java | 10 ++++----
.../java/fucoin/wallet/AbstractWallet.java | 2 ++
src/main/java/fucoin/wallet/Wallet.java | 14 -----------
src/main/java/fucoin/wallet/WalletImpl.java | 3 +--
6 files changed, 9 insertions(+), 51 deletions(-)
delete mode 100644 src/main/java/fucoin/gui/WalletControl.java
delete mode 100644 src/main/java/fucoin/gui/WalletControlImpl.java
delete mode 100644 src/main/java/fucoin/wallet/Wallet.java
diff --git a/src/main/java/fucoin/gui/WalletControl.java b/src/main/java/fucoin/gui/WalletControl.java
deleted file mode 100644
index 96e378c..0000000
--- a/src/main/java/fucoin/gui/WalletControl.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package fucoin.gui;
-
-public interface WalletControl {
- void leave();
-
- void send(String address, int amount);
-}
diff --git a/src/main/java/fucoin/gui/WalletControlImpl.java b/src/main/java/fucoin/gui/WalletControlImpl.java
deleted file mode 100644
index be00024..0000000
--- a/src/main/java/fucoin/gui/WalletControlImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-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);
- }
-
-}
diff --git a/src/main/java/fucoin/gui/WalletGuiControlImpl.java b/src/main/java/fucoin/gui/WalletGuiControlImpl.java
index b3f8904..e9501ff 100644
--- a/src/main/java/fucoin/gui/WalletGuiControlImpl.java
+++ b/src/main/java/fucoin/gui/WalletGuiControlImpl.java
@@ -1,5 +1,7 @@
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);
}
});
diff --git a/src/main/java/fucoin/wallet/AbstractWallet.java b/src/main/java/fucoin/wallet/AbstractWallet.java
index e12bb4a..3da2d7e 100644
--- a/src/main/java/fucoin/wallet/AbstractWallet.java
+++ b/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);
}
diff --git a/src/main/java/fucoin/wallet/Wallet.java b/src/main/java/fucoin/wallet/Wallet.java
deleted file mode 100644
index 1c8b56a..0000000
--- a/src/main/java/fucoin/wallet/Wallet.java
+++ /dev/null
@@ -1,14 +0,0 @@
-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);
-}
diff --git a/src/main/java/fucoin/wallet/WalletImpl.java b/src/main/java/fucoin/wallet/WalletImpl.java
index b737fef..dd77244 100644
--- a/src/main/java/fucoin/wallet/WalletImpl.java
+++ b/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;
--
GitLab