michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the start screen team list after merging. Team list shows boats competing in event again.

Browse Source 
#story[572]
This commit is contained in:
Zhi You Tan
2017-05-02 18:52:31 +12:00
parent 3af15b2b95
commit 8233b75e05
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/Controller.java
+5 -6
View File
@@ -15,7 +15,6 @@ import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane;
import javafx.scene.paint.Color;
import seng302.models.Boat;
import seng302.models.parsers.StreamParser;
import seng302.models.parsers.XMLParser;
@@ -124,18 +123,18 @@ public class Controller implements Initializable {
}
private void updateTeamList() {
ObservableList<Boat> data = FXCollections.observableArrayList();
ObservableList<XMLParser.BoatXMLObject.Boat> data = FXCollections.observableArrayList();
teamList.setItems(data);
boatNameCol.setCellValueFactory(
new PropertyValueFactory<Boat,String>("boatName")
new PropertyValueFactory<XMLParser.BoatXMLObject.Boat,String>("BoatName")
);
shortNameCol.setCellValueFactory(
new PropertyValueFactory<Boat,String>("shortName")
new PropertyValueFactory<XMLParser.BoatXMLObject.Boat,String>("ShortName")
);
countryCol.setCellValueFactory(
new PropertyValueFactory<Boat,String>("country")
new PropertyValueFactory<XMLParser.BoatXMLObject.Boat,String>("Country")
);
for (Boat boat : StreamParser.getBoats()) {
for (XMLParser.BoatXMLObject.Boat boat : StreamParser.getBoats()) {
data.add(boat);
}
}