From 16bf57e3331e73e49289d2a396a1cac3b1e7b92b Mon Sep 17 00:00:00 2001 From: fjc40 Date: Sat, 2 Sep 2017 00:45:08 +1200 Subject: [PATCH] javadoc fixes. --- .../src/main/java/mock/model/MockRace.java | 1 - .../java/shared/xml/boats/BoatConfig.java | 234 +++++++++--------- .../shared/xml/regatta/RegattaConfig.java | 32 +-- 3 files changed, 133 insertions(+), 134 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java index 9bcece2c..f606c29d 100644 --- a/racevisionGame/src/main/java/mock/model/MockRace.java +++ b/racevisionGame/src/main/java/mock/model/MockRace.java @@ -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. * @param sourceID The source ID to assign the boat. - * @return A MockBoat that is now participating in the race. */ public void generateMockBoat(Integer sourceID) { diff --git a/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java b/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java index c517c830..c0361b52 100644 --- a/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java +++ b/racevisionGame/src/main/java/shared/xml/boats/BoatConfig.java @@ -24,52 +24,52 @@ import javax.xml.bind.annotation.XmlType; *

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="Boats">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Boat" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="GPSposition">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                           <attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="BoatName" 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="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           <attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Boats">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="Boat" maxOccurs="unbounded">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="GPSposition">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                           <attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           <attribute name="BoatName" 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="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           <attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           <attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           <attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
* * @@ -115,42 +115,42 @@ public class BoatConfig { *

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="Boat" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="GPSposition">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *                 <attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="BoatName" 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="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *                 <attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="Boat" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="GPSposition">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *                 <attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 <attribute name="BoatName" 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="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 <attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                 <attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
* * @@ -200,32 +200,32 @@ public class BoatConfig { *

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="GPSposition">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *       <attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="BoatName" 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="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *       <attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="GPSposition">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *       <attribute name="Type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       <attribute name="BoatName" 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="HullNum" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       <attribute name="ShortName" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *       <attribute name="ShapeID" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="StoweName" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
          * 
* * @@ -444,15 +444,15 @@ public class BoatConfig { *

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="X" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <attribute name="X" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="Y" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="Z" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
              * 
* * diff --git a/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java b/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java index cf72ed5b..d8cc1613 100644 --- a/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java +++ b/racevisionGame/src/main/java/shared/xml/regatta/RegattaConfig.java @@ -21,22 +21,22 @@ import javax.xml.bind.annotation.XmlType; *

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="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         <element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         <element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         <element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         <element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         <element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="RegattaID" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         <element name="RegattaName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="CourseName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="CentralLatitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         <element name="CentralLongitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         <element name="CentralAltitude" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         <element name="UtcOffset" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         <element name="MagneticVariation" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
* *