changed package "parsers" to be called "stream" #story[923]

This commit is contained in:
Peter Galloway
2017-05-14 20:26:49 +12:00
parent 63514cfafb
commit ae5678482b
13 changed files with 21 additions and 39 deletions
+2 -2
View File
@@ -5,8 +5,8 @@ import javafx.fxml.FXMLLoader;
import javafx.scene.Parent; import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.stage.Stage; import javafx.stage.Stage;
import seng302.models.parsers.StreamParser; import seng302.models.stream.StreamParser;
import seng302.models.parsers.StreamReceiver; import seng302.models.stream.StreamReceiver;
import seng302.server.ServerThread; import seng302.server.ServerThread;
public class App extends Application public class App extends Application
@@ -5,23 +5,17 @@ import javafx.beans.property.SimpleDoubleProperty;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Point2D; import javafx.geometry.Point2D;
import javafx.scene.Group; import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.canvas.Canvas; import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext; import javafx.scene.canvas.GraphicsContext;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.shape.Polygon;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import javafx.stage.Stage;
import seng302.models.*; import seng302.models.*;
import seng302.models.mark.*; import seng302.models.mark.*;
import seng302.models.parsers.StreamParser; import seng302.models.stream.StreamParser;
import seng302.models.parsers.StreamReceiver; import seng302.models.stream.packets.BoatPositionPacket;
import seng302.models.parsers.packets.BoatPositionPacket; import seng302.models.stream.XMLParser;
import seng302.models.parsers.XMLParser; import seng302.models.stream.XMLParser.RaceXMLObject.Limit;
import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark;
import seng302.models.parsers.XMLParser.RaceXMLObject.Limit;
import seng302.models.mark.Mark; import seng302.models.mark.Mark;
import java.text.DecimalFormat; import java.text.DecimalFormat;
@@ -5,7 +5,6 @@ import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TableColumn; import javafx.scene.control.TableColumn;
@@ -15,16 +14,11 @@ import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import seng302.models.Yacht; import seng302.models.Yacht;
import seng302.models.parsers.StreamParser; import seng302.models.stream.StreamParser;
import seng302.models.parsers.XMLParser; import seng302.models.stream.XMLParser;
import java.io.IOException; 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.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@@ -5,20 +5,17 @@ import javafx.animation.Timeline;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.Slider; import javafx.scene.control.Slider;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import javafx.util.Duration; import javafx.util.Duration;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import seng302.models.*; import seng302.models.*;
import seng302.models.parsers.StreamParser; import seng302.models.stream.StreamParser;
import java.io.IOException;
import java.util.*; import java.util.*;
/** /**
@@ -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. * Created by kre39 on 23/04/17.
@@ -1,12 +1,12 @@
package seng302.models.parsers; package seng302.models.stream;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import seng302.models.Yacht; import seng302.models.Yacht;
import seng302.models.parsers.packets.BoatPositionPacket; import seng302.models.stream.packets.BoatPositionPacket;
import seng302.models.parsers.packets.StreamPacket; import seng302.models.stream.packets.StreamPacket;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
@@ -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.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.PriorityBlockingQueue;
import java.util.zip.CRC32; import java.util.zip.CRC32;
@@ -1,4 +1,4 @@
package seng302.models.parsers; package seng302.models.stream;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
@@ -9,7 +9,6 @@ import seng302.models.mark.MarkType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@@ -1,4 +1,4 @@
package seng302.models.parsers.packets; package seng302.models.stream.packets;
public class BoatPositionPacket { public class BoatPositionPacket {
private long boatId; private long boatId;
@@ -1,4 +1,4 @@
package seng302.models.parsers.packets; package seng302.models.stream.packets;
/** /**
* Created by Kusal on 4/24/2017. * Created by Kusal on 4/24/2017.
@@ -1,4 +1,4 @@
package seng302.models.parsers.packets; package seng302.models.stream.packets;
/** /**
* Created by kre39 on 23/04/17. * Created by kre39 on 23/04/17.
@@ -1,4 +1,4 @@
package seng302.models.parsers; package seng302.models.stream;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;