From ae5678482b7d940e9eea22fdc81dba536839cc20 Mon Sep 17 00:00:00 2001 From: Peter Galloway Date: Sun, 14 May 2017 20:26:49 +1200 Subject: [PATCH] changed package "parsers" to be called "stream" #story[923] --- src/main/java/seng302/App.java | 4 ++-- .../java/seng302/controllers/CanvasController.java | 14 ++++---------- src/main/java/seng302/controllers/Controller.java | 10 ++-------- .../seng302/controllers/RaceViewController.java | 5 +---- .../models/{parsers => stream}/StreamPacket.java | 4 ++-- .../models/{parsers => stream}/StreamParser.java | 6 +++--- .../models/{parsers => stream}/StreamReceiver.java | 6 ++---- .../models/{parsers => stream}/XMLParser.java | 3 +-- .../packets/BoatPositionPacket.java | 2 +- .../{parsers => stream}/packets/PacketType.java | 2 +- .../{parsers => stream}/packets/StreamPacket.java | 2 +- .../{parsers => stream}/StreamReceiverTest.java | 2 +- .../{parsers => stream}/TeamsParserTest.java | 0 13 files changed, 21 insertions(+), 39 deletions(-) rename src/main/java/seng302/models/{parsers => stream}/StreamPacket.java (93%) rename src/main/java/seng302/models/{parsers => stream}/StreamParser.java (99%) rename src/main/java/seng302/models/{parsers => stream}/StreamReceiver.java (97%) rename src/main/java/seng302/models/{parsers => stream}/XMLParser.java (99%) rename src/main/java/seng302/models/{parsers => stream}/packets/BoatPositionPacket.java (95%) rename src/main/java/seng302/models/{parsers => stream}/packets/PacketType.java (96%) rename src/main/java/seng302/models/{parsers => stream}/packets/StreamPacket.java (95%) rename src/test/java/seng302/models/{parsers => stream}/StreamReceiverTest.java (99%) rename src/test/java/seng302/models/{parsers => stream}/TeamsParserTest.java (100%) diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java index 19a30595..92aab87a 100644 --- a/src/main/java/seng302/App.java +++ b/src/main/java/seng302/App.java @@ -5,8 +5,8 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import seng302.models.parsers.StreamParser; -import seng302.models.parsers.StreamReceiver; +import seng302.models.stream.StreamParser; +import seng302.models.stream.StreamReceiver; import seng302.server.ServerThread; public class App extends Application diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index d477734d..a7ed44ad 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -5,23 +5,17 @@ import javafx.beans.property.SimpleDoubleProperty; import javafx.fxml.FXML; import javafx.geometry.Point2D; import javafx.scene.Group; -import javafx.scene.Node; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.Pane; import javafx.scene.paint.Color; -import javafx.scene.shape.Polygon; import javafx.scene.text.Font; -import javafx.stage.Stage; import seng302.models.*; import seng302.models.mark.*; -import seng302.models.parsers.StreamParser; -import seng302.models.parsers.StreamReceiver; -import seng302.models.parsers.packets.BoatPositionPacket; -import seng302.models.parsers.XMLParser; -import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark; -import seng302.models.parsers.XMLParser.RaceXMLObject.Limit; +import seng302.models.stream.StreamParser; +import seng302.models.stream.packets.BoatPositionPacket; +import seng302.models.stream.XMLParser; +import seng302.models.stream.XMLParser.RaceXMLObject.Limit; import seng302.models.mark.Mark; import java.text.DecimalFormat; diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java index eeae57cc..8eb2eee2 100644 --- a/src/main/java/seng302/controllers/Controller.java +++ b/src/main/java/seng302/controllers/Controller.java @@ -5,7 +5,6 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; -import javafx.fxml.Initializable; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TableColumn; @@ -15,16 +14,11 @@ import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Pane; import javafx.scene.paint.Color; import seng302.models.Yacht; -import seng302.models.parsers.StreamParser; -import seng302.models.parsers.XMLParser; +import seng302.models.stream.StreamParser; +import seng302.models.stream.XMLParser; import java.io.IOException; -import java.net.URL; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.ResourceBundle; import java.util.Timer; import java.util.TimerTask; diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java index f8eed705..a1bb9651 100644 --- a/src/main/java/seng302/controllers/RaceViewController.java +++ b/src/main/java/seng302/controllers/RaceViewController.java @@ -5,20 +5,17 @@ import javafx.animation.Timeline; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; import javafx.scene.control.CheckBox; import javafx.scene.control.Slider; import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import javafx.scene.text.Text; import javafx.util.Duration; import javafx.util.StringConverter; import seng302.models.*; -import seng302.models.parsers.StreamParser; +import seng302.models.stream.StreamParser; -import java.io.IOException; import java.util.*; /** diff --git a/src/main/java/seng302/models/parsers/StreamPacket.java b/src/main/java/seng302/models/stream/StreamPacket.java similarity index 93% rename from src/main/java/seng302/models/parsers/StreamPacket.java rename to src/main/java/seng302/models/stream/StreamPacket.java index f4ba3b81..1cb35bb5 100644 --- a/src/main/java/seng302/models/parsers/StreamPacket.java +++ b/src/main/java/seng302/models/stream/StreamPacket.java @@ -1,6 +1,6 @@ -package seng302.models.parsers; +package seng302.models.stream; -import seng302.models.parsers.packets.PacketType; +import seng302.models.stream.packets.PacketType; /** * Created by kre39 on 23/04/17. diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/stream/StreamParser.java similarity index 99% rename from src/main/java/seng302/models/parsers/StreamParser.java rename to src/main/java/seng302/models/stream/StreamParser.java index dce7e172..fb6e1d1e 100644 --- a/src/main/java/seng302/models/parsers/StreamParser.java +++ b/src/main/java/seng302/models/stream/StreamParser.java @@ -1,12 +1,12 @@ -package seng302.models.parsers; +package seng302.models.stream; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import seng302.models.Yacht; -import seng302.models.parsers.packets.BoatPositionPacket; -import seng302.models.parsers.packets.StreamPacket; +import seng302.models.stream.packets.BoatPositionPacket; +import seng302.models.stream.packets.StreamPacket; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/java/seng302/models/parsers/StreamReceiver.java b/src/main/java/seng302/models/stream/StreamReceiver.java similarity index 97% rename from src/main/java/seng302/models/parsers/StreamReceiver.java rename to src/main/java/seng302/models/stream/StreamReceiver.java index 65d7c525..b3303806 100644 --- a/src/main/java/seng302/models/parsers/StreamReceiver.java +++ b/src/main/java/seng302/models/stream/StreamReceiver.java @@ -1,13 +1,11 @@ -package seng302.models.parsers; +package seng302.models.stream; -import seng302.models.parsers.packets.StreamPacket; +import seng302.models.stream.packets.StreamPacket; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.Socket; -import java.util.ArrayList; -import java.util.Collection; import java.util.Comparator; import java.util.concurrent.PriorityBlockingQueue; import java.util.zip.CRC32; diff --git a/src/main/java/seng302/models/parsers/XMLParser.java b/src/main/java/seng302/models/stream/XMLParser.java similarity index 99% rename from src/main/java/seng302/models/parsers/XMLParser.java rename to src/main/java/seng302/models/stream/XMLParser.java index 51c7f69f..6349d07f 100644 --- a/src/main/java/seng302/models/parsers/XMLParser.java +++ b/src/main/java/seng302/models/stream/XMLParser.java @@ -1,4 +1,4 @@ -package seng302.models.parsers; +package seng302.models.stream; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -9,7 +9,6 @@ import seng302.models.mark.MarkType; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/src/main/java/seng302/models/parsers/packets/BoatPositionPacket.java b/src/main/java/seng302/models/stream/packets/BoatPositionPacket.java similarity index 95% rename from src/main/java/seng302/models/parsers/packets/BoatPositionPacket.java rename to src/main/java/seng302/models/stream/packets/BoatPositionPacket.java index d6f0700d..859223e0 100644 --- a/src/main/java/seng302/models/parsers/packets/BoatPositionPacket.java +++ b/src/main/java/seng302/models/stream/packets/BoatPositionPacket.java @@ -1,4 +1,4 @@ -package seng302.models.parsers.packets; +package seng302.models.stream.packets; public class BoatPositionPacket { private long boatId; diff --git a/src/main/java/seng302/models/parsers/packets/PacketType.java b/src/main/java/seng302/models/stream/packets/PacketType.java similarity index 96% rename from src/main/java/seng302/models/parsers/packets/PacketType.java rename to src/main/java/seng302/models/stream/packets/PacketType.java index 4367ca90..0fd0be84 100644 --- a/src/main/java/seng302/models/parsers/packets/PacketType.java +++ b/src/main/java/seng302/models/stream/packets/PacketType.java @@ -1,4 +1,4 @@ -package seng302.models.parsers.packets; +package seng302.models.stream.packets; /** * Created by Kusal on 4/24/2017. diff --git a/src/main/java/seng302/models/parsers/packets/StreamPacket.java b/src/main/java/seng302/models/stream/packets/StreamPacket.java similarity index 95% rename from src/main/java/seng302/models/parsers/packets/StreamPacket.java rename to src/main/java/seng302/models/stream/packets/StreamPacket.java index 4f10008c..22f2fe56 100644 --- a/src/main/java/seng302/models/parsers/packets/StreamPacket.java +++ b/src/main/java/seng302/models/stream/packets/StreamPacket.java @@ -1,4 +1,4 @@ -package seng302.models.parsers.packets; +package seng302.models.stream.packets; /** * Created by kre39 on 23/04/17. diff --git a/src/test/java/seng302/models/parsers/StreamReceiverTest.java b/src/test/java/seng302/models/stream/StreamReceiverTest.java similarity index 99% rename from src/test/java/seng302/models/parsers/StreamReceiverTest.java rename to src/test/java/seng302/models/stream/StreamReceiverTest.java index c7951e3b..ff9755bb 100644 --- a/src/test/java/seng302/models/parsers/StreamReceiverTest.java +++ b/src/test/java/seng302/models/stream/StreamReceiverTest.java @@ -1,4 +1,4 @@ -package seng302.models.parsers; +package seng302.models.stream; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/seng302/models/parsers/TeamsParserTest.java b/src/test/java/seng302/models/stream/TeamsParserTest.java similarity index 100% rename from src/test/java/seng302/models/parsers/TeamsParserTest.java rename to src/test/java/seng302/models/stream/TeamsParserTest.java