Refactored RaceData class

#story[778]

mock/src/main/java/seng302/Data/RaceData.java

@@ -30,18 +30,10 @@ public class RaceData {
     Element raceElement;
 
     private OffsetDateTime creationTimeDate;
-    private OffsetDateTime raceStartTime;
-    private List<BoatInRace> participants;
-    private List<Marker> course;
-    private List<GPSCoordinate> courseLimit;
 
     public RaceData(RaceDataSource dataSource) {
         this.dataSource = dataSource;
         creationTimeDate = OffsetDateTime.now();
-        raceStartTime = OffsetDateTime.now().plusMinutes(3);
-        participants = dataSource.getBoats();
-        course = dataSource.getMarkers();
-        courseLimit = dataSource.getBoundary();
     }
 
     public String createXML() {
@@ -56,73 +48,124 @@ public class RaceData {
             raceElement = doc.createElement("Race");
             doc.appendChild(raceElement);
 
+            appendChildElements();
+
+            // write the content into xml file
+            TransformerFactory transformerFactory = TransformerFactory.newInstance();
+            Transformer transformer = transformerFactory.newTransformer();
+            DOMSource source = new DOMSource(doc);
+
+            //Serialize document.
+            StringWriter stringWriter = new StringWriter();
+            StreamResult result = new StreamResult(stringWriter);
+            transformer.transform(source, result);
+
+            return stringWriter.toString();
+
+        } catch (ParserConfigurationException pce) {
+            throw new InvalidRaceDataException();
+        } catch (TransformerException tfe) {
+            throw new InvalidRaceDataException();
+        }
+    }
+
+    private void appendChildElements() {
         appendRaceId();
         appendRaceType();
+        appendCreationTimeDate();
+        appendRaceStartTime();
+        appendParticipants();
+        appendCourse();
+        appendCourseLimit();
+    }
 
+    private void appendRaceId() {
+        Element raceIdElement = doc.createElement("RaceID");
+        raceIdElement.appendChild(doc.createTextNode(dataSource.getRaceId()));
+        raceElement.appendChild(raceIdElement);
+    }
+
+    private void appendRaceType() {
+        Element raceTypeElement = doc.createElement("RaceType");
+        raceTypeElement.appendChild(doc.createTextNode(dataSource.getRaceType()));
+        raceElement.appendChild(raceTypeElement);
+    }
+
+    private void appendCreationTimeDate() {
         Element creationTimeElement = doc.createElement("CreationTimeDate");
         creationTimeElement.appendChild(doc.createTextNode(creationTimeDate.toString()));
         raceElement.appendChild(creationTimeElement);
+    }
 
+    private void appendRaceStartTime() {
         Element startTimeElement = doc.createElement("RaceStartTime");
-            startTimeElement.setAttribute("Time", raceStartTime.toString());
+        startTimeElement.setAttribute("Time", (creationTimeDate.plusMinutes(3)).toString());
         startTimeElement.setAttribute("Postpone", "false");
         raceElement.appendChild(startTimeElement);
+    }
 
-
+    private void appendParticipants() {
         Element participantsElement = doc.createElement("Participants");
 
-            for (BoatInRace boat : participants) {
+        for (BoatInRace boat : dataSource.getBoats()) {
             Element yachtElement = doc.createElement("Yacht");
             yachtElement.setAttribute("SourceID", boat.getSourceID() + "");
             participantsElement.appendChild(yachtElement);
         }
-
         raceElement.appendChild(participantsElement);
+    }
 
-
+    private void appendCourse() {
-
         Element courseElement = doc.createElement("Course");
         Element compoundMarkSeqElement = doc.createElement("CompoundMarkSequence");
 
         int i = 1;
-            for (Marker marker : course) {
+        for (Marker marker : dataSource.getMarkers()) {
+
+            courseElement.appendChild(createCompoundMarker(marker, i));
+            compoundMarkSeqElement.appendChild(createCornerElement(i));
+            i++;
+        }
+
+        raceElement.appendChild(compoundMarkSeqElement);
+        raceElement.appendChild(courseElement);
+    }
+
+
+    private Element createMark(GPSCoordinate marker) {
+        Element mark = doc.createElement("Mark");
+        mark.setAttribute("TargetLat", marker.getLatitude() + "");
+        mark.setAttribute("TargetLng", marker.getLongitude() + "");
+        return mark;
+    }
+
+    private Element createCompoundMarker(Marker marker, int i) {
         Element compoundMarkElement = doc.createElement("CompoundMark");
         compoundMarkElement.setAttribute("CompoundMarkId", i + "");
         compoundMarkElement.setAttribute("Name", marker.getName());
 
-                Element mark1 = doc.createElement("Mark");
+        compoundMarkElement.appendChild(createMark(marker.getMark1()));
-                mark1.setAttribute("TargetLat", marker.getMark1().getLatitude() + "");
-                mark1.setAttribute("TargetLng", marker.getMark1().getLongitude() + "");
-
-                compoundMarkElement.appendChild(mark1);
 
         if (!(marker.getMark1().equals(marker.getMark2()))) {
-                    Element mark2 = doc.createElement("Mark");
+            compoundMarkElement.appendChild(createMark(marker.getMark2()));
-                    mark2.setAttribute("TargetLat", marker.getMark2().getLatitude() + "");
-                    mark2.setAttribute("TargetLng", marker.getMark2().getLongitude() + "");
-                    compoundMarkElement.appendChild(mark2);
         }
 
-                courseElement.appendChild(compoundMarkElement);
+        return compoundMarkElement;
-
+    }
 
+    private Element createCornerElement(int i) {
         Element cornerElement = doc.createElement("Corner");
         cornerElement.setAttribute("SeqID", i + "");
         cornerElement.setAttribute("CompoundMarkID", i + "");
 
-                compoundMarkSeqElement.appendChild(cornerElement);
+        return cornerElement;
-
-                i++;
     }
 
-            raceElement.appendChild(compoundMarkSeqElement);
+    private void appendCourseLimit() {
-            raceElement.appendChild(courseElement);
-
-
         int j = 1;
 
         Element courseLimitElement = doc.createElement("CourseLimit");
-            for (GPSCoordinate coordinate : courseLimit) {
+        for (GPSCoordinate coordinate : dataSource.getBoundary()) {
             Element limitElement = doc.createElement("Limit");
             limitElement.setAttribute("SeqID", j + "");
 
@@ -135,40 +178,7 @@ public class RaceData {
         }
 
         raceElement.appendChild(courseLimitElement);
-
-
-            // write the content into xml file
-            TransformerFactory transformerFactory = TransformerFactory.newInstance();
-            Transformer transformer = transformerFactory.newTransformer();
-            DOMSource source = new DOMSource(doc);
-
-            //Serialize document.
-            StringWriter stringWriter = new StringWriter();
-            StreamResult result = new StreamResult(stringWriter);
-            transformer.transform(source,result);
-
-            return stringWriter.toString();
-
-
-        } catch (ParserConfigurationException pce) {
-            throw new InvalidRaceDataException();
-        } catch (TransformerException tfe) {
-            throw new InvalidRaceDataException();
     }
-    }
-
-    private void appendRaceId() {
-        Element raceIdElement = doc.createElement("RaceID");
-        raceIdElement.appendChild(doc.createTextNode(dataSource.getRaceId()));
-        raceElement.appendChild(raceIdElement);
-    }
-
-    private void appendRaceType() {
-        Element raceTypeElement = doc.createElement("RaceType");
-        raceTypeElement.appendChild(doc.createTextNode(dataSource.getRaceType()));
-        raceElement.appendChild(raceTypeElement);
-    }
-
 
 
 }

mock/src/test/java/seng302/Data/RaceDataTest.java

@@ -81,6 +81,4 @@ public class RaceDataTest {
     }
 
 
-
-
 }