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

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]

Browse Source
This commit is contained in:
Joseph Gardner
2017-04-28 12:35:00 +12:00
parent 3d284c4a2b
commit f377cf6471
16 changed files with 572 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Controllers/RaceController.java
+6 -6
View File
@@ -61,15 +61,15 @@ public class RaceController extends Controller {
Button showSetAnno;
@FXML
TableView<BoatInRace> boatInfoTable;
TableView<Boat> boatInfoTable;
@FXML
TableColumn<BoatInRace, String> boatPlacingColumn;
TableColumn<Boat, String> boatPlacingColumn;
@FXML
TableColumn<BoatInRace, String> boatTeamColumn;
TableColumn<Boat, String> boatTeamColumn;
@FXML
TableColumn<BoatInRace, String> boatMarkColumn;
TableColumn<Boat, String> boatMarkColumn;
@FXML
TableColumn<BoatInRace, String> boatSpeedColumn;
TableColumn<Boat, String> boatSpeedColumn;
/**
* Updates the ResizableRaceCanvas (raceMap) with most recent data
@@ -77,7 +77,7 @@ public class RaceController extends Controller {
* @param boats boats that are to be displayed in the race
* @see ResizableRaceCanvas
*/
public void updateMap(ObservableList<BoatInRace> boats) {
public void updateMap(ObservableList<Boat> boats) {
raceMap.setBoats(boats);
raceMap.update();
}