fixes from merge #story[923]

This commit is contained in:
Peter Galloway
2017-05-17 20:15:47 +12:00
parent 38b44fa92b
commit 0f79353936
3 changed files with 44 additions and 68 deletions
@@ -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;
@@ -19,6 +19,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.PriorityBlockingQueue;
import seng302.models.stream.XMLParser;
/**
* The purpose of this class is to take in the stream of divided packets so they can be read