From 037b0db01b56b9057194b7f11c2be2713062efc3 Mon Sep 17 00:00:00 2001 From: Calum Date: Thu, 20 Jul 2017 13:04:29 +1200 Subject: [PATCH] Refactoring client for more atomic classes, will mimic the socket, game state, logic thread layout used by the server. #refactor --- src/main/java/seng302/client/ClientToServerThread.java | 1 - src/main/java/seng302/client/GameView.java | 10 ++++++++++ .../java/seng302/controllers/RaceViewController.java | 2 ++ src/main/java/seng302/fxObjects/BoatGroup.java | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/main/java/seng302/client/GameView.java diff --git a/src/main/java/seng302/client/ClientToServerThread.java b/src/main/java/seng302/client/ClientToServerThread.java index 6a7b995d..567435b3 100644 --- a/src/main/java/seng302/client/ClientToServerThread.java +++ b/src/main/java/seng302/client/ClientToServerThread.java @@ -35,7 +35,6 @@ public class ClientToServerThread extends Thread { } catch (IOException e) { e.printStackTrace(); } - } static void serverLog(String message, int logLevel){ diff --git a/src/main/java/seng302/client/GameView.java b/src/main/java/seng302/client/GameView.java new file mode 100644 index 00000000..cc9c5922 --- /dev/null +++ b/src/main/java/seng302/client/GameView.java @@ -0,0 +1,10 @@ +package seng302.client; + +import javafx.scene.layout.AnchorPane; + +/** + * Created by cir27 on 20/07/17. + */ +public class GameView extends AnchorPane { + +} diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java index 17e34c65..bb034dbe 100644 --- a/src/main/java/seng302/controllers/RaceViewController.java +++ b/src/main/java/seng302/controllers/RaceViewController.java @@ -29,6 +29,7 @@ import javafx.stage.Stage; import javafx.stage.StageStyle; import javafx.util.Duration; import javafx.util.StringConverter; +import seng302.client.ClientToServerThread; import seng302.utilities.GeoUtility; import seng302.controllers.annotations.Annotation; import seng302.controllers.annotations.ImportantAnnotationController; @@ -86,6 +87,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel private Yacht selectedBoat; public void initialize() { + // Load a default important annotation state importantAnnotations = new ImportantAnnotationsState(); diff --git a/src/main/java/seng302/fxObjects/BoatGroup.java b/src/main/java/seng302/fxObjects/BoatGroup.java index 5bc051db..d309f9d1 100644 --- a/src/main/java/seng302/fxObjects/BoatGroup.java +++ b/src/main/java/seng302/fxObjects/BoatGroup.java @@ -9,9 +9,9 @@ import javafx.scene.paint.Color; import javafx.scene.shape.Line; import javafx.scene.shape.Polygon; import javafx.scene.transform.Rotate; +import seng302.controllers.GameViewController; import seng302.models.Yacht; import seng302.utilities.GeoUtility; -import seng302.controllers.CanvasController; import seng302.models.mark.GateMark; import seng302.models.mark.Mark; import seng302.models.mark.SingleMark;