diff --git a/src/main/java/controller/src/ControllerThread.java b/src/main/java/controller/src/ControllerThread.java index 39fcabb..a99c501 100644 --- a/src/main/java/controller/src/ControllerThread.java +++ b/src/main/java/controller/src/ControllerThread.java @@ -9,18 +9,18 @@ import java.util.Queue; import connect.src.ClientThread; import gui.src.View; import logger.src.MessageLogger; -import model.src.Model; +import model.src.ModelRepresentation; public class ControllerThread extends Thread implements Controller { private static final String className = "ControllerThread"; private View view; - private Model model; + private ModelRepresentation model; private Queue controllerToViewQueue; private Queue viewToControllerQueue; - public ControllerThread(View view, Model model) { + public ControllerThread(View view, ModelRepresentation model) { this.view = view; this.model = model; } diff --git a/src/main/java/main/src/Main.java b/src/main/java/main/src/Main.java index e404f9b..3d3695a 100644 --- a/src/main/java/main/src/Main.java +++ b/src/main/java/main/src/Main.java @@ -14,7 +14,7 @@ import controller.src.ViewToControllerData; import gui.src.View; import gui.src.ViewThread; import logger.src.MessageLogger; -import model.src.Model; +import model.src.ModelRepresentation; public final class Main { private static final String className = "Main"; @@ -32,7 +32,7 @@ public final class Main { view.start(); MessageLogger.printMessage(className, "View was started."); - Model model = new Model(); + ModelRepresentation model = new ModelRepresentation(); MessageLogger.printMessage(className, "Model was created."); Controller controller = new ControllerThread(view, model); diff --git a/src/main/java/model/src/Model.java b/src/main/java/model/src/Model.java index 6c0e3f6..0723fe9 100644 --- a/src/main/java/model/src/Model.java +++ b/src/main/java/model/src/Model.java @@ -4,12 +4,6 @@ */ package model.src; -public class Model { - private NetworkModel networkModel; - private NFTablesModel nfTablesModel; - - public Model() { - networkModel = new NetworkModel(); - nfTablesModel = new NFTablesModel(); - } +public interface Model { + public void addNetworkConnection(String networkConnection); } diff --git a/src/main/java/model/src/ModelRepresentation.java b/src/main/java/model/src/ModelRepresentation.java new file mode 100644 index 0000000..2f52588 --- /dev/null +++ b/src/main/java/model/src/ModelRepresentation.java @@ -0,0 +1,19 @@ +/** + * @author Aaron Moser + * @date 01.12.2023 + */ +package model.src; + +public class ModelRepresentation implements Model { + private NetworkModel networkModel; + private NFTablesModel nfTablesModel; + + public ModelRepresentation() { + networkModel = new NetworkModel(); + nfTablesModel = new NFTablesModel(); + } + + public void addNetworkConnection(String networkConnection) { + networkModel.addNetworkConnection(networkConnection); + } +} diff --git a/src/main/java/model/src/NetworkModel.java b/src/main/java/model/src/NetworkModel.java index cefa2cc..6dd5fb0 100644 --- a/src/main/java/model/src/NetworkModel.java +++ b/src/main/java/model/src/NetworkModel.java @@ -31,43 +31,47 @@ public class NetworkModel { unixNetworkConnections = new LinkedList(); } - public void addIPv4NetworkConnection(String networkConnection) { + public void addNetworkConnection(String networkConnection) { + + } + + private void addIPv4NetworkConnection(String networkConnection) { if (null != networkConnection && null != ipv4NetworkConnections) { ipv4NetworkConnections.add(networkConnection); } } - public void addIPv6NetworkConnection(String networkConnection) { + private void addIPv6NetworkConnection(String networkConnection) { if (null != networkConnection && null != ipv6NetworkConnections) { ipv6NetworkConnections.add(networkConnection); } } - public void addTCPOverIPv4NetworkConnection(String networkConnection) { + private void addTCPOverIPv4NetworkConnection(String networkConnection) { if (null != networkConnection && null != tcpOverIPv4NetworkConnections) { tcpOverIPv4NetworkConnections.add(networkConnection); } } - public void addTCPOverIPv6NetworkConnection(String networkConnection) { + private void addTCPOverIPv6NetworkConnection(String networkConnection) { if (null != networkConnection && null != tcpOverIPv6NetworkConnections) { tcpOverIPv6NetworkConnections.add(networkConnection); } } - public void addUDPOverIPv4NetworkConnection(String networkConnection) { + private void addUDPOverIPv4NetworkConnection(String networkConnection) { if (null != networkConnection && null != udpOverIPv4NetworkConnections) { udpOverIPv4NetworkConnections.add(networkConnection); } } - public void addUDPOverIPv6NetworkConnection(String networkConnection) { + private void addUDPOverIPv6NetworkConnection(String networkConnection) { if (null != networkConnection && null != udpOverIPv6NetworkConnections) { udpOverIPv6NetworkConnections.add(networkConnection); } } - public void addUnixNetworkConnection(String networkConnection) { + private void addUnixNetworkConnection(String networkConnection) { if (null != networkConnection && null != unixNetworkConnections) { unixNetworkConnections.add(networkConnection); }