From 88102327a07c05c51f6de6cb4b07076001b71820 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 7 Apr 2020 14:19:27 +0200
Subject: [PATCH] Rydder opp i kode

Legger til manglende kommentarer
Fjerner en del debug kode
Forbedrer variabelnavn
Fjerner ubrukt feltvariabel
---
 .../roborally/networking/RoboRallyClient.java | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
index e151ab4..24c4059 100644
--- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
+++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
@@ -4,51 +4,62 @@ import com.esotericsoftware.kryonet.Client;
 import com.esotericsoftware.kryonet.Connection;
 import com.esotericsoftware.kryonet.Listener;
 import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.networking.containers.ErrorResponse;
+import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 import inf112.fiasko.roborally.objects.RoboRallyGame;
 import inf112.fiasko.roborally.utility.NetworkUtil;
 
 import java.io.IOException;
 
+/**
+ * This class represents a client capable of connecting to a Robo Rally server
+ */
 public class RoboRallyClient {
-    Client client;
-    RoboRallyWrapper wrapper;
-    public RoboRallyClient(String IPaddresse,RoboRallyWrapper wrapper) throws IOException {
+    private Client client;
+
+    /**
+     * Instantiates a new Robo Rally client
+     * @param ipAddress The ip address of the server to connect to
+     * @param wrapper The Robo Rally wrapper to be used
+     * @throws IOException If the server cannot be reached
+     */
+    public RoboRallyClient(String ipAddress, RoboRallyWrapper wrapper) throws IOException {
         client = new Client();
-        this.wrapper=wrapper;
         client.start();
         NetworkUtil.registerClasses(client.getKryo());
-        client.connect(5000, IPaddresse, 54555, 54777);
-
-        SomeRequest request = new SomeRequest();
-        request.text = "Here is the request";
-        client.sendTCP(request);
+        client.connect(5000, ipAddress, 54555, 54777);
 
         client.addListener(new RoboRallyClientListener(wrapper));
     }
-    public void sendElement(Object obj) {
-        client.sendTCP(obj);
+
+    /**
+     * Sends something to the server
+     * @param object The object to send to the server
+     */
+    public void sendElement(Object object) {
+        client.sendTCP(object);
     }
 }
 
+/**
+ * This listener handles all receiving from the server
+ */
 class RoboRallyClientListener extends Listener {
-    RoboRallyWrapper wrapper;
-    public RoboRallyClientListener( RoboRallyWrapper wrapper){
+    private RoboRallyWrapper wrapper;
+
+    RoboRallyClientListener(RoboRallyWrapper wrapper) {
         super();
-        this.wrapper=wrapper;
+        this.wrapper = wrapper;
     }
     @Override
     public void received (Connection connection, Object object) {
-        if (object instanceof SomeResponse) {
-            SomeResponse response = (SomeResponse)object;
-            System.out.println("Client received: " + response.text);
-        } else if (object instanceof ErrorResponse) {
+        if (object instanceof ErrorResponse) {
             ErrorResponse errorResponse = (ErrorResponse) object;
             System.out.println(errorResponse.getErrorMessage());
-        }
-        else if(object instanceof GameStartInfo){
+        } else if (object instanceof GameStartInfo) {
             GameStartInfo info = (GameStartInfo) object;
-            wrapper.roboRallyGame = new RoboRallyGame(info.getPlayerlist(),info.getBoardname(),
-                    wrapper.server!=null);
+            wrapper.roboRallyGame = new RoboRallyGame(info.getPlayerlist(), info.getBoardname(),
+                    wrapper.server != null);
         }
     }
 }