From 0c08f5a03cd9d1bf63846bc55a9c8d8293e85cad Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Thu, 20 Jul 2017 11:46:06 +1200
Subject: [PATCH] Refactoring to remove all superflous classes related to the
 server GameServerThread --> MainServerThread All server classes consolidated
 into the gameServer package and all others removed

tags: #story[1055] #refactor #fix
---
 .../seng302/controllers/LobbyController.java   | 18 +-----------------
 .../seng302/gameServer/MainServerThread.java   |  1 +
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java
index c7835b30..aa825280 100644
--- a/src/main/java/seng302/controllers/LobbyController.java
+++ b/src/main/java/seng302/controllers/LobbyController.java
@@ -1,9 +1,6 @@
 package seng302.controllers;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -13,11 +10,8 @@ import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.text.Text;
-import seng302.gameServer.GameServerThread;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
-import seng302.gameServerWithThreading.MainServerThread;
-import seng302.gameServerWithThreading.ServerToClientThread;
 
 /**
  * A class describing the actions of the lobby screen
@@ -32,7 +26,6 @@ public class LobbyController {
     @FXML
     private Text lobbyIpText;
 
-    private GameServerThread gameServerThread;
     private static ObservableList competitors;
 
     private void setContentPane(String jfxUrl) {
@@ -62,21 +55,12 @@ public class LobbyController {
         setContentPane("/views/StartScreenView.fxml");
         System.out.println("Leaving lobby!");
         GameState.setCurrentStage(GameStages.CANCELLED);
-        gameServerThread.terminateGame();
+        // TODO: 20/07/17 wmu16 - Implement some way of terminating the game
     }
 
-    public static void refreshCompetitors(){
-        Collection<String> competitorsIps = MainServerThread.getServerToClientThreads();
-        competitors.clear();
-        competitors.addAll(competitorsIps);
-    }
 
     @FXML
     public void readyButtonPressed() {
         GameState.setCurrentStage(GameStages.RACING);
     }
-
-    protected void setGameServerThread(GameServerThread gameServerThread) {
-        this.gameServerThread = gameServerThread;
-    }
 }
diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index 003f98ba..8caf5e9c 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -135,4 +135,5 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
         GameState.removePlayer(player);
 //        sendXml();
     }
+
 }