From b3ed3a441e367425022ff4cdc3f627fe0a3afb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=B6nnecke?= <simonkoennecke@gmail.com>
Date: Tue, 14 Jun 2016 10:45:04 +0200
Subject: [PATCH] move AbstractNode to main package.
---
src/main/java/fucoin/{wallet => }/AbstractNode.java | 3 ++-
src/main/java/fucoin/actions/Action.java | 2 +-
src/main/java/fucoin/actions/join/ActionJoin.java | 2 +-
src/main/java/fucoin/actions/join/GeneralAction.java | 2 +-
src/main/java/fucoin/supervisor/SuperVisorImpl.java | 2 +-
src/main/java/fucoin/wallet/AbstractWallet.java | 1 +
6 files changed, 7 insertions(+), 5 deletions(-)
rename src/main/java/fucoin/{wallet => }/AbstractNode.java (97%)
diff --git a/src/main/java/fucoin/wallet/AbstractNode.java b/src/main/java/fucoin/AbstractNode.java
similarity index 97%
rename from src/main/java/fucoin/wallet/AbstractNode.java
rename to src/main/java/fucoin/AbstractNode.java
index 2a6d51e..c57568b 100644
--- a/src/main/java/fucoin/wallet/AbstractNode.java
+++ b/src/main/java/fucoin/AbstractNode.java
@@ -1,7 +1,8 @@
-package fucoin.wallet;
+package fucoin;
import akka.actor.ActorRef;
import akka.actor.UntypedActor;
+import fucoin.wallet.AbstractWallet;
import java.io.Serializable;
import java.util.HashMap;
diff --git a/src/main/java/fucoin/actions/Action.java b/src/main/java/fucoin/actions/Action.java
index bacffdf..f51e4de 100644
--- a/src/main/java/fucoin/actions/Action.java
+++ b/src/main/java/fucoin/actions/Action.java
@@ -2,7 +2,7 @@ package fucoin.actions;
import akka.actor.ActorRef;
import akka.actor.UntypedActorContext;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
public abstract class Action<T extends AbstractNode> {
private ActorRef self;
diff --git a/src/main/java/fucoin/actions/join/ActionJoin.java b/src/main/java/fucoin/actions/join/ActionJoin.java
index e5bb08f..8c1699f 100644
--- a/src/main/java/fucoin/actions/join/ActionJoin.java
+++ b/src/main/java/fucoin/actions/join/ActionJoin.java
@@ -2,7 +2,7 @@ package fucoin.actions.join;
import akka.actor.ActorRef;
import akka.actor.UntypedActorContext;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
//Used to join the network (a pre known participant/WalletImpl must be known)
public class ActionJoin extends GeneralAction {
diff --git a/src/main/java/fucoin/actions/join/GeneralAction.java b/src/main/java/fucoin/actions/join/GeneralAction.java
index fd23197..8dd3c59 100644
--- a/src/main/java/fucoin/actions/join/GeneralAction.java
+++ b/src/main/java/fucoin/actions/join/GeneralAction.java
@@ -1,7 +1,7 @@
package fucoin.actions.join;
import fucoin.actions.Action;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
public abstract class GeneralAction extends Action<AbstractNode> {
diff --git a/src/main/java/fucoin/supervisor/SuperVisorImpl.java b/src/main/java/fucoin/supervisor/SuperVisorImpl.java
index e7c7c2d..4f708ef 100644
--- a/src/main/java/fucoin/supervisor/SuperVisorImpl.java
+++ b/src/main/java/fucoin/supervisor/SuperVisorImpl.java
@@ -6,7 +6,7 @@ import fucoin.actions.persist.ActionInvokeUpdate;
import fucoin.actions.transaction.ActionGetAmountAnswer;
import fucoin.actions.transaction.SuperVisorAction;
import fucoin.gui.SuperVisorGuiControl;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/main/java/fucoin/wallet/AbstractWallet.java b/src/main/java/fucoin/wallet/AbstractWallet.java
index 3da2d7e..a9fd926 100644
--- a/src/main/java/fucoin/wallet/AbstractWallet.java
+++ b/src/main/java/fucoin/wallet/AbstractWallet.java
@@ -1,6 +1,7 @@
package fucoin.wallet;
import akka.actor.ActorRef;
+import fucoin.AbstractNode;
public abstract class AbstractWallet extends AbstractNode {
/**
--
GitLab