MockRace:

Now uses RaceState as its base class, rather than Race. This aligns it with VisualiserRace. RaceState contains the shared race state between the client and server, and stores most of its data in RaceDataSource etc..., instead of maintaining its own copy.
Moved collider registry member to MockRace.

XMLUtilities:
Added documentation to two important functions, and updated them to use generics instead of Objects.
#story[1188]

racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java

@@ -77,7 +77,8 @@ public class RaceXMLCreator {
     public static String alterRaceToWind(String s, double degrees) throws XMLReaderException, InvalidRaceDataException, JAXBException, IOException, SAXException, ParserConfigurationException {
         RaceXMLReader reader = new RaceXMLReader(s, XMLFileType.ResourcePath);
 
-        XMLRace race = (XMLRace) XMLUtilities.xmlToClass(RaceXMLCreator.class.getClassLoader().getResourceAsStream(s),
+        XMLRace race = XMLUtilities.xmlToClass(
+                RaceXMLCreator.class.getClassLoader().getResourceAsStream(s),
                 RaceXMLCreator.class.getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd"),
                 XMLRace.class);
 
@@ -89,14 +90,7 @@ public class RaceXMLCreator {
 
         alterRaceRotation(race, degreesToRotate);
 
-        JAXBContext context = JAXBContext.newInstance(XMLRace.class);
-        Marshaller jaxbMarshaller = context.createMarshaller();
-        jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-
-        StringWriter sw = new StringWriter();
-
-        jaxbMarshaller.marshal(race, sw);
-        return sw.toString();
+        return XMLUtilities.classToXML(race);
     }
 
     /**