From 355d9757b4a04e8223a6c09baffd15fc24be8f8a Mon Sep 17 00:00:00 2001 From: MickWerf Date: Sun, 7 Jun 2020 16:49:37 +0200 Subject: [PATCH] Removed controller and replaced with runnable. Remove unused logic package --- .../game/client/game/connections/Client.java | 6 ++---- .../netwerkprog/game/client/game/logic/Logic.java | 15 --------------- .../game/server/SessionController.java | 3 +-- .../game/util/application/Controller.java | 5 ----- 4 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 core/src/netwerkprog/game/client/game/logic/Logic.java delete mode 100644 core/src/netwerkprog/game/util/application/Controller.java diff --git a/core/src/netwerkprog/game/client/game/connections/Client.java b/core/src/netwerkprog/game/client/game/connections/Client.java index b25e349..b15b898 100644 --- a/core/src/netwerkprog/game/client/game/connections/Client.java +++ b/core/src/netwerkprog/game/client/game/connections/Client.java @@ -1,9 +1,7 @@ package netwerkprog.game.client.game.connections; -import com.badlogic.gdx.Gdx; -import netwerkprog.game.util.application.Controller; -import netwerkprog.game.util.data.connection.ConnectionData; import netwerkprog.game.util.data.Data; +import netwerkprog.game.util.data.connection.ConnectionData; import java.io.IOException; import java.io.ObjectInputStream; @@ -11,7 +9,7 @@ import java.io.ObjectOutputStream; import java.net.Socket; import java.util.Arrays; -public class Client extends Controller { +public class Client implements Runnable { private final int port; private final String hostname; private boolean isConnected; diff --git a/core/src/netwerkprog/game/client/game/logic/Logic.java b/core/src/netwerkprog/game/client/game/logic/Logic.java deleted file mode 100644 index 31d4d1b..0000000 --- a/core/src/netwerkprog/game/client/game/logic/Logic.java +++ /dev/null @@ -1,15 +0,0 @@ -package netwerkprog.game.client.game.logic; - -import netwerkprog.game.util.application.Controller; - -public class Logic extends Controller { - - public Logic() { - - } - - @Override - public void run() { - - } -} diff --git a/core/src/netwerkprog/game/server/SessionController.java b/core/src/netwerkprog/game/server/SessionController.java index b7a38e1..89caf75 100644 --- a/core/src/netwerkprog/game/server/SessionController.java +++ b/core/src/netwerkprog/game/server/SessionController.java @@ -1,6 +1,5 @@ package netwerkprog.game.server; -import netwerkprog.game.util.application.Controller; import netwerkprog.game.util.data.Data; import netwerkprog.game.util.data.connection.ConnectionData; import netwerkprog.game.util.data.connection.NameData; @@ -15,7 +14,7 @@ import java.util.ArrayList; /** * The sessionController manages any connections from new clients and assigns individual threads to said clients. */ -public class SessionController extends Controller implements DataCallback { +public class SessionController implements DataCallback, Runnable { private ServerSocket serverSocket; private final ArrayList clients; private boolean listening; diff --git a/core/src/netwerkprog/game/util/application/Controller.java b/core/src/netwerkprog/game/util/application/Controller.java deleted file mode 100644 index fd699e8..0000000 --- a/core/src/netwerkprog/game/util/application/Controller.java +++ /dev/null @@ -1,5 +0,0 @@ -package netwerkprog.game.util.application; - -public abstract class Controller implements Runnable { - -}