Jessica McAuslin
cf0adb8511
Fixed JavaDoc, spelling errors, and redundant classes
...
- Removed some default templates (eg: created by X)
- Wrote JavaDoc for classes that had none
- Made JavaDoc more clear for classes
- Linked JavaDoc to other classes
- Minor spelling errors fixed
- BoatInRace and BoatInRaceTest commented out (to be removed)
#story[1003]
9 years ago
cbt24
2126c44db9
Last minute changes to get ready for DoD
...
#story[875]
9 years ago
Fan-Wu Yang
7bfb6bb968
Merge remote-tracking branch 'origin/49Mock' into Story49Vis
...
# Conflicts:
# visualiser/src/test/java/seng302/Model/RaceXMLTest.java
9 years ago
Fan-Wu Yang
f8c6e500fb
Deleted deprecated Race XML reader
...
- Deleted RaceXMLReader class
- Deleted Corresponding Tests
#story[882]
9 years ago
Erika Savell
493932b93f
Merged with visualiser side of mark boats
...
#story[881]
9 years ago
Erika Savell
0ed02962a1
Merge branch 'Story49Vis' into 49Mock
...
# Conflicts:
# visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java
# visualiser/src/main/java/seng302/Model/CompoundMark.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
Jessica McAuslin
d294ee7994
Deleted redundant and deprecated code (Visualiser)
...
- References to deprecated objects replaced
- Deprecated Constants class removed
- general redundant code deleted
9 years ago
cbt24
91b1773703
Commented out obsolete tests, may be useful if refactored.
...
#story[881]
9 years ago
cbt24
69cd44bda8
Reads data from boat XML file
...
- Creates marks for building CompoundMarks (formerly Markers)
- Rearranged Boat constructor and removed velocity
#story[782]
9 years ago
Jessica McAuslin
2d983eccfd
General code tidy up
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
David Wu
b60b4b257f
Remove start button from StartController.
...
#story[778]
9 years ago
Connor Taylor-Brown
8886b5db05
Fixed RegattaXMLTest.
...
#story[782]
9 years ago
Connor Taylor-Brown
5a92dd68f5
Fixed build and interface problems.
...
- Ignore online host test (fails on CI)
- Disable connect button on startup to prevent bad socket
#story[782]
9 years ago
Connor Taylor-Brown
ac4fbda848
Added connection screen to allow users to select available hosts from a preconfigured list.
...
- Added ConnectionController for initial client setup
- Added RaceConnection class for socket data and checking
- Configures StartController with a socket drawn from a host table
#story[782]
9 years ago
Joseph Gardner
32dabdb187
Fixed course xml reader. #story[782]
9 years ago
Erika Savell
185c65e54d
Editing MockOutput to send actual generated boat/race/regatta xmls
...
- Was previously sending from a static source file
#story[778]
9 years ago
cbt24
3f42d56502
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
cbt24
b1db9ee5be
Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
cbt24
ccbe467090
Synchronised GUI with VisualiserInput thread.
...
- Made StreamedCourse extend Observable
- Initialised StartController after data pulled from network
- Moved VisualiserInput to visualiser module
- Deleted Networking subpackage from visualiser module
#story[782]
9 years ago
Joseph Gardner
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
Joseph Gardner
d977d3f146
Merge branch 'visualiserAndDataLink' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/Mock/BoatXMLReader.java
# visualiser/src/main/java/seng302/Mock/StreamedBoat.java
# visualiser/src/main/java/seng302/Mock/StreamedCourse.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/BoatInRace.java
# visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java
# visualiser/src/main/java/seng302/Model/Race.java
# visualiser/src/main/java/seng302/RaceXMLReader.java
# visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java
9 years ago
Joseph Gardner
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
cbt24
7d35312644
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
cbt24
5f3f3770bb
Temporarily ignore out-of-bound race markers in testing.
...
#story[758]
9 years ago
fjc40
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Connor Taylor-Brown
02511db2b9
Implemented marker visualisation from XML in ResizableRaceCanvas
...
- Replaced and deprecated Constants
- Added getMarkers to RaceDataSource interface
- Added boundary testing for source data
#story[782]
9 years ago
Erika Savell
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
cbt24
cb40302c13
Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
9 years ago
cbt24
1653003cf0
Implemented Leg generation from Race.xml format
...
- StreamedCourse now utilises StreamedCourseXMLReader as data source
#story[758]
9 years ago
Joseph Gardner
26380f2677
Merge branch 'story30_XMLs' into splitIntoTwoModules
9 years ago
Joseph Gardner
a3e87f2c61
Got rid of test using a deprecated method
9 years ago
Joseph Gardner
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
cbt24
a59342a668
Modified RaceClock to support arbitrary start times
...
- Amended RaceDataSource interface to require time instead of mark for calculating time.
#story[758]
9 years ago
hba56
e9578fc63b
refactored networking code from networkingTest
...
#story[778, 782]
9 years ago
Joseph
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
Joseph Gardner
0d0b9e143f
Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]
9 years ago
Joseph Gardner
9e3ca68df8
added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]
9 years ago
Joseph Gardner
a85bf292d5
new branch for xml readers for the visuliser
9 years ago
Erika Savell
a584400e24
Actually added sub modules this time
...
#story[778]
9 years ago