From b422958f5d3829f3f0e61dbabb8969ae2e1f483e Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Thu, 25 Jun 2015 16:01:06 +0100
Subject: [PATCH] Refactor from base project

---
 src/main/java/com/github/boukefalos/lirc/Loader.java          | 4 ++--
 src/main/java/com/github/boukefalos/lirc/Server.java          | 2 +-
 .../com/github/boukefalos/lirc/implementation/Remote.java     | 4 ++--
 src/test/java/test/TestLocal.java                             | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/boukefalos/lirc/Loader.java b/src/main/java/com/github/boukefalos/lirc/Loader.java
index a8e31fa..bdbb832 100644
--- a/src/main/java/com/github/boukefalos/lirc/Loader.java
+++ b/src/main/java/com/github/boukefalos/lirc/Loader.java
@@ -27,7 +27,7 @@ public class Loader extends AbstractLoader<Loader> {
 					String protocol = properties.getOrDefault("server.protocol", "tcp").toString();
 					String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
 					int port = Integer.valueOf(properties.getProperty("remote.port"));
-					addForwarder(protocol, implementation, port);
+					addServerForwarder(protocol, implementation, port);
 				} catch (NumberFormatException e) {
 					throw new LoaderException("Failed to parse remote.port");
 				}				
@@ -43,7 +43,7 @@ public class Loader extends AbstractLoader<Loader> {
 				String protocol = properties.getOrDefault("server.protocol", "tcp").toString();
 				String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
 				int port = Integer.valueOf(properties.getProperty("server.port"));
-				addSender(protocol, implementation, "localhost", port);
+				addServerSender(protocol, implementation, port);
 			} catch (NumberFormatException e) {
 				throw new LoaderException("Failed to parse server.port");
 			}	
diff --git a/src/main/java/com/github/boukefalos/lirc/Server.java b/src/main/java/com/github/boukefalos/lirc/Server.java
index a195823..6e0d668 100644
--- a/src/main/java/com/github/boukefalos/lirc/Server.java
+++ b/src/main/java/com/github/boukefalos/lirc/Server.java
@@ -14,9 +14,9 @@ import lirc.Lirc.Number;
 import lirc.Lirc.NumberButton;
 import lirc.Lirc.Signal;
 import base.Control;
+import base.Sender;
 import base.exception.worker.ActivateException;
 import base.exception.worker.DeactivateException;
-import base.sender.Sender;
 import base.work.Listen;
 
 import com.github.boukefalos.lirc.util.SignalObject;
diff --git a/src/main/java/com/github/boukefalos/lirc/implementation/Remote.java b/src/main/java/com/github/boukefalos/lirc/implementation/Remote.java
index e6e4ae3..c10208d 100644
--- a/src/main/java/com/github/boukefalos/lirc/implementation/Remote.java
+++ b/src/main/java/com/github/boukefalos/lirc/implementation/Remote.java
@@ -10,8 +10,8 @@ import lirc.Lirc.Color;
 import lirc.Lirc.Direction;
 import lirc.Lirc.Number;
 import lirc.Lirc.Signal;
-import base.receiver.Forwarder;
-import base.server.forwarder.AbstractReceiver;
+import base.Forwarder;
+import base.server.receiver.AbstractReceiver;
 import base.work.Listen;
 
 import com.github.boukefalos.lirc.Lirc;
diff --git a/src/test/java/test/TestLocal.java b/src/test/java/test/TestLocal.java
index e690b53..b27165b 100644
--- a/src/test/java/test/TestLocal.java
+++ b/src/test/java/test/TestLocal.java
@@ -9,8 +9,7 @@ import com.github.boukefalos.lirc.LircButton;
 import com.github.boukefalos.lirc.implementation.Local;
 import com.github.boukefalos.lirc.util.SignalObject;
 
-public class TestLocal extends Listen<Object> {
-	
+public class TestLocal extends Listen<Object> {	
 	public static void main(String[] args) {
 		new TestLocal().start();
 		try {