fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

javadoc fixes.

Browse Source
This commit is contained in:
fjc40
2017-09-02 00:45:08 +12:00
parent 8c76d6c26e
commit 16bf57e333
3 changed files with 133 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/MockRace.java
-1
View File
@@ -109,7 +109,6 @@ public class MockRace extends RaceState {
/** /**
* Generates a MockBoat from the BoatDataSource, given a source ID. Also adds it to the participant list. * Generates a MockBoat from the BoatDataSource, given a source ID. Also adds it to the participant list.
* @param sourceID The source ID to assign the boat. * @param sourceID The source ID to assign the boat.
* @return A MockBoat that is now participating in the race.
*/ */
public void generateMockBoat(Integer sourceID) { public void generateMockBoat(Integer sourceID) {
racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java
+117 -117
View File
@@ -24,52 +24,52 @@ import javax.xml.bind.annotation.XmlType;
* <p>The following schema fragment specifies the expected content contained within this class. * <p>The following schema fragment specifies the expected content contained within this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="Boats"> * &lt;element name="Boats"&gt;
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="Boat" maxOccurs="unbounded"> * &lt;element name="Boat" maxOccurs="unbounded"&gt;
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="GPSposition"> * &lt;element name="GPSposition"&gt;
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* &lt;/element> * &lt;/element&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* &lt;/element> * &lt;/element&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* &lt;/element> * &lt;/element&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* </pre> * </pre>
* *
* *
@@ -115,42 +115,42 @@ public class BoatConfig {
* <p>The following schema fragment specifies the expected content contained within this class. * <p>The following schema fragment specifies the expected content contained within this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="Boat" maxOccurs="unbounded"> * &lt;element name="Boat" maxOccurs="unbounded"&gt;
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="GPSposition"> * &lt;element name="GPSposition"&gt;
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* &lt;/element> * &lt;/element&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* &lt;/element> * &lt;/element&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* </pre> * </pre>
* *
* *
@@ -200,32 +200,32 @@ public class BoatConfig {
* <p>The following schema fragment specifies the expected content contained within this class. * <p>The following schema fragment specifies the expected content contained within this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="GPSposition"> * &lt;element name="GPSposition"&gt;
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* &lt;/element> * &lt;/element&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="BoatName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="SourceID" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* </pre> * </pre>
* *
* *
@@ -444,15 +444,15 @@ public class BoatConfig {
* <p>The following schema fragment specifies the expected content contained within this class. * <p>The following schema fragment specifies the expected content contained within this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* </pre> * </pre>
* *
* *
racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java
+16 -16
View File
@@ -21,22 +21,22 @@ import javax.xml.bind.annotation.XmlType;
* <p>The following schema fragment specifies the expected content contained within this class. * <p>The following schema fragment specifies the expected content contained within this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType&gt;
* &lt;complexContent> * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence> * &lt;sequence&gt;
* &lt;element name="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/> * &lt;element name="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
* &lt;element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/> * &lt;element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
* &lt;element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/> * &lt;element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
* &lt;element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/> * &lt;element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
* &lt;element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/> * &lt;element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
* &lt;element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/> * &lt;element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
* &lt;/sequence> * &lt;/sequence&gt;
* &lt;/restriction> * &lt;/restriction&gt;
* &lt;/complexContent> * &lt;/complexContent&gt;
* &lt;/complexType> * &lt;/complexType&gt;
* </pre> * </pre>
* *
* *