a3ccd75f4c
Merge remote-tracking branch 'origin/sprint4_master' into Story877
...
# Conflicts:
# mock/src/main/java/seng302/DataInput/BoatXMLReader.java
# mock/src/main/java/seng302/DataInput/XMLReader.java
# mock/src/main/java/seng302/Model/Boat.java
# mock/src/main/java/seng302/Model/CompoundMark.java
# mock/src/main/java/seng302/Model/Leg.java
# mock/src/main/java/seng302/Model/Mark.java
# mock/src/main/java/seng302/Model/Marker.java
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Model/LegTest.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
9 years ago
671d62aeb1
Added Important and Partial Annotations and other refactors and documentation.
...
- Important, Partial, Hidden, Visible are all radiobuttons
- Fixed bug where the Visualiser would end the race before the last boat had finished
- Refactored the visualiser and the mock to use the race finished status message
- Added and Changed many Javadocs
#story[877]
9 years ago
60458f0f7a
Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.
...
This commit (7990ac9d2e
9 years ago
be9f19eae5
Mock.Polars:
...
Finished PolarsTest test cases.
Fixed a number of javadoc errors across the codebase.
#story[873]
9 years ago
f31a987787
Reads BoatDataSource into StreamedCourseXMLReader so the latter can function as a single source of static information for the race.
...
- Mock.StreamedCourseXMLReader populates participant and mark list from BoatDataSource
- Added CompoundMarker class to accommodate Mark data from Boat XML
- Had to check for Yacht type in Visualiser.BoatXMLReader
- Added a missing coordinate value to raceTest.xml
- Marker class still exists due to large number of tests, which should be transitioned to CompoundMark
- IMPORTANT: race is no longer functional
#story[881]
9 years ago
43757b34d1
General code tidy up (Visualiser)
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
2d983eccfd
General code tidy up
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
62ecd40967
fixed all java doc errors
...
#story[782]
9 years ago
41a94495aa
Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]
9 years ago
10dd066302
Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782]
9 years ago
06e65c2cd2
Generate StreamedCourse from VisualiserInput
...
- Allow Race to get boat location messages (added last commit)
- Removed faulty import statement (this commit)
#story[782]
9 years ago
68a8f64fd3
Generate StreamedCourse from VisualiserInput
...
#story[782]
9 years ago
39d3cc7c28
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
9 years ago
f377cf6471
Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782]
9 years ago
3461a2c0b7
Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
9 years ago
22075ee415
Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861]
9 years ago
Fan-Wu Yang
fjc40
cbt24
Jessica McAuslin
hba56
Joseph Gardner