diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java index a7ce5099..a0208ac0 100644 --- a/racevisionGame/src/main/java/mock/app/Event.java +++ b/racevisionGame/src/main/java/mock/app/Event.java @@ -3,7 +3,6 @@ package mock.app; import mock.dataInput.PolarParser; import mock.model.MockRace; import mock.model.Polars; -import mock.xml.Race; import mock.xml.RaceXMLCreator; import network.Messages.LatestMessages; import org.xml.sax.SAXException; @@ -14,6 +13,7 @@ import shared.exceptions.InvalidRaceDataException; import shared.exceptions.InvalidRegattaDataException; import shared.exceptions.XMLReaderException; import shared.model.Constants; +import shared.xml.Race.XMLRace; import shared.xml.XMLUtilities; import javax.xml.bind.JAXBException; @@ -22,8 +22,6 @@ import javax.xml.transform.TransformerException; import java.io.*; import java.net.UnknownHostException; import java.nio.charset.StandardCharsets; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; /** @@ -49,7 +47,7 @@ public class Event { private Event() { try { try { - this.raceXML = getRaceXMLAtCurrentTime(RaceXMLCreator.alterRaceToWind("mock/mockXML/raceSchemaTest.xml", 90)); + this.raceXML = RaceXMLCreator.alterRaceToWind("mock/mockXML/raceSchemaTest.xml", 90); } catch (SAXException e) { e.printStackTrace(); } catch (ParserConfigurationException e) { @@ -102,15 +100,16 @@ public class Event { sendXMLs(); //Parse the XML files into data sources. -// RaceDataSource raceDataSource = new RaceXMLReader(this.raceXML, this.xmlFileType); - Race race = (Race) XMLUtilities.xmlToClass(raceXML, + RaceDataSource raceDataSource = new RaceXMLReader(this.raceXML, this.xmlFileType); + //more work here + XMLRace race = (XMLRace) XMLUtilities.xmlToClass(raceXML, RaceXMLCreator.class.getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd"), - Race.class); + XMLRace.class); BoatDataSource boatDataSource = new BoatXMLReader(this.boatXML, this.xmlFileType); RegattaDataSource regattaDataSource = new RegattaXMLReader(this.regattaXML, this.xmlFileType); //Create and start race. - MockRace newRace = new MockRace(boatDataSource, race, regattaDataSource, this.latestMessages, this.boatPolars, Constants.RaceTimeScale); + MockRace newRace = new MockRace(boatDataSource, raceDataSource, regattaDataSource, this.latestMessages, this.boatPolars, Constants.RaceTimeScale); new Thread(newRace).start(); } @@ -127,28 +126,5 @@ public class Event { mockOutput.setBoatsXml(boatXML); } - /** - * Sets the xml description of the race to show the race was created now, and starts in 4 minutes - * @param raceXML The race.xml contents. - * @return String containing edited xml - */ - private String getRaceXMLAtCurrentTime(String raceXML) { - - //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute. - long millisecondsToAdd = Constants.RacePreStartTime + (1 * 60 * 1000); - long secondsToAdd = millisecondsToAdd / 1000; - //Scale the time using our time scalar. - secondsToAdd = secondsToAdd / Constants.RaceTimeScale; - - DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ"); - ZonedDateTime creationTime = ZonedDateTime.now(); - raceXML = raceXML.replace("CREATION_TIME", dateFormat.format(creationTime)); - - raceXML = raceXML.replace("START_TIME", dateFormat.format(creationTime.plusSeconds(secondsToAdd))); - - return raceXML; - - } - } diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java index 739eb29f..3f76ab94 100644 --- a/racevisionGame/src/main/java/mock/model/MockRace.java +++ b/racevisionGame/src/main/java/mock/model/MockRace.java @@ -90,7 +90,7 @@ public class MockRace extends Race { * @param polars The polars table to be used for boat simulation. * @param timeScale The timeScale for the race. See {@link Constants#RaceTimeScale}. */ - public MockRace(BoatDataSource boatDataSource, mock.xml.Race raceDataSource, RegattaDataSource regattaDataSource, LatestMessages latestMessages, Polars polars, int timeScale) { + public MockRace(BoatDataSource boatDataSource, RaceDataSource raceDataSource, RegattaDataSource regattaDataSource, LatestMessages latestMessages, Polars polars, int timeScale) { super(boatDataSource, raceDataSource, regattaDataSource, latestMessages); diff --git a/racevisionGame/src/main/java/mock/xml/Race.java b/racevisionGame/src/main/java/mock/xml/Race.java deleted file mode 100644 index 0b32bd09..00000000 --- a/racevisionGame/src/main/java/mock/xml/Race.java +++ /dev/null @@ -1,1351 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 10:39:29 PM NZST -// - - -package mock.xml; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RaceID" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="RaceType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="CreationTimeDate" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="RaceStartTime">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Postpone" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Time" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Participants">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Yacht" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="CompoundMarkSequence">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Corner" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Course">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CompoundMark" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="Mark" maxOccurs="unbounded">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="CourseLimit">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Limit" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "raceID", - "raceType", - "creationTimeDate", - "raceStartTime", - "participants", - "compoundMarkSequence", - "course", - "courseLimit" -}) -@XmlRootElement(name = "Race") -public class Race { - - @XmlElement(name = "RaceID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger raceID; - @XmlElement(name = "RaceType", required = true) - protected String raceType; - @XmlElement(name = "CreationTimeDate", required = true) - protected String creationTimeDate; - @XmlElement(name = "RaceStartTime", required = true) - protected Race.RaceStartTime raceStartTime; - @XmlElement(name = "Participants", required = true) - protected Race.Participants participants; - @XmlElement(name = "CompoundMarkSequence", required = true) - protected Race.CompoundMarkSequence compoundMarkSequence; - @XmlElement(name = "Course", required = true) - protected Race.Course course; - @XmlElement(name = "CourseLimit", required = true) - protected Race.CourseLimit courseLimit; - - /** - * Gets the value of the raceID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getRaceID() { - return raceID; - } - - /** - * Sets the value of the raceID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setRaceID(BigInteger value) { - this.raceID = value; - } - - /** - * Gets the value of the raceType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRaceType() { - return raceType; - } - - /** - * Sets the value of the raceType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRaceType(String value) { - this.raceType = value; - } - - /** - * Gets the value of the creationTimeDate property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCreationTimeDate() { - return creationTimeDate; - } - - /** - * Sets the value of the creationTimeDate property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCreationTimeDate(String value) { - this.creationTimeDate = value; - } - - /** - * Gets the value of the raceStartTime property. - * - * @return - * possible object is - * {@link Race.RaceStartTime } - * - */ - public Race.RaceStartTime getRaceStartTime() { - return raceStartTime; - } - - /** - * Sets the value of the raceStartTime property. - * - * @param value - * allowed object is - * {@link Race.RaceStartTime } - * - */ - public void setRaceStartTime(Race.RaceStartTime value) { - this.raceStartTime = value; - } - - /** - * Gets the value of the participants property. - * - * @return - * possible object is - * {@link Race.Participants } - * - */ - public Race.Participants getParticipants() { - return participants; - } - - /** - * Sets the value of the participants property. - * - * @param value - * allowed object is - * {@link Race.Participants } - * - */ - public void setParticipants(Race.Participants value) { - this.participants = value; - } - - /** - * Gets the value of the compoundMarkSequence property. - * - * @return - * possible object is - * {@link Race.CompoundMarkSequence } - * - */ - public Race.CompoundMarkSequence getCompoundMarkSequence() { - return compoundMarkSequence; - } - - /** - * Sets the value of the compoundMarkSequence property. - * - * @param value - * allowed object is - * {@link Race.CompoundMarkSequence } - * - */ - public void setCompoundMarkSequence(Race.CompoundMarkSequence value) { - this.compoundMarkSequence = value; - } - - /** - * Gets the value of the course property. - * - * @return - * possible object is - * {@link Race.Course } - * - */ - public Race.Course getCourse() { - return course; - } - - /** - * Sets the value of the course property. - * - * @param value - * allowed object is - * {@link Race.Course } - * - */ - public void setCourse(Race.Course value) { - this.course = value; - } - - /** - * Gets the value of the courseLimit property. - * - * @return - * possible object is - * {@link Race.CourseLimit } - * - */ - public Race.CourseLimit getCourseLimit() { - return courseLimit; - } - - /** - * Sets the value of the courseLimit property. - * - * @param value - * allowed object is - * {@link Race.CourseLimit } - * - */ - public void setCourseLimit(Race.CourseLimit value) { - this.courseLimit = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Corner" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *                 <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *                 <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "corner" - }) - public static class CompoundMarkSequence { - - @XmlElement(name = "Corner", required = true) - protected List corner; - - /** - * Gets the value of the corner property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the corner property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCorner().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.CompoundMarkSequence.Corner } - * - * - */ - public List getCorner() { - if (corner == null) { - corner = new ArrayList(); - } - return this.corner; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *       <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *       <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Corner { - - @XmlAttribute(name = "CompoundMarkID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger compoundMarkID; - @XmlAttribute(name = "SeqID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger seqID; - @XmlAttribute(name = "Rounding", required = true) - protected String rounding; - @XmlAttribute(name = "ZoneSize", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger zoneSize; - - /** - * Gets the value of the compoundMarkID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getCompoundMarkID() { - return compoundMarkID; - } - - /** - * Sets the value of the compoundMarkID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setCompoundMarkID(BigInteger value) { - this.compoundMarkID = value; - } - - /** - * Gets the value of the seqID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getSeqID() { - return seqID; - } - - /** - * Sets the value of the seqID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setSeqID(BigInteger value) { - this.seqID = value; - } - - /** - * Gets the value of the rounding property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRounding() { - return rounding; - } - - /** - * Sets the value of the rounding property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRounding(String value) { - this.rounding = value; - } - - /** - * Gets the value of the zoneSize property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getZoneSize() { - return zoneSize; - } - - /** - * Sets the value of the zoneSize property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setZoneSize(BigInteger value) { - this.zoneSize = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CompoundMark" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="Mark" maxOccurs="unbounded">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *                 <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "compoundMark" - }) - public static class Course { - - @XmlElement(name = "CompoundMark", required = true) - protected List compoundMark; - - /** - * Gets the value of the compoundMark property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the compoundMark property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCompoundMark().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Course.CompoundMark } - * - * - */ - public List getCompoundMark() { - if (compoundMark == null) { - compoundMark = new ArrayList(); - } - return this.compoundMark; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="Mark" maxOccurs="unbounded">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *       <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "mark" - }) - public static class CompoundMark { - - @XmlElement(name = "Mark", required = true) - protected List mark; - @XmlAttribute(name = "CompoundMarkID", required = true) - protected String compoundMarkID; - @XmlAttribute(name = "Name", required = true) - protected String name; - - /** - * Gets the value of the mark property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the mark property. - * - *

- * For example, to add a new item, do as follows: - *

-             *    getMark().add(newItem);
-             * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Course.CompoundMark.Mark } - * - * - */ - public List getMark() { - if (mark == null) { - mark = new ArrayList(); - } - return this.mark; - } - - /** - * Gets the value of the compoundMarkID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCompoundMarkID() { - return compoundMarkID; - } - - /** - * Sets the value of the compoundMarkID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCompoundMarkID(String value) { - this.compoundMarkID = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Mark { - - @XmlAttribute(name = "SeqId") - protected String seqId; - @XmlAttribute(name = "Name", required = true) - protected String name; - @XmlAttribute(name = "TargetLat", required = true) - protected String targetLat; - @XmlAttribute(name = "TargetLng", required = true) - protected String targetLng; - @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; - - /** - * Gets the value of the seqId property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeqId() { - return seqId; - } - - /** - * Sets the value of the seqId property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeqId(String value) { - this.seqId = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the targetLat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetLat() { - return targetLat; - } - - /** - * Sets the value of the targetLat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetLat(String value) { - this.targetLat = value; - } - - /** - * Gets the value of the targetLng property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetLng() { - return targetLng; - } - - /** - * Sets the value of the targetLng property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetLng(String value) { - this.targetLng = value; - } - - /** - * Gets the value of the sourceID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceID() { - return sourceID; - } - - /** - * Sets the value of the sourceID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceID(String value) { - this.sourceID = value; - } - - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Limit" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "limit" - }) - public static class CourseLimit { - - @XmlElement(name = "Limit", required = true) - protected List limit; - - /** - * Gets the value of the limit property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the limit property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getLimit().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.CourseLimit.Limit } - * - * - */ - public List getLimit() { - if (limit == null) { - limit = new ArrayList(); - } - return this.limit; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Limit { - - @XmlAttribute(name = "Lat", required = true) - protected String lat; - @XmlAttribute(name = "Lon", required = true) - protected String lon; - @XmlAttribute(name = "SeqID", required = true) - protected String seqID; - - /** - * Gets the value of the lat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLat() { - return lat; - } - - /** - * Sets the value of the lat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLat(String value) { - this.lat = value; - } - - /** - * Gets the value of the lon property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLon() { - return lon; - } - - /** - * Sets the value of the lon property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLon(String value) { - this.lon = value; - } - - /** - * Gets the value of the seqID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeqID() { - return seqID; - } - - /** - * Sets the value of the seqID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeqID(String value) { - this.seqID = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Yacht" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "yacht" - }) - public static class Participants { - - @XmlElement(name = "Yacht", required = true) - protected List yacht; - - /** - * Gets the value of the yacht property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the yacht property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getYacht().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Participants.Yacht } - * - * - */ - public List getYacht() { - if (yacht == null) { - yacht = new ArrayList(); - } - return this.yacht; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Yacht { - - @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; - @XmlAttribute(name = "Entry") - protected String entry; - - /** - * Gets the value of the sourceID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceID() { - return sourceID; - } - - /** - * Sets the value of the sourceID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceID(String value) { - this.sourceID = value; - } - - /** - * Gets the value of the entry property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEntry() { - return entry; - } - - /** - * Sets the value of the entry property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEntry(String value) { - this.entry = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Postpone" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Time" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class RaceStartTime { - - @XmlAttribute(name = "Postpone", required = true) - protected String postpone; - @XmlAttribute(name = "Time", required = true) - protected String time; - - /** - * Gets the value of the postpone property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostpone() { - return postpone; - } - - /** - * Sets the value of the postpone property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostpone(String value) { - this.postpone = value; - } - - /** - * Gets the value of the time property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTime() { - return time; - } - - /** - * Sets the value of the time property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTime(String value) { - this.time = value; - } - - } - -} \ No newline at end of file diff --git a/racevisionGame/src/main/java/mock/xml/RaceFactory.java b/racevisionGame/src/main/java/mock/xml/RaceFactory.java deleted file mode 100644 index 24223f74..00000000 --- a/racevisionGame/src/main/java/mock/xml/RaceFactory.java +++ /dev/null @@ -1,127 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 10:39:29 PM NZST -// - - -package mock.xml; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the scd package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class RaceFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: scd - * - */ - public RaceFactory() { - } - - /** - * Create an instance of {@link Race } - * - */ - public Race createRace() { - return new Race(); - } - - /** - * Create an instance of {@link Race.CourseLimit } - * - */ - public Race.CourseLimit createRaceCourseLimit() { - return new Race.CourseLimit(); - } - - /** - * Create an instance of {@link Race.Course } - * - */ - public Race.Course createRaceCourse() { - return new Race.Course(); - } - - /** - * Create an instance of {@link Race.Course.CompoundMark } - * - */ - public Race.Course.CompoundMark createRaceCourseCompoundMark() { - return new Race.Course.CompoundMark(); - } - - /** - * Create an instance of {@link Race.CompoundMarkSequence } - * - */ - public Race.CompoundMarkSequence createRaceCompoundMarkSequence() { - return new Race.CompoundMarkSequence(); - } - - /** - * Create an instance of {@link Race.Participants } - * - */ - public Race.Participants createRaceParticipants() { - return new Race.Participants(); - } - - /** - * Create an instance of {@link Race.RaceStartTime } - * - */ - public Race.RaceStartTime createRaceRaceStartTime() { - return new Race.RaceStartTime(); - } - - /** - * Create an instance of {@link Race.CourseLimit.Limit } - * - */ - public Race.CourseLimit.Limit createRaceCourseLimitLimit() { - return new Race.CourseLimit.Limit(); - } - - /** - * Create an instance of {@link Race.Course.CompoundMark.Mark } - * - */ - public Race.Course.CompoundMark.Mark createRaceCourseCompoundMarkMark() { - return new Race.Course.CompoundMark.Mark(); - } - - /** - * Create an instance of {@link Race.CompoundMarkSequence.Corner } - * - */ - public Race.CompoundMarkSequence.Corner createRaceCompoundMarkSequenceCorner() { - return new Race.CompoundMarkSequence.Corner(); - } - - /** - * Create an instance of {@link Race.Participants.Yacht } - * - */ - public Race.Participants.Yacht createRaceParticipantsYacht() { - return new Race.Participants.Yacht(); - } - -} \ No newline at end of file diff --git a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java index 155f3644..4daf3cce 100644 --- a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java +++ b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java @@ -6,10 +6,8 @@ import shared.dataInput.RaceXMLReader; import shared.enums.XMLFileType; import shared.exceptions.InvalidRaceDataException; import shared.exceptions.XMLReaderException; -import shared.model.CompoundMark; -import shared.model.Corner; -import shared.model.GPSCoordinate; -import shared.model.Mark; +import shared.model.*; +import shared.xml.Race.*; import shared.xml.XMLUtilities; import javax.xml.XMLConstants; @@ -29,98 +27,16 @@ import javax.xml.validation.Validator; import java.io.File; import java.io.IOException; import java.io.StringWriter; +import java.math.BigInteger; import java.net.URL; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; /** * Helper Class for creating a Race XML */ public class RaceXMLCreator { - /** - * Copy the race to a mock.xml.Race class from a RaceXMlReader - * @param reader RaceXMlReader - * @return string of the new mock.xml.Race - * @throws InvalidRaceDataException If the reader is unable to be read - * @throws XMLReaderException If the reader is unable to be read - */ - public static Race copyRace(RaceXMLReader reader) throws InvalidRaceDataException, XMLReaderException { - RaceFactory raceFactory = new RaceFactory(); - Race race = raceFactory.createRace(); - race.setRaceID(String.valueOf(reader.getRaceId())); - race.setRaceType(String.valueOf(reader.getRaceType())); - race.setCreationTimeDate("CREATION_TIME");//this needs to be changed later - - //Race Start Time - Race.RaceStartTime raceStartTime = raceFactory.createRaceRaceStartTime(); - raceStartTime.setPostpone("false"); - raceStartTime.setTime("START_TIME");//this needs to be changed later - race.setRaceStartTime(raceStartTime); - - //Participants - Race.Participants participants = raceFactory.createRaceParticipants(); - for (int i :reader.getParticipants()) { - Race.Participants.Yacht yacht = raceFactory.createRaceParticipantsYacht(); - yacht.setSourceID(String.valueOf(i)); - participants.getYacht().add(yacht); //java schema does not clone the array so this is "safe". - } - race.setParticipants(participants); - - //compound marks sequence - Race.CompoundMarkSequence cms = raceFactory.createRaceCompoundMarkSequence(); - for (Corner mark: reader.getCornersList()){ - Race.CompoundMarkSequence.Corner corner = raceFactory.createRaceCompoundMarkSequenceCorner(); - corner.setCompoundMarkID(String.valueOf(mark.getId())); - corner.setSeqID(String.valueOf(mark.getSeqID())); - cms.getCorner().add(corner); - } - race.setCompoundMarkSequence(cms); - - //Course - Race.Course course = raceFactory.createRaceCourse(); - for (CompoundMark mark: reader.getCompoundMarks()){ - Race.Course.CompoundMark cm = raceFactory.createRaceCourseCompoundMark(); - cm.setName(mark.getName()); - cm.setCompoundMarkID(String.valueOf(mark.getId())); - cm.getMark().add(setMarkFromMark(raceFactory, mark.getMark1())); - Race.Course.CompoundMark.Mark m2 = setMarkFromMark(raceFactory, mark.getMark2()); - if (m2 != null) { - cm.getMark().add(m2); - } - course.getCompoundMark().add(cm); - } - race.setCourse(course); - - //Course Limit - Race.CourseLimit courseLimit = raceFactory.createRaceCourseLimit(); - for (int i = 0; i < reader.getBoundary().size(); i++){ - Race.CourseLimit.Limit limit = raceFactory.createRaceCourseLimitLimit(); - limit.setSeqID(String.valueOf(i+1)); - limit.setLat(String.valueOf(reader.getBoundary().get(i).getLatitude())); - limit.setLon(String.valueOf(reader.getBoundary().get(i).getLongitude())); - courseLimit.getLimit().add(limit); - } - race.setCourseLimit(courseLimit); - - return race; - } - - /** - * Sets a mock.xml.Mark from a shared.model.Mark - * @param raceFactory race Factory for creating mock.xml.Race classes and subclasses - * @param mark Mark to be converted. - * @return converted mock.xml.Mark. - */ - public static Race.Course.CompoundMark.Mark setMarkFromMark(RaceFactory raceFactory, Mark mark){ - if (mark != null) { - Race.Course.CompoundMark.Mark m = raceFactory.createRaceCourseCompoundMarkMark(); - m.setName(mark.getName()); - m.setTargetLat(String.valueOf(mark.getPosition().getLatitude())); - m.setTargetLng(String.valueOf(mark.getPosition().getLongitude())); - m.setSourceID(String.valueOf(mark.getSourceID())); - return m; - } - return null; - } /** * get the windward gate in a race @@ -158,9 +74,11 @@ 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); - Race race = (Race) XMLUtilities.xmlToClass(new File(RaceXMLCreator.class.getClassLoader().getResource(s).getFile()), + XMLRace race = (XMLRace) XMLUtilities.xmlToClass(new File(RaceXMLCreator.class.getClassLoader().getResource(s).getFile()), RaceXMLCreator.class.getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd"), - Race.class); + XMLRace.class); + + setRaceXMLAtCurrentTimeToNow(race); double raceOriginalBearing = getLineAngle(getLeewardGate(reader).getMark1Position(), getWindwardGate(reader).getMark1Position()); @@ -168,7 +86,7 @@ public class RaceXMLCreator { alterRaceRotation(race, degreesToRotate); - JAXBContext context = JAXBContext.newInstance(Race.class); + JAXBContext context = JAXBContext.newInstance(XMLRace.class); Marshaller jaxbMarshaller = context.createMarshaller(); jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); @@ -183,20 +101,20 @@ public class RaceXMLCreator { * @param race the race to alter * @param degrees the degrees to rotate by. */ - public static void alterRaceRotation(Race race, double degrees){ + public static void alterRaceRotation(XMLRace race, double degrees){ GPSCoordinate center = getCenter(race); - for(Race.CourseLimit.Limit limit: race.getCourseLimit().getLimit()){ + for(XMLLimit limit: race.getCourseLimit().getLimit()){ GPSCoordinate rotatedLim = rotate(center, limitToGPSCoordinate(limit), degrees); - limit.setLat(String.valueOf(rotatedLim.getLatitude())); - limit.setLon(String.valueOf(rotatedLim.getLongitude())); + limit.setLat(rotatedLim.getLatitude()); + limit.setLon(rotatedLim.getLongitude()); } - for(Race.Course.CompoundMark compoundMark: race.getCourse().getCompoundMark()){ - for (Race.Course.CompoundMark.Mark mark: compoundMark.getMark()){ + for(XMLCompoundMark compoundMark: race.getCourse().getCompoundMark()){ + for (XMLMark mark: compoundMark.getMark()){ System.out.println(mark); GPSCoordinate rotatedMark = rotate(center, markToGPSCoordinate(mark), degrees); - mark.setTargetLat(String.valueOf(rotatedMark.getLatitude())); - mark.setTargetLng(String.valueOf(rotatedMark.getLongitude())); + mark.setTargetLat(rotatedMark.getLatitude()); + mark.setTargetLng(rotatedMark.getLongitude()); } } } @@ -206,8 +124,8 @@ public class RaceXMLCreator { * @param limit limit to convert * @return gps coordinate corresponding to the limit */ - public static GPSCoordinate limitToGPSCoordinate(Race.CourseLimit.Limit limit){ - return new GPSCoordinate(Double.parseDouble(limit.getLat()), Double.parseDouble(limit.getLon())); + public static GPSCoordinate limitToGPSCoordinate(XMLLimit limit){ + return new GPSCoordinate(limit.getLat(), limit.getLon()); } /** @@ -232,8 +150,8 @@ public class RaceXMLCreator { * @param mark mark to obtain the GPSCoordinates of * @return the GPSCOordinatess of a mark */ - public static GPSCoordinate markToGPSCoordinate(Race.Course.CompoundMark.Mark mark){ - return new GPSCoordinate(Double.parseDouble(mark.getTargetLat()), Double.parseDouble(mark.getTargetLng())); + public static GPSCoordinate markToGPSCoordinate(XMLMark mark){ + return new GPSCoordinate(mark.getTargetLat(), mark.getTargetLng()); } /** @@ -241,12 +159,12 @@ public class RaceXMLCreator { * @param race race to get the center of * @return GPSCoordinates of the center */ - public static GPSCoordinate getCenter(Race race){ + public static GPSCoordinate getCenter(XMLRace race){ double avgLat = 0; double avgLng = 0; - for (Race.CourseLimit.Limit limit: race.getCourseLimit().getLimit()){ - avgLat += Double.parseDouble(limit.getLat()); - avgLng += Double.parseDouble(limit.getLon()); + for (XMLLimit limit: race.getCourseLimit().getLimit()){ + avgLat += limit.getLat(); + avgLng += limit.getLon(); } avgLat = avgLat/race.getCourseLimit().getLimit().size(); avgLng = avgLng/race.getCourseLimit().getLimit().size(); @@ -265,4 +183,24 @@ public class RaceXMLCreator { return Math.atan2(dy, dx)/Math.PI * 180; } + + /** + * Sets the xml description of the race to show the race was created now, and starts in 4 minutes + * @param raceXML The race.xml contents. + * @return String containing edited xml + */ + public static void setRaceXMLAtCurrentTimeToNow(XMLRace raceXML) { + + //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute. + long millisecondsToAdd = Constants.RacePreStartTime + (1 * 60 * 1000); + long secondsToAdd = millisecondsToAdd / 1000; + //Scale the time using our time scalar. + secondsToAdd = secondsToAdd / Constants.RaceTimeScale; + + DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ"); + ZonedDateTime creationTime = ZonedDateTime.now(); + raceXML.setCreationTimeDate(dateFormat.format(creationTime)); + raceXML.getRaceStartTime().setTime(dateFormat.format(creationTime.plusSeconds(secondsToAdd))); + } + } diff --git a/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java b/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java index 361fefd4..bf00d4ec 100644 --- a/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java +++ b/racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java @@ -337,7 +337,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { int cornerSeq = Integer.parseInt(getAttribute(cornerElement, "SeqID")); - cornersList.add(new Corner(cornerID, cornerSeq)); + cornersList.add(new Corner(cornerID, cornerSeq, "SP", 3)); //Gets the CompoundMark associated with this corner. CompoundMark lastCompoundMark = this.compoundMarkMap.get(cornerID); @@ -356,7 +356,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { cornerSeq = Integer.parseInt(getAttribute(cornerElement, "SeqID")); - cornersList.add(new Corner(cornerID, cornerSeq)); + cornersList.add(new Corner(cornerID, cornerSeq, "Port", 3)); //Gets the CompoundMark associated with this corner. CompoundMark currentCompoundMark = this.compoundMarkMap.get(cornerID); diff --git a/racevisionGame/src/main/java/shared/model/CompoundMark.java b/racevisionGame/src/main/java/shared/model/CompoundMark.java index b9f45753..f56330e3 100644 --- a/racevisionGame/src/main/java/shared/model/CompoundMark.java +++ b/racevisionGame/src/main/java/shared/model/CompoundMark.java @@ -1,10 +1,12 @@ package shared.model; +import shared.xml.Race.XMLCompoundMark; + /** * Represents a compound mark - that is, either one or two individual marks which form a single compound mark. */ -public class CompoundMark { +public class CompoundMark extends XMLCompoundMark{ /** * The ID of the compound mark. @@ -39,11 +41,7 @@ public class CompoundMark { * @param mark1 The individual mark that comprises this compound mark. */ public CompoundMark(int id, String name, Mark mark1) { - this.id = id; - this.name = name; - this.mark1 = mark1; - this.averageGPSCoordinate = calculateAverage(); - + this(id, name, mark1, null); } @@ -55,6 +53,13 @@ public class CompoundMark { * @param mark2 The second individual mark that comprises this compound mark. */ public CompoundMark(int id, String name, Mark mark1, Mark mark2) { + //parent set up + super(); + setName(name); + setCompoundMarkID(id); + getMark().add(mark1); + if (mark2 != null) getMark().add(mark2); + this.id = id; this.name = name; this.mark1 = mark1; @@ -72,14 +77,6 @@ public class CompoundMark { return id; } - /** - * Returns the name of this compound mark - * @return The name of this compound mark. - */ - public String getName() { - return name; - } - /** * Returns the first mark of the compound mark. * @return The first mark of the compound mark. diff --git a/racevisionGame/src/main/java/shared/model/Corner.java b/racevisionGame/src/main/java/shared/model/Corner.java index 9956b40e..a8f72b82 100644 --- a/racevisionGame/src/main/java/shared/model/Corner.java +++ b/racevisionGame/src/main/java/shared/model/Corner.java @@ -1,23 +1,25 @@ package shared.model; +import shared.xml.Race.XMLCorner; + /** * Created by Gondr on 3/08/2017. */ -public class Corner { +public class Corner extends XMLCorner{ private int id; - private int seqID; - public Corner(int id, int seqID){ + public Corner(int id, int seqID, String rounding, int zoneSize){ + super(); + setCompoundMarkID(id); + setSeqID(seqID); + setRounding(rounding); + setZoneSize(zoneSize); + this.id = id; - this.seqID = seqID; } public int getId() { return id; } - - public int getSeqID() { - return seqID; - } } diff --git a/racevisionGame/src/main/java/shared/model/Mark.java b/racevisionGame/src/main/java/shared/model/Mark.java index 5781861a..522388cd 100644 --- a/racevisionGame/src/main/java/shared/model/Mark.java +++ b/racevisionGame/src/main/java/shared/model/Mark.java @@ -1,28 +1,21 @@ package shared.model; +import shared.xml.Race.XMLMark; + +import java.math.BigDecimal; +import java.math.BigInteger; + /** * Represents an individual mark. * Has a source ID, name, and position. */ -public class Mark { - - /** - * The source ID of the mark. - */ - private int sourceID; - - /** - * The name of the mark. - */ - private String name; +public class Mark extends XMLMark{ /** * The position of the mark. */ private GPSCoordinate position; - - /** * Constructs a mark with a given source ID, name, and position. * @param sourceID The source ID of the mark. @@ -30,8 +23,12 @@ public class Mark { * @param position The position of the mark. */ public Mark(int sourceID, String name, GPSCoordinate position) { - this.sourceID = sourceID; - this.name = name; + super(); + targetLat = position.getLatitude(); + targetLng = position.getLongitude(); + setSourceID(sourceID); + setName(name); + this.position = position; } @@ -44,14 +41,6 @@ public class Mark { return name; } - /** - * Returns the source ID of the mark. - * @return The source ID of the mark. - */ - public int getSourceID() { - return sourceID; - } - /** * Returns the position of the mark. * @return The position of the mark. diff --git a/racevisionGame/src/main/java/shared/model/Race.java b/racevisionGame/src/main/java/shared/model/Race.java index 6f428ad0..415e9f77 100644 --- a/racevisionGame/src/main/java/shared/model/Race.java +++ b/racevisionGame/src/main/java/shared/model/Race.java @@ -23,7 +23,7 @@ public abstract class Race implements Runnable { /** * The source of race related data. */ - protected mock.xml.Race raceDataSource; + protected RaceDataSource raceDataSource; /** * The source of boat related data. @@ -134,7 +134,7 @@ public abstract class Race implements Runnable { * @param regattaDataSource Data source for race related data (course name, location, timezone, etc...). * @param latestMessages The collection of latest messages, which can be written to, or read from. */ - public Race(BoatDataSource boatDataSource, mock.xml.Race raceDataSource, RegattaDataSource regattaDataSource, LatestMessages latestMessages) { + public Race(BoatDataSource boatDataSource, RaceDataSource raceDataSource, RegattaDataSource regattaDataSource, LatestMessages latestMessages) { //Keep a reference to data sources. this.raceDataSource = raceDataSource; diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/CompoundMark.java b/racevisionGame/src/main/java/shared/xml/Race/XMLCompoundMark.java similarity index 82% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/CompoundMark.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLCompoundMark.java index 965d79b6..41d5a70d 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/CompoundMark.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLCompoundMark.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import java.util.ArrayList; import java.util.List; @@ -31,17 +31,17 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> @@ -54,12 +54,12 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "", propOrder = { "mark" }) -public class CompoundMark { +public class XMLCompoundMark { @XmlElement(name = "Mark", required = true) - protected List mark; + protected List mark; @XmlAttribute(name = "CompoundMarkID", required = true) - protected String compoundMarkID; + protected int compoundMarkID; @XmlAttribute(name = "Name", required = true) protected String name; @@ -81,13 +81,13 @@ public class CompoundMark { * *

* Objects of the following type(s) are allowed in the list - * {@link Mark } + * {@link XMLMark } * * */ - public List getMark() { + public List getMark() { if (mark == null) { - mark = new ArrayList(); + mark = new ArrayList(); } return this.mark; } @@ -95,24 +95,16 @@ public class CompoundMark { /** * Gets the value of the compoundMarkID property. * - * @return - * possible object is - * {@link String } - * */ - public String getCompoundMarkID() { + public int getCompoundMarkID() { return compoundMarkID; } /** * Sets the value of the compoundMarkID property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setCompoundMarkID(String value) { + public void setCompoundMarkID(int value) { this.compoundMarkID = value; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/CompoundMarkSequence.java b/racevisionGame/src/main/java/shared/xml/Race/XMLCompoundMarkSequence.java similarity index 85% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/CompoundMarkSequence.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLCompoundMarkSequence.java index 6a4edc52..be92b837 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/CompoundMarkSequence.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLCompoundMarkSequence.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import java.util.ArrayList; import java.util.List; @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /> - * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /> + * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> + * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /> + * <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> @@ -50,10 +50,10 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "", propOrder = { "corner" }) -public class CompoundMarkSequence { +public class XMLCompoundMarkSequence { @XmlElement(name = "Corner", required = true) - protected List corner; + protected List corner; /** * Gets the value of the corner property. @@ -73,13 +73,13 @@ public class CompoundMarkSequence { * *

* Objects of the following type(s) are allowed in the list - * {@link Corner } + * {@link XMLCorner } * * */ - public List getCorner() { + public List getCorner() { if (corner == null) { - corner = new ArrayList(); + corner = new ArrayList(); } return this.corner; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Corner.java b/racevisionGame/src/main/java/shared/xml/Race/XMLCorner.java similarity index 65% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Corner.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLCorner.java index 467e9ae6..780ea352 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Corner.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLCorner.java @@ -2,17 +2,15 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; -import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; @@ -25,10 +23,10 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /> - * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /> + * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> + * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /> + * <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> @@ -38,65 +36,46 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -public class Corner { +public class XMLCorner { @XmlAttribute(name = "CompoundMarkID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger compoundMarkID; + protected int compoundMarkID; @XmlAttribute(name = "SeqID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger seqID; + protected int seqID; @XmlAttribute(name = "Rounding", required = true) protected String rounding; @XmlAttribute(name = "ZoneSize", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger zoneSize; + protected int zoneSize; /** * Gets the value of the compoundMarkID property. * - * @return - * possible object is - * {@link BigInteger } - * */ - public BigInteger getCompoundMarkID() { + public int getCompoundMarkID() { return compoundMarkID; } /** * Sets the value of the compoundMarkID property. * - * @param value - * allowed object is - * {@link BigInteger } - * */ - public void setCompoundMarkID(BigInteger value) { + public void setCompoundMarkID(int value) { this.compoundMarkID = value; } /** * Gets the value of the seqID property. * - * @return - * possible object is - * {@link BigInteger } - * */ - public BigInteger getSeqID() { + public int getSeqID() { return seqID; } /** * Sets the value of the seqID property. * - * @param value - * allowed object is - * {@link BigInteger } - * */ - public void setSeqID(BigInteger value) { + public void setSeqID(int value) { this.seqID = value; } @@ -127,24 +106,16 @@ public class Corner { /** * Gets the value of the zoneSize property. * - * @return - * possible object is - * {@link BigInteger } - * */ - public BigInteger getZoneSize() { + public int getZoneSize() { return zoneSize; } /** * Sets the value of the zoneSize property. * - * @param value - * allowed object is - * {@link BigInteger } - * */ - public void setZoneSize(BigInteger value) { + public void setZoneSize(int value) { this.zoneSize = value; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Course.java b/racevisionGame/src/main/java/shared/xml/Race/XMLCourse.java similarity index 84% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Course.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLCourse.java index 5c135655..be527f7a 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Course.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLCourse.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import java.util.ArrayList; import java.util.List; @@ -35,17 +35,17 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> * </element> * </sequence> - * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> @@ -63,10 +63,10 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "", propOrder = { "compoundMark" }) -public class Course { +public class XMLCourse { @XmlElement(name = "CompoundMark", required = true) - protected List compoundMark; + protected List compoundMark; /** * Gets the value of the compoundMark property. @@ -86,13 +86,13 @@ public class Course { * *

* Objects of the following type(s) are allowed in the list - * {@link CompoundMark } + * {@link XMLCompoundMark } * * */ - public List getCompoundMark() { + public List getCompoundMark() { if (compoundMark == null) { - compoundMark = new ArrayList(); + compoundMark = new ArrayList(); } return this.compoundMark; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/CourseLimit.java b/racevisionGame/src/main/java/shared/xml/Race/XMLCourseLimit.java similarity index 85% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/CourseLimit.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLCourseLimit.java index 2b9c39c8..b4a55197 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/CourseLimit.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLCourseLimit.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import java.util.ArrayList; import java.util.List; @@ -30,9 +30,9 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> @@ -49,10 +49,10 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "", propOrder = { "limit" }) -public class CourseLimit { +public class XMLCourseLimit { @XmlElement(name = "Limit", required = true) - protected List limit; + protected List limit; /** * Gets the value of the limit property. @@ -72,13 +72,13 @@ public class CourseLimit { * *

* Objects of the following type(s) are allowed in the list - * {@link Limit } + * {@link XMLLimit } * * */ - public List getLimit() { + public List getLimit() { if (limit == null) { - limit = new ArrayList(); + limit = new ArrayList(); } return this.limit; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Limit.java b/racevisionGame/src/main/java/shared/xml/Race/XMLLimit.java similarity index 64% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Limit.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLLimit.java index 8abda089..421f206c 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Limit.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLLimit.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> @@ -35,84 +35,60 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -public class Limit { +public class XMLLimit { @XmlAttribute(name = "Lat", required = true) - protected String lat; + protected double lat; @XmlAttribute(name = "Lon", required = true) - protected String lon; + protected double lon; @XmlAttribute(name = "SeqID", required = true) - protected String seqID; + protected int seqID; /** * Gets the value of the lat property. * - * @return - * possible object is - * {@link String } - * */ - public String getLat() { + public double getLat() { return lat; } /** * Sets the value of the lat property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setLat(String value) { + public void setLat(double value) { this.lat = value; } /** * Gets the value of the lon property. * - * @return - * possible object is - * {@link String } - * */ - public String getLon() { + public double getLon() { return lon; } /** * Sets the value of the lon property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setLon(String value) { + public void setLon(double value) { this.lon = value; } /** * Gets the value of the seqID property. * - * @return - * possible object is - * {@link String } - * */ - public String getSeqID() { + public int getSeqID() { return seqID; } /** * Sets the value of the seqID property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setSeqID(String value) { + public void setSeqID(int value) { this.seqID = value; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Mark.java b/racevisionGame/src/main/java/shared/xml/Race/XMLMark.java similarity index 70% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Mark.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLMark.java index ef4d4e1e..299b03ab 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Mark.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLMark.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -23,11 +23,11 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> + * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * </restriction> * </complexContent> * </complexType> @@ -37,28 +37,28 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -public class Mark { +public class XMLMark { @XmlAttribute(name = "SeqId") - protected String seqId; + protected Integer seqId; @XmlAttribute(name = "Name", required = true) protected String name; @XmlAttribute(name = "TargetLat", required = true) - protected String targetLat; + protected double targetLat; @XmlAttribute(name = "TargetLng", required = true) - protected String targetLng; + protected double targetLng; @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; + protected int sourceID; /** * Gets the value of the seqId property. * * @return * possible object is - * {@link String } + * {@link Integer } * */ - public String getSeqId() { + public Integer getSeqId() { return seqId; } @@ -67,10 +67,10 @@ public class Mark { * * @param value * allowed object is - * {@link String } + * {@link Integer } * */ - public void setSeqId(String value) { + public void setSeqId(Integer value) { this.seqId = value; } @@ -101,72 +101,48 @@ public class Mark { /** * Gets the value of the targetLat property. * - * @return - * possible object is - * {@link String } - * */ - public String getTargetLat() { + public double getTargetLat() { return targetLat; } /** * Sets the value of the targetLat property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setTargetLat(String value) { + public void setTargetLat(double value) { this.targetLat = value; } /** * Gets the value of the targetLng property. * - * @return - * possible object is - * {@link String } - * */ - public String getTargetLng() { + public double getTargetLng() { return targetLng; } /** * Sets the value of the targetLng property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setTargetLng(String value) { + public void setTargetLng(double value) { this.targetLng = value; } /** * Gets the value of the sourceID property. * - * @return - * possible object is - * {@link String } - * */ - public String getSourceID() { + public int getSourceID() { return sourceID; } /** * Sets the value of the sourceID property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setSourceID(String value) { + public void setSourceID(int value) { this.sourceID = value; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Participants.java b/racevisionGame/src/main/java/shared/xml/Race/XMLParticipants.java similarity index 88% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Participants.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLParticipants.java index b2dcb7d6..b23586a6 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Participants.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLParticipants.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> @@ -48,10 +48,10 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "", propOrder = { "yacht" }) -public class Participants { +public class XMLParticipants { @XmlElement(name = "Yacht", required = true) - protected List yacht; + protected List yacht; /** * Gets the value of the yacht property. @@ -71,13 +71,13 @@ public class Participants { * *

* Objects of the following type(s) are allowed in the list - * {@link Yacht } + * {@link XMLYacht } * * */ - public List getYacht() { + public List getYacht() { if (yacht == null) { - yacht = new ArrayList(); + yacht = new ArrayList(); } return this.yacht; } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Race.java b/racevisionGame/src/main/java/shared/xml/Race/XMLRace.java similarity index 77% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Race.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLRace.java index 1ae28e9d..b5fa4a3f 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Race.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLRace.java @@ -2,32 +2,30 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 03:20:03 AM NZST // -package schema; +package shared.xml.Race; -import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; /** *

Java class for anonymous complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * *

  * <complexType>
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="RaceID" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *         <element name="RaceID" type="{http://www.w3.org/2001/XMLSchema}int"/>
  *         <element name="RaceType" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="CreationTimeDate" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="RaceStartTime">
@@ -49,7 +47,7 @@ import javax.xml.bind.annotation.XmlType;
  *                     <complexType>
  *                       <complexContent>
  *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                           <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                         </restriction>
  *                       </complexContent>
@@ -69,10 +67,10 @@ import javax.xml.bind.annotation.XmlType;
  *                     <complexType>
  *                       <complexContent>
  *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                           <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *                           <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                         </restriction>
  *                       </complexContent>
  *                     </complexType>
@@ -96,17 +94,17 @@ import javax.xml.bind.annotation.XmlType;
  *                               <complexType>
  *                                 <complexContent>
  *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                     <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                                     <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                     <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                                   </restriction>
  *                                 </complexContent>
  *                               </complexType>
  *                             </element>
  *                           </sequence>
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                         </restriction>
  *                       </complexContent>
@@ -126,9 +124,9 @@ import javax.xml.bind.annotation.XmlType;
  *                     <complexType>
  *                       <complexContent>
  *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                         </restriction>
  *                       </complexContent>
  *                     </complexType>
@@ -143,72 +141,63 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * 
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "raceID", - "raceType", - "creationTimeDate", - "raceStartTime", - "participants", - "compoundMarkSequence", - "course", - "courseLimit" + "raceID", + "raceType", + "creationTimeDate", + "raceStartTime", + "participants", + "compoundMarkSequence", + "course", + "courseLimit" }) @XmlRootElement(name = "Race") -public class Race { +public class XMLRace { - @XmlElement(name = "RaceID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger raceID; + @XmlElement(name = "RaceID") + protected int raceID; @XmlElement(name = "RaceType", required = true) protected String raceType; @XmlElement(name = "CreationTimeDate", required = true) protected String creationTimeDate; @XmlElement(name = "RaceStartTime", required = true) - protected RaceStartTime raceStartTime; + protected XMLRaceStartTime raceStartTime; @XmlElement(name = "Participants", required = true) - protected Participants participants; + protected XMLParticipants participants; @XmlElement(name = "CompoundMarkSequence", required = true) - protected CompoundMarkSequence compoundMarkSequence; + protected XMLCompoundMarkSequence compoundMarkSequence; @XmlElement(name = "Course", required = true) - protected Course course; + protected XMLCourse course; @XmlElement(name = "CourseLimit", required = true) - protected CourseLimit courseLimit; + protected XMLCourseLimit courseLimit; /** * Gets the value of the raceID property. - * - * @return - * possible object is - * {@link BigInteger } - * + * */ - public BigInteger getRaceID() { + public int getRaceID() { return raceID; } /** * Sets the value of the raceID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * + * */ - public void setRaceID(BigInteger value) { + public void setRaceID(int value) { this.raceID = value; } /** * Gets the value of the raceType property. - * + * * @return * possible object is * {@link String } - * + * */ public String getRaceType() { return raceType; @@ -216,11 +205,11 @@ public class Race { /** * Sets the value of the raceType property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setRaceType(String value) { this.raceType = value; @@ -228,11 +217,11 @@ public class Race { /** * Gets the value of the creationTimeDate property. - * + * * @return * possible object is * {@link String } - * + * */ public String getCreationTimeDate() { return creationTimeDate; @@ -240,11 +229,11 @@ public class Race { /** * Sets the value of the creationTimeDate property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setCreationTimeDate(String value) { this.creationTimeDate = value; @@ -252,121 +241,121 @@ public class Race { /** * Gets the value of the raceStartTime property. - * + * * @return * possible object is - * {@link RaceStartTime } - * + * {@link XMLRaceStartTime } + * */ - public RaceStartTime getRaceStartTime() { + public XMLRaceStartTime getRaceStartTime() { return raceStartTime; } /** * Sets the value of the raceStartTime property. - * + * * @param value * allowed object is - * {@link RaceStartTime } - * + * {@link XMLRaceStartTime } + * */ - public void setRaceStartTime(RaceStartTime value) { + public void setRaceStartTime(XMLRaceStartTime value) { this.raceStartTime = value; } /** * Gets the value of the participants property. - * + * * @return * possible object is - * {@link Participants } - * + * {@link XMLParticipants } + * */ - public Participants getParticipants() { + public XMLParticipants getParticipants() { return participants; } /** * Sets the value of the participants property. - * + * * @param value * allowed object is - * {@link Participants } - * + * {@link XMLParticipants } + * */ - public void setParticipants(Participants value) { + public void setParticipants(XMLParticipants value) { this.participants = value; } /** * Gets the value of the compoundMarkSequence property. - * + * * @return * possible object is - * {@link CompoundMarkSequence } - * + * {@link XMLCompoundMarkSequence } + * */ - public CompoundMarkSequence getCompoundMarkSequence() { + public XMLCompoundMarkSequence getCompoundMarkSequence() { return compoundMarkSequence; } /** * Sets the value of the compoundMarkSequence property. - * + * * @param value * allowed object is - * {@link CompoundMarkSequence } - * + * {@link XMLCompoundMarkSequence } + * */ - public void setCompoundMarkSequence(CompoundMarkSequence value) { + public void setCompoundMarkSequence(XMLCompoundMarkSequence value) { this.compoundMarkSequence = value; } /** * Gets the value of the course property. - * + * * @return * possible object is - * {@link Course } - * + * {@link XMLCourse } + * */ - public Course getCourse() { + public XMLCourse getCourse() { return course; } /** * Sets the value of the course property. - * + * * @param value * allowed object is - * {@link Course } - * + * {@link XMLCourse } + * */ - public void setCourse(Course value) { + public void setCourse(XMLCourse value) { this.course = value; } /** * Gets the value of the courseLimit property. - * + * * @return * possible object is - * {@link CourseLimit } - * + * {@link XMLCourseLimit } + * */ - public CourseLimit getCourseLimit() { + public XMLCourseLimit getCourseLimit() { return courseLimit; } /** * Sets the value of the courseLimit property. - * + * * @param value * allowed object is - * {@link CourseLimit } - * + * {@link XMLCourseLimit } + * */ - public void setCourseLimit(CourseLimit value) { + public void setCourseLimit(XMLCourseLimit value) { this.courseLimit = value; } diff --git a/racevisionGame/src/main/java/shared/xml/Race/XMLRaceFactory.java b/racevisionGame/src/main/java/shared/xml/Race/XMLRaceFactory.java new file mode 100644 index 00000000..385f7fae --- /dev/null +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLRaceFactory.java @@ -0,0 +1,127 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2017.08.14 at 02:41:51 AM NZST +// + + +package shared.xml.Race; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the shared.xml.Race package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class XMLRaceFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: shared.xml.Race + * + */ + public XMLRaceFactory() { + } + + /** + * Create an instance of {@link XMLRace } + * + */ + public XMLRace createRace() { + return new XMLRace(); + } + + /** + * Create an instance of {@link XMLRaceStartTime } + * + */ + public XMLRaceStartTime createXMLRaceStartTime() { + return new XMLRaceStartTime(); + } + + /** + * Create an instance of {@link XMLParticipants } + * + */ + public XMLParticipants createXMLParticipants() { + return new XMLParticipants(); + } + + /** + * Create an instance of {@link XMLCompoundMarkSequence } + * + */ + public XMLCompoundMarkSequence createXMLCompoundMarkSequence() { + return new XMLCompoundMarkSequence(); + } + + /** + * Create an instance of {@link XMLCourse } + * + */ + public XMLCourse createXMLCourse() { + return new XMLCourse(); + } + + /** + * Create an instance of {@link XMLCourseLimit } + * + */ + public XMLCourseLimit createXMLCourseLimit() { + return new XMLCourseLimit(); + } + + /** + * Create an instance of {@link XMLLimit } + * + */ + public XMLLimit createXMLLimit() { + return new XMLLimit(); + } + + /** + * Create an instance of {@link XMLCompoundMark } + * + */ + public XMLCompoundMark createXMLCompoundMark() { + return new XMLCompoundMark(); + } + + /** + * Create an instance of {@link XMLMark } + * + */ + public XMLMark createXMLMark() { + return new XMLMark(); + } + + /** + * Create an instance of {@link XMLCorner } + * + */ + public XMLCorner createXMLCorner() { + return new XMLCorner(); + } + + /** + * Create an instance of {@link XMLYacht } + * + */ + public XMLYacht createXMLYacht() { + return new XMLYacht(); + } + +} diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/RaceStartTime.java b/racevisionGame/src/main/java/shared/xml/Race/XMLRaceStartTime.java similarity index 95% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/RaceStartTime.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLRaceStartTime.java index e01f3b64..362d2590 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/RaceStartTime.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLRaceStartTime.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -public class RaceStartTime { +public class XMLRaceStartTime { @XmlAttribute(name = "Postpone", required = true) protected String postpone; diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Yacht.java b/racevisionGame/src/main/java/shared/xml/Race/XMLYacht.java similarity index 81% rename from racevisionGame/src/main/resources/mock/mockXML/schema/schema/Yacht.java rename to racevisionGame/src/main/java/shared/xml/Race/XMLYacht.java index 7f8ad761..1b2f0764 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/Yacht.java +++ b/racevisionGame/src/main/java/shared/xml/Race/XMLYacht.java @@ -2,11 +2,11 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST +// Generated on: 2017.08.14 at 02:54:32 AM NZST // -package schema; +package shared.xml.Race; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlType; * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> @@ -34,34 +34,26 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") -public class Yacht { +public class XMLYacht { @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; + protected int sourceID; @XmlAttribute(name = "Entry") protected String entry; /** * Gets the value of the sourceID property. * - * @return - * possible object is - * {@link String } - * */ - public String getSourceID() { + public int getSourceID() { return sourceID; } /** * Sets the value of the sourceID property. * - * @param value - * allowed object is - * {@link String } - * */ - public void setSourceID(String value) { + public void setSourceID(int value) { this.sourceID = value; } diff --git a/racevisionGame/src/main/java/shared/xml/XMLUtilities.java b/racevisionGame/src/main/java/shared/xml/XMLUtilities.java index 78ed493d..95332c28 100644 --- a/racevisionGame/src/main/java/shared/xml/XMLUtilities.java +++ b/racevisionGame/src/main/java/shared/xml/XMLUtilities.java @@ -3,6 +3,7 @@ package shared.xml; import mock.xml.Race; import mock.xml.RaceXMLCreator; import org.w3c.dom.Document; +import org.xml.sax.InputSource; import org.xml.sax.SAXException; import javax.xml.XMLConstants; @@ -17,6 +18,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.StringWriter; @@ -47,7 +49,7 @@ public class XMLUtilities { public static Object xmlToClass(String xml, URL schemaURL, Class c) throws ParserConfigurationException, IOException, SAXException, JAXBException { DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document document = parser.parse(xml); + Document document = parser.parse(new InputSource(new ByteArrayInputStream(xml.getBytes("utf-8")))); return xmlToClass(document, schemaURL, c); } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java b/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java index ae8c682c..b66a8c4b 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java @@ -6,12 +6,15 @@ import javafx.fxml.FXML; import javafx.scene.control.*; import javafx.scene.layout.AnchorPane; import mock.app.Event; +import org.xml.sax.SAXException; import shared.exceptions.InvalidBoatDataException; import shared.exceptions.InvalidRaceDataException; import shared.exceptions.InvalidRegattaDataException; import shared.exceptions.XMLReaderException; import visualiser.model.RaceConnection; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.soap.Text; import java.io.IOException; import java.net.Socket; @@ -170,6 +173,14 @@ public class ConnectionController extends Controller { e.printStackTrace(); } catch (UnknownHostException e) { e.printStackTrace(); + } catch (SAXException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } catch (JAXBException e) { + e.printStackTrace(); + } catch (ParserConfigurationException e) { + e.printStackTrace(); } } } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java index e87ea689..a4a20340 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java @@ -6,12 +6,15 @@ import javafx.scene.control.*; import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; import mock.app.Event; +import org.xml.sax.SAXException; import shared.exceptions.InvalidBoatDataException; import shared.exceptions.InvalidRaceDataException; import shared.exceptions.InvalidRegattaDataException; import shared.exceptions.XMLReaderException; import visualiser.model.RaceConnection; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.ParserConfigurationException; import java.io.IOException; import java.net.Socket; import java.net.URL; @@ -55,6 +58,12 @@ public class HostController extends Controller { e.printStackTrace(); } catch (InvalidRegattaDataException e) { e.printStackTrace(); + } catch (SAXException e) { + e.printStackTrace(); + } catch (JAXBException e) { + e.printStackTrace(); + } catch (ParserConfigurationException e) { + e.printStackTrace(); } } diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/bindingwp.xjb b/racevisionGame/src/main/resources/mock/mockXML/schema/bindingwp.xjb new file mode 100644 index 00000000..7d19360a --- /dev/null +++ b/racevisionGame/src/main/resources/mock/mockXML/schema/bindingwp.xjb @@ -0,0 +1,17 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/generated/ObjectFactory.java b/racevisionGame/src/main/resources/mock/mockXML/schema/generated/ObjectFactory.java deleted file mode 100644 index 3a391bcd..00000000 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/generated/ObjectFactory.java +++ /dev/null @@ -1,127 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:00:04 PM NZST -// - - -package generated; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the generated package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Race } - * - */ - public Race createRace() { - return new Race(); - } - - /** - * Create an instance of {@link Race.CourseLimit } - * - */ - public Race.CourseLimit createRaceCourseLimit() { - return new Race.CourseLimit(); - } - - /** - * Create an instance of {@link Race.Course } - * - */ - public Race.Course createRaceCourse() { - return new Race.Course(); - } - - /** - * Create an instance of {@link Race.Course.CompoundMark } - * - */ - public Race.Course.CompoundMark createRaceCourseCompoundMark() { - return new Race.Course.CompoundMark(); - } - - /** - * Create an instance of {@link Race.CompoundMarkSequence } - * - */ - public Race.CompoundMarkSequence createRaceCompoundMarkSequence() { - return new Race.CompoundMarkSequence(); - } - - /** - * Create an instance of {@link Race.Participants } - * - */ - public Race.Participants createRaceParticipants() { - return new Race.Participants(); - } - - /** - * Create an instance of {@link Race.RaceStartTime } - * - */ - public Race.RaceStartTime createRaceRaceStartTime() { - return new Race.RaceStartTime(); - } - - /** - * Create an instance of {@link Race.CourseLimit.Limit } - * - */ - public Race.CourseLimit.Limit createRaceCourseLimitLimit() { - return new Race.CourseLimit.Limit(); - } - - /** - * Create an instance of {@link Race.Course.CompoundMark.Mark } - * - */ - public Race.Course.CompoundMark.Mark createRaceCourseCompoundMarkMark() { - return new Race.Course.CompoundMark.Mark(); - } - - /** - * Create an instance of {@link Race.CompoundMarkSequence.Corner } - * - */ - public Race.CompoundMarkSequence.Corner createRaceCompoundMarkSequenceCorner() { - return new Race.CompoundMarkSequence.Corner(); - } - - /** - * Create an instance of {@link Race.Participants.Yacht } - * - */ - public Race.Participants.Yacht createRaceParticipantsYacht() { - return new Race.Participants.Yacht(); - } - -} diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/generated/Race.java b/racevisionGame/src/main/resources/mock/mockXML/schema/generated/Race.java deleted file mode 100644 index 07598160..00000000 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/generated/Race.java +++ /dev/null @@ -1,1351 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:00:04 PM NZST -// - - -package generated; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RaceID" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="RaceType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="CreationTimeDate" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="RaceStartTime">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Postpone" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Time" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Participants">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Yacht" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="CompoundMarkSequence">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Corner" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Course">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CompoundMark" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="Mark" maxOccurs="unbounded">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="CourseLimit">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Limit" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "raceID", - "raceType", - "creationTimeDate", - "raceStartTime", - "participants", - "compoundMarkSequence", - "course", - "courseLimit" -}) -@XmlRootElement(name = "Race") -public class Race { - - @XmlElement(name = "RaceID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger raceID; - @XmlElement(name = "RaceType", required = true) - protected String raceType; - @XmlElement(name = "CreationTimeDate", required = true) - protected String creationTimeDate; - @XmlElement(name = "RaceStartTime", required = true) - protected Race.RaceStartTime raceStartTime; - @XmlElement(name = "Participants", required = true) - protected Race.Participants participants; - @XmlElement(name = "CompoundMarkSequence", required = true) - protected Race.CompoundMarkSequence compoundMarkSequence; - @XmlElement(name = "Course", required = true) - protected Race.Course course; - @XmlElement(name = "CourseLimit", required = true) - protected Race.CourseLimit courseLimit; - - /** - * Gets the value of the raceID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getRaceID() { - return raceID; - } - - /** - * Sets the value of the raceID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setRaceID(BigInteger value) { - this.raceID = value; - } - - /** - * Gets the value of the raceType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRaceType() { - return raceType; - } - - /** - * Sets the value of the raceType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRaceType(String value) { - this.raceType = value; - } - - /** - * Gets the value of the creationTimeDate property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCreationTimeDate() { - return creationTimeDate; - } - - /** - * Sets the value of the creationTimeDate property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCreationTimeDate(String value) { - this.creationTimeDate = value; - } - - /** - * Gets the value of the raceStartTime property. - * - * @return - * possible object is - * {@link Race.RaceStartTime } - * - */ - public Race.RaceStartTime getRaceStartTime() { - return raceStartTime; - } - - /** - * Sets the value of the raceStartTime property. - * - * @param value - * allowed object is - * {@link Race.RaceStartTime } - * - */ - public void setRaceStartTime(Race.RaceStartTime value) { - this.raceStartTime = value; - } - - /** - * Gets the value of the participants property. - * - * @return - * possible object is - * {@link Race.Participants } - * - */ - public Race.Participants getParticipants() { - return participants; - } - - /** - * Sets the value of the participants property. - * - * @param value - * allowed object is - * {@link Race.Participants } - * - */ - public void setParticipants(Race.Participants value) { - this.participants = value; - } - - /** - * Gets the value of the compoundMarkSequence property. - * - * @return - * possible object is - * {@link Race.CompoundMarkSequence } - * - */ - public Race.CompoundMarkSequence getCompoundMarkSequence() { - return compoundMarkSequence; - } - - /** - * Sets the value of the compoundMarkSequence property. - * - * @param value - * allowed object is - * {@link Race.CompoundMarkSequence } - * - */ - public void setCompoundMarkSequence(Race.CompoundMarkSequence value) { - this.compoundMarkSequence = value; - } - - /** - * Gets the value of the course property. - * - * @return - * possible object is - * {@link Race.Course } - * - */ - public Race.Course getCourse() { - return course; - } - - /** - * Sets the value of the course property. - * - * @param value - * allowed object is - * {@link Race.Course } - * - */ - public void setCourse(Race.Course value) { - this.course = value; - } - - /** - * Gets the value of the courseLimit property. - * - * @return - * possible object is - * {@link Race.CourseLimit } - * - */ - public Race.CourseLimit getCourseLimit() { - return courseLimit; - } - - /** - * Sets the value of the courseLimit property. - * - * @param value - * allowed object is - * {@link Race.CourseLimit } - * - */ - public void setCourseLimit(Race.CourseLimit value) { - this.courseLimit = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Corner" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *                 <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *                 <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "corner" - }) - public static class CompoundMarkSequence { - - @XmlElement(name = "Corner", required = true) - protected List corner; - - /** - * Gets the value of the corner property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the corner property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCorner().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.CompoundMarkSequence.Corner } - * - * - */ - public List getCorner() { - if (corner == null) { - corner = new ArrayList(); - } - return this.corner; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *       <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *       <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Corner { - - @XmlAttribute(name = "CompoundMarkID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger compoundMarkID; - @XmlAttribute(name = "SeqID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger seqID; - @XmlAttribute(name = "Rounding", required = true) - protected String rounding; - @XmlAttribute(name = "ZoneSize", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger zoneSize; - - /** - * Gets the value of the compoundMarkID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getCompoundMarkID() { - return compoundMarkID; - } - - /** - * Sets the value of the compoundMarkID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setCompoundMarkID(BigInteger value) { - this.compoundMarkID = value; - } - - /** - * Gets the value of the seqID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getSeqID() { - return seqID; - } - - /** - * Sets the value of the seqID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setSeqID(BigInteger value) { - this.seqID = value; - } - - /** - * Gets the value of the rounding property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRounding() { - return rounding; - } - - /** - * Sets the value of the rounding property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRounding(String value) { - this.rounding = value; - } - - /** - * Gets the value of the zoneSize property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getZoneSize() { - return zoneSize; - } - - /** - * Sets the value of the zoneSize property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setZoneSize(BigInteger value) { - this.zoneSize = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CompoundMark" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="Mark" maxOccurs="unbounded">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *                 <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "compoundMark" - }) - public static class Course { - - @XmlElement(name = "CompoundMark", required = true) - protected List compoundMark; - - /** - * Gets the value of the compoundMark property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the compoundMark property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCompoundMark().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Course.CompoundMark } - * - * - */ - public List getCompoundMark() { - if (compoundMark == null) { - compoundMark = new ArrayList(); - } - return this.compoundMark; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="Mark" maxOccurs="unbounded">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *       <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "mark" - }) - public static class CompoundMark { - - @XmlElement(name = "Mark", required = true) - protected List mark; - @XmlAttribute(name = "CompoundMarkID", required = true) - protected String compoundMarkID; - @XmlAttribute(name = "Name", required = true) - protected String name; - - /** - * Gets the value of the mark property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the mark property. - * - *

- * For example, to add a new item, do as follows: - *

-             *    getMark().add(newItem);
-             * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Course.CompoundMark.Mark } - * - * - */ - public List getMark() { - if (mark == null) { - mark = new ArrayList(); - } - return this.mark; - } - - /** - * Gets the value of the compoundMarkID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCompoundMarkID() { - return compoundMarkID; - } - - /** - * Sets the value of the compoundMarkID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCompoundMarkID(String value) { - this.compoundMarkID = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Mark { - - @XmlAttribute(name = "SeqId") - protected String seqId; - @XmlAttribute(name = "Name", required = true) - protected String name; - @XmlAttribute(name = "TargetLat", required = true) - protected String targetLat; - @XmlAttribute(name = "TargetLng", required = true) - protected String targetLng; - @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; - - /** - * Gets the value of the seqId property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeqId() { - return seqId; - } - - /** - * Sets the value of the seqId property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeqId(String value) { - this.seqId = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the targetLat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetLat() { - return targetLat; - } - - /** - * Sets the value of the targetLat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetLat(String value) { - this.targetLat = value; - } - - /** - * Gets the value of the targetLng property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetLng() { - return targetLng; - } - - /** - * Sets the value of the targetLng property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetLng(String value) { - this.targetLng = value; - } - - /** - * Gets the value of the sourceID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceID() { - return sourceID; - } - - /** - * Sets the value of the sourceID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceID(String value) { - this.sourceID = value; - } - - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Limit" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "limit" - }) - public static class CourseLimit { - - @XmlElement(name = "Limit", required = true) - protected List limit; - - /** - * Gets the value of the limit property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the limit property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getLimit().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.CourseLimit.Limit } - * - * - */ - public List getLimit() { - if (limit == null) { - limit = new ArrayList(); - } - return this.limit; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Limit { - - @XmlAttribute(name = "Lat", required = true) - protected String lat; - @XmlAttribute(name = "Lon", required = true) - protected String lon; - @XmlAttribute(name = "SeqID", required = true) - protected String seqID; - - /** - * Gets the value of the lat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLat() { - return lat; - } - - /** - * Sets the value of the lat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLat(String value) { - this.lat = value; - } - - /** - * Gets the value of the lon property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLon() { - return lon; - } - - /** - * Sets the value of the lon property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLon(String value) { - this.lon = value; - } - - /** - * Gets the value of the seqID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeqID() { - return seqID; - } - - /** - * Sets the value of the seqID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeqID(String value) { - this.seqID = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Yacht" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "yacht" - }) - public static class Participants { - - @XmlElement(name = "Yacht", required = true) - protected List yacht; - - /** - * Gets the value of the yacht property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the yacht property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getYacht().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Participants.Yacht } - * - * - */ - public List getYacht() { - if (yacht == null) { - yacht = new ArrayList(); - } - return this.yacht; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Yacht { - - @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; - @XmlAttribute(name = "Entry") - protected String entry; - - /** - * Gets the value of the sourceID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceID() { - return sourceID; - } - - /** - * Sets the value of the sourceID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceID(String value) { - this.sourceID = value; - } - - /** - * Gets the value of the entry property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEntry() { - return entry; - } - - /** - * Sets the value of the entry property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEntry(String value) { - this.entry = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Postpone" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Time" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class RaceStartTime { - - @XmlAttribute(name = "Postpone", required = true) - protected String postpone; - @XmlAttribute(name = "Time", required = true) - protected String time; - - /** - * Gets the value of the postpone property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostpone() { - return postpone; - } - - /** - * Sets the value of the postpone property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostpone(String value) { - this.postpone = value; - } - - /** - * Gets the value of the time property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTime() { - return time; - } - - /** - * Sets the value of the time property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTime(String value) { - this.time = value; - } - - } - -} diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/raceSchema.xsd b/racevisionGame/src/main/resources/mock/mockXML/schema/raceSchema.xsd index 755722ff..3752209e 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/raceSchema.xsd +++ b/racevisionGame/src/main/resources/mock/mockXML/schema/raceSchema.xsd @@ -3,7 +3,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -29,10 +29,10 @@ - - + + - + @@ -46,15 +46,15 @@ - + - - - + + + - + @@ -66,9 +66,9 @@ - - - + + + diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/scd/ObjectFactory.java b/racevisionGame/src/main/resources/mock/mockXML/schema/scd/ObjectFactory.java deleted file mode 100644 index 2a57580d..00000000 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/scd/ObjectFactory.java +++ /dev/null @@ -1,127 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 10:39:29 PM NZST -// - - -package scd; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the scd package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: scd - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Race } - * - */ - public Race createRace() { - return new Race(); - } - - /** - * Create an instance of {@link Race.CourseLimit } - * - */ - public Race.CourseLimit createRaceCourseLimit() { - return new Race.CourseLimit(); - } - - /** - * Create an instance of {@link Race.Course } - * - */ - public Race.Course createRaceCourse() { - return new Race.Course(); - } - - /** - * Create an instance of {@link Race.Course.CompoundMark } - * - */ - public Race.Course.CompoundMark createRaceCourseCompoundMark() { - return new Race.Course.CompoundMark(); - } - - /** - * Create an instance of {@link Race.CompoundMarkSequence } - * - */ - public Race.CompoundMarkSequence createRaceCompoundMarkSequence() { - return new Race.CompoundMarkSequence(); - } - - /** - * Create an instance of {@link Race.Participants } - * - */ - public Race.Participants createRaceParticipants() { - return new Race.Participants(); - } - - /** - * Create an instance of {@link Race.RaceStartTime } - * - */ - public Race.RaceStartTime createRaceRaceStartTime() { - return new Race.RaceStartTime(); - } - - /** - * Create an instance of {@link Race.CourseLimit.Limit } - * - */ - public Race.CourseLimit.Limit createRaceCourseLimitLimit() { - return new Race.CourseLimit.Limit(); - } - - /** - * Create an instance of {@link Race.Course.CompoundMark.Mark } - * - */ - public Race.Course.CompoundMark.Mark createRaceCourseCompoundMarkMark() { - return new Race.Course.CompoundMark.Mark(); - } - - /** - * Create an instance of {@link Race.CompoundMarkSequence.Corner } - * - */ - public Race.CompoundMarkSequence.Corner createRaceCompoundMarkSequenceCorner() { - return new Race.CompoundMarkSequence.Corner(); - } - - /** - * Create an instance of {@link Race.Participants.Yacht } - * - */ - public Race.Participants.Yacht createRaceParticipantsYacht() { - return new Race.Participants.Yacht(); - } - -} diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/scd/Race.java b/racevisionGame/src/main/resources/mock/mockXML/schema/scd/Race.java deleted file mode 100644 index 77b991a7..00000000 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/scd/Race.java +++ /dev/null @@ -1,1351 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 10:39:29 PM NZST -// - - -package scd; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RaceID" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="RaceType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="CreationTimeDate" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="RaceStartTime">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Postpone" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Time" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Participants">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Yacht" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="CompoundMarkSequence">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Corner" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                           <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Course">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CompoundMark" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="Mark" maxOccurs="unbounded">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                           <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="CourseLimit">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Limit" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "raceID", - "raceType", - "creationTimeDate", - "raceStartTime", - "participants", - "compoundMarkSequence", - "course", - "courseLimit" -}) -@XmlRootElement(name = "Race") -public class Race { - - @XmlElement(name = "RaceID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger raceID; - @XmlElement(name = "RaceType", required = true) - protected String raceType; - @XmlElement(name = "CreationTimeDate", required = true) - protected String creationTimeDate; - @XmlElement(name = "RaceStartTime", required = true) - protected Race.RaceStartTime raceStartTime; - @XmlElement(name = "Participants", required = true) - protected Race.Participants participants; - @XmlElement(name = "CompoundMarkSequence", required = true) - protected Race.CompoundMarkSequence compoundMarkSequence; - @XmlElement(name = "Course", required = true) - protected Race.Course course; - @XmlElement(name = "CourseLimit", required = true) - protected Race.CourseLimit courseLimit; - - /** - * Gets the value of the raceID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getRaceID() { - return raceID; - } - - /** - * Sets the value of the raceID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setRaceID(BigInteger value) { - this.raceID = value; - } - - /** - * Gets the value of the raceType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRaceType() { - return raceType; - } - - /** - * Sets the value of the raceType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRaceType(String value) { - this.raceType = value; - } - - /** - * Gets the value of the creationTimeDate property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCreationTimeDate() { - return creationTimeDate; - } - - /** - * Sets the value of the creationTimeDate property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCreationTimeDate(String value) { - this.creationTimeDate = value; - } - - /** - * Gets the value of the raceStartTime property. - * - * @return - * possible object is - * {@link Race.RaceStartTime } - * - */ - public Race.RaceStartTime getRaceStartTime() { - return raceStartTime; - } - - /** - * Sets the value of the raceStartTime property. - * - * @param value - * allowed object is - * {@link Race.RaceStartTime } - * - */ - public void setRaceStartTime(Race.RaceStartTime value) { - this.raceStartTime = value; - } - - /** - * Gets the value of the participants property. - * - * @return - * possible object is - * {@link Race.Participants } - * - */ - public Race.Participants getParticipants() { - return participants; - } - - /** - * Sets the value of the participants property. - * - * @param value - * allowed object is - * {@link Race.Participants } - * - */ - public void setParticipants(Race.Participants value) { - this.participants = value; - } - - /** - * Gets the value of the compoundMarkSequence property. - * - * @return - * possible object is - * {@link Race.CompoundMarkSequence } - * - */ - public Race.CompoundMarkSequence getCompoundMarkSequence() { - return compoundMarkSequence; - } - - /** - * Sets the value of the compoundMarkSequence property. - * - * @param value - * allowed object is - * {@link Race.CompoundMarkSequence } - * - */ - public void setCompoundMarkSequence(Race.CompoundMarkSequence value) { - this.compoundMarkSequence = value; - } - - /** - * Gets the value of the course property. - * - * @return - * possible object is - * {@link Race.Course } - * - */ - public Race.Course getCourse() { - return course; - } - - /** - * Sets the value of the course property. - * - * @param value - * allowed object is - * {@link Race.Course } - * - */ - public void setCourse(Race.Course value) { - this.course = value; - } - - /** - * Gets the value of the courseLimit property. - * - * @return - * possible object is - * {@link Race.CourseLimit } - * - */ - public Race.CourseLimit getCourseLimit() { - return courseLimit; - } - - /** - * Sets the value of the courseLimit property. - * - * @param value - * allowed object is - * {@link Race.CourseLimit } - * - */ - public void setCourseLimit(Race.CourseLimit value) { - this.courseLimit = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Corner" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *                 <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *                 <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "corner" - }) - public static class CompoundMarkSequence { - - @XmlElement(name = "Corner", required = true) - protected List corner; - - /** - * Gets the value of the corner property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the corner property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCorner().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.CompoundMarkSequence.Corner } - * - * - */ - public List getCorner() { - if (corner == null) { - corner = new ArrayList(); - } - return this.corner; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *       <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *       <attribute name="Rounding" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="ZoneSize" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Corner { - - @XmlAttribute(name = "CompoundMarkID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger compoundMarkID; - @XmlAttribute(name = "SeqID", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger seqID; - @XmlAttribute(name = "Rounding", required = true) - protected String rounding; - @XmlAttribute(name = "ZoneSize", required = true) - @XmlSchemaType(name = "positiveInteger") - protected BigInteger zoneSize; - - /** - * Gets the value of the compoundMarkID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getCompoundMarkID() { - return compoundMarkID; - } - - /** - * Sets the value of the compoundMarkID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setCompoundMarkID(BigInteger value) { - this.compoundMarkID = value; - } - - /** - * Gets the value of the seqID property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getSeqID() { - return seqID; - } - - /** - * Sets the value of the seqID property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setSeqID(BigInteger value) { - this.seqID = value; - } - - /** - * Gets the value of the rounding property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRounding() { - return rounding; - } - - /** - * Sets the value of the rounding property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRounding(String value) { - this.rounding = value; - } - - /** - * Gets the value of the zoneSize property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getZoneSize() { - return zoneSize; - } - - /** - * Sets the value of the zoneSize property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setZoneSize(BigInteger value) { - this.zoneSize = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CompoundMark" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="Mark" maxOccurs="unbounded">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                           <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *                 <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "compoundMark" - }) - public static class Course { - - @XmlElement(name = "CompoundMark", required = true) - protected List compoundMark; - - /** - * Gets the value of the compoundMark property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the compoundMark property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCompoundMark().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Course.CompoundMark } - * - * - */ - public List getCompoundMark() { - if (compoundMark == null) { - compoundMark = new ArrayList(); - } - return this.compoundMark; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="Mark" maxOccurs="unbounded">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *                 <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *       <attribute name="CompoundMarkID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "mark" - }) - public static class CompoundMark { - - @XmlElement(name = "Mark", required = true) - protected List mark; - @XmlAttribute(name = "CompoundMarkID", required = true) - protected String compoundMarkID; - @XmlAttribute(name = "Name", required = true) - protected String name; - - /** - * Gets the value of the mark property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the mark property. - * - *

- * For example, to add a new item, do as follows: - *

-             *    getMark().add(newItem);
-             * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Course.CompoundMark.Mark } - * - * - */ - public List getMark() { - if (mark == null) { - mark = new ArrayList(); - } - return this.mark; - } - - /** - * Gets the value of the compoundMarkID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCompoundMarkID() { - return compoundMarkID; - } - - /** - * Sets the value of the compoundMarkID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCompoundMarkID(String value) { - this.compoundMarkID = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <attribute name="SeqId" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="TargetLat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="TargetLng" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *       <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Mark { - - @XmlAttribute(name = "SeqId") - protected String seqId; - @XmlAttribute(name = "Name", required = true) - protected String name; - @XmlAttribute(name = "TargetLat", required = true) - protected String targetLat; - @XmlAttribute(name = "TargetLng", required = true) - protected String targetLng; - @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; - - /** - * Gets the value of the seqId property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeqId() { - return seqId; - } - - /** - * Sets the value of the seqId property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeqId(String value) { - this.seqId = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the targetLat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetLat() { - return targetLat; - } - - /** - * Sets the value of the targetLat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetLat(String value) { - this.targetLat = value; - } - - /** - * Gets the value of the targetLng property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetLng() { - return targetLng; - } - - /** - * Sets the value of the targetLng property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetLng(String value) { - this.targetLng = value; - } - - /** - * Gets the value of the sourceID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceID() { - return sourceID; - } - - /** - * Sets the value of the sourceID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceID(String value) { - this.sourceID = value; - } - - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Limit" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "limit" - }) - public static class CourseLimit { - - @XmlElement(name = "Limit", required = true) - protected List limit; - - /** - * Gets the value of the limit property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the limit property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getLimit().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.CourseLimit.Limit } - * - * - */ - public List getLimit() { - if (limit == null) { - limit = new ArrayList(); - } - return this.limit; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="Lat" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Lon" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="SeqID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Limit { - - @XmlAttribute(name = "Lat", required = true) - protected String lat; - @XmlAttribute(name = "Lon", required = true) - protected String lon; - @XmlAttribute(name = "SeqID", required = true) - protected String seqID; - - /** - * Gets the value of the lat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLat() { - return lat; - } - - /** - * Sets the value of the lat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLat(String value) { - this.lat = value; - } - - /** - * Gets the value of the lon property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLon() { - return lon; - } - - /** - * Sets the value of the lon property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLon(String value) { - this.lon = value; - } - - /** - * Gets the value of the seqID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeqID() { - return seqID; - } - - /** - * Sets the value of the seqID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeqID(String value) { - this.seqID = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Yacht" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "yacht" - }) - public static class Participants { - - @XmlElement(name = "Yacht", required = true) - protected List yacht; - - /** - * Gets the value of the yacht property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the yacht property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getYacht().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Race.Participants.Yacht } - * - * - */ - public List getYacht() { - if (yacht == null) { - yacht = new ArrayList(); - } - return this.yacht; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="Entry" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Yacht { - - @XmlAttribute(name = "SourceID", required = true) - protected String sourceID; - @XmlAttribute(name = "Entry") - protected String entry; - - /** - * Gets the value of the sourceID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceID() { - return sourceID; - } - - /** - * Sets the value of the sourceID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceID(String value) { - this.sourceID = value; - } - - /** - * Gets the value of the entry property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEntry() { - return entry; - } - - /** - * Sets the value of the entry property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEntry(String value) { - this.entry = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Postpone" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Time" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class RaceStartTime { - - @XmlAttribute(name = "Postpone", required = true) - protected String postpone; - @XmlAttribute(name = "Time", required = true) - protected String time; - - /** - * Gets the value of the postpone property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostpone() { - return postpone; - } - - /** - * Sets the value of the postpone property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostpone(String value) { - this.postpone = value; - } - - /** - * Gets the value of the time property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTime() { - return time; - } - - /** - * Sets the value of the time property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTime(String value) { - this.time = value; - } - - } - -} diff --git a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/ObjectFactory.java b/racevisionGame/src/main/resources/mock/mockXML/schema/schema/ObjectFactory.java deleted file mode 100644 index eb4b55e9..00000000 --- a/racevisionGame/src/main/resources/mock/mockXML/schema/schema/ObjectFactory.java +++ /dev/null @@ -1,127 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.08.13 at 11:01:23 PM NZST -// - - -package schema; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the schema package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: schema - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Race } - * - */ - public Race createRace() { - return new Race(); - } - - /** - * Create an instance of {@link RaceStartTime } - * - */ - public RaceStartTime createRaceStartTime() { - return new RaceStartTime(); - } - - /** - * Create an instance of {@link Participants } - * - */ - public Participants createParticipants() { - return new Participants(); - } - - /** - * Create an instance of {@link CompoundMarkSequence } - * - */ - public CompoundMarkSequence createCompoundMarkSequence() { - return new CompoundMarkSequence(); - } - - /** - * Create an instance of {@link Course } - * - */ - public Course createCourse() { - return new Course(); - } - - /** - * Create an instance of {@link CourseLimit } - * - */ - public CourseLimit createCourseLimit() { - return new CourseLimit(); - } - - /** - * Create an instance of {@link Limit } - * - */ - public Limit createLimit() { - return new Limit(); - } - - /** - * Create an instance of {@link CompoundMark } - * - */ - public CompoundMark createCompoundMark() { - return new CompoundMark(); - } - - /** - * Create an instance of {@link Mark } - * - */ - public Mark createMark() { - return new Mark(); - } - - /** - * Create an instance of {@link Corner } - * - */ - public Corner createCorner() { - return new Corner(); - } - - /** - * Create an instance of {@link Yacht } - * - */ - public Yacht createYacht() { - return new Yacht(); - } - -}