r0r-5chach/CSY2030-assignment-2
r0r-5chach
/
CSY2030-assignment-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unused code

This commit is contained in:
Joshua Perry 2023-02-01 20:52:36 +00:00
parent 80104c764c
commit 97db7ccdfc
3 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/r0r5chach/CompetitorList.java
View File

@ -31,10 +31,6 @@ public class CompetitorList {
reportContents = reportTemplate();
}
public String getReportContents() {
return reportContents;
}
public ArrayList<Competitor> getCompetitors() {
return competitors;
}

14
src/main/java/com/r0r5chach/MainController.java
View File

@ -106,8 +106,8 @@ public class MainController implements Initializable {
}
public void setCompetitors(CompetitorList list) {
this.competitors = list;
public void setCompetitors(CompetitorList competitors) {
this.competitors = competitors;
}
@FXML
@ -133,15 +133,15 @@ public class MainController implements Initializable {
}
private void loadCompetitors(){
this.competitorIds = new ArrayList<Integer>();
for (Competitor player : this.competitors.getCompetitors()) {
this.competitorIds.add(player.getPlayerNumber());
competitorIds = new ArrayList<Integer>();
for (Competitor player : competitors.getCompetitors()) {
competitorIds.add(player.getPlayerNumber());
}
}
@FXML
private void loadEdit() {
competitorsList.setItems(FXCollections.observableList(this.competitorIds));
competitorsList.setItems(FXCollections.observableList(competitorIds));
playerLevel.setItems(FXCollections.observableList(Arrays.asList(Rank.values())));
favoriteAttacker.setItems(FXCollections.observableList(Arrays.asList(R6Attacker.values())));
favoriteDefender.setItems(FXCollections.observableList(Arrays.asList(R6Defender.values())));
@ -150,6 +150,6 @@ public class MainController implements Initializable {
@FXML
private void loadView() {
competitorTable.setItems(loadTable(this.competitors.getCompetitors()));
competitorTable.setItems(loadTable(competitors.getCompetitors()));
}
}

48
src/main/java/com/r0r5chach/pages/CompetitorRow.java
View File

@ -26,9 +26,9 @@ public class CompetitorRow {
this.playerName = new SimpleStringProperty(playerName.getFullName());
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
this.favoriteAgent = new SimpleStringProperty("N/A");
this.favoriteAttacker = new SimpleStringProperty("N/A");
this.favoriteDefender = new SimpleStringProperty("N/A");
favoriteAgent = new SimpleStringProperty("N/A");
favoriteAttacker = new SimpleStringProperty("N/A");
favoriteDefender = new SimpleStringProperty("N/A");
}
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, ValorantAgent favoriteAgent) {
@ -37,8 +37,8 @@ public class CompetitorRow {
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
this.favoriteAgent = new SimpleStringProperty(favoriteAgent.getAgent());
this.favoriteAttacker = new SimpleStringProperty("N/A");
this.favoriteDefender = new SimpleStringProperty("N/A");
favoriteAttacker = new SimpleStringProperty("N/A");
favoriteDefender = new SimpleStringProperty("N/A");
}
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, R6Attacker favoriteAttacker, R6Defender favoriteDefender) {
@ -46,52 +46,30 @@ public class CompetitorRow {
this.playerNumber = new SimpleIntegerProperty(playerNumber);
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
this.favoriteAgent = new SimpleStringProperty("N/A");
favoriteAgent = new SimpleStringProperty("N/A");
this.favoriteAttacker = new SimpleStringProperty(favoriteAttacker.getAttacker());
this.favoriteDefender = new SimpleStringProperty(favoriteDefender.getDefender());
}
public void setPlayerNumber(int newValue) {
this.playerNumber.set(newValue);
}
public void setPlayerName(String newValue) {
this.playerName.set(newValue);
}
public void setPlayerLevel(Rank newValue) {
this.playerLevel.set(newValue);
}
public void setScores(String newValue) {
this.scores.set(newValue);
}
public void setFavoriteAgent(String newValue) {
this.favoriteAgent.set(newValue);
}
public void setFavoriteAttacker(String newValue) {
this.favoriteAttacker.set(newValue);
}
public void setFavoriteDefender(String newValue) {
this.favoriteDefender.set(newValue);
}
public int getPlayerNumber() {
return this.playerNumber.get();
return playerNumber.get();
}
public String getPlayerName() {
return this.playerName.get();
return playerName.get();
}
public Rank getPlayerLevel() {
return this.playerLevel.get();
return playerLevel.get();
}
public String getScores() {
return this.scores.get();
return scores.get();
}
public String getFavoriteAgent() {
return this.favoriteAgent.get();
return favoriteAgent.get();
}
public String getFavoriteAttacker() {
return this.favoriteAttacker.get();
return favoriteAttacker.get();
}
public String getFavoriteDefender() {
return this.favoriteDefender.get();
return favoriteDefender.get();
}
}