removed unused code
This commit is contained in:
parent
80104c764c
commit
97db7ccdfc
|
|
@ -31,10 +31,6 @@ public class CompetitorList {
|
||||||
reportContents = reportTemplate();
|
reportContents = reportTemplate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getReportContents() {
|
|
||||||
return reportContents;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ArrayList<Competitor> getCompetitors() {
|
public ArrayList<Competitor> getCompetitors() {
|
||||||
return competitors;
|
return competitors;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -106,8 +106,8 @@ public class MainController implements Initializable {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCompetitors(CompetitorList list) {
|
public void setCompetitors(CompetitorList competitors) {
|
||||||
this.competitors = list;
|
this.competitors = competitors;
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
|
@ -133,15 +133,15 @@ public class MainController implements Initializable {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadCompetitors(){
|
private void loadCompetitors(){
|
||||||
this.competitorIds = new ArrayList<Integer>();
|
competitorIds = new ArrayList<Integer>();
|
||||||
for (Competitor player : this.competitors.getCompetitors()) {
|
for (Competitor player : competitors.getCompetitors()) {
|
||||||
this.competitorIds.add(player.getPlayerNumber());
|
competitorIds.add(player.getPlayerNumber());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void loadEdit() {
|
private void loadEdit() {
|
||||||
competitorsList.setItems(FXCollections.observableList(this.competitorIds));
|
competitorsList.setItems(FXCollections.observableList(competitorIds));
|
||||||
playerLevel.setItems(FXCollections.observableList(Arrays.asList(Rank.values())));
|
playerLevel.setItems(FXCollections.observableList(Arrays.asList(Rank.values())));
|
||||||
favoriteAttacker.setItems(FXCollections.observableList(Arrays.asList(R6Attacker.values())));
|
favoriteAttacker.setItems(FXCollections.observableList(Arrays.asList(R6Attacker.values())));
|
||||||
favoriteDefender.setItems(FXCollections.observableList(Arrays.asList(R6Defender.values())));
|
favoriteDefender.setItems(FXCollections.observableList(Arrays.asList(R6Defender.values())));
|
||||||
|
|
@ -150,6 +150,6 @@ public class MainController implements Initializable {
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void loadView() {
|
private void loadView() {
|
||||||
competitorTable.setItems(loadTable(this.competitors.getCompetitors()));
|
competitorTable.setItems(loadTable(competitors.getCompetitors()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -26,9 +26,9 @@ public class CompetitorRow {
|
||||||
this.playerName = new SimpleStringProperty(playerName.getFullName());
|
this.playerName = new SimpleStringProperty(playerName.getFullName());
|
||||||
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
|
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
|
||||||
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
|
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
|
||||||
this.favoriteAgent = new SimpleStringProperty("N/A");
|
favoriteAgent = new SimpleStringProperty("N/A");
|
||||||
this.favoriteAttacker = new SimpleStringProperty("N/A");
|
favoriteAttacker = new SimpleStringProperty("N/A");
|
||||||
this.favoriteDefender = new SimpleStringProperty("N/A");
|
favoriteDefender = new SimpleStringProperty("N/A");
|
||||||
}
|
}
|
||||||
|
|
||||||
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, ValorantAgent favoriteAgent) {
|
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.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
|
||||||
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
|
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
|
||||||
this.favoriteAgent = new SimpleStringProperty(favoriteAgent.getAgent());
|
this.favoriteAgent = new SimpleStringProperty(favoriteAgent.getAgent());
|
||||||
this.favoriteAttacker = new SimpleStringProperty("N/A");
|
favoriteAttacker = new SimpleStringProperty("N/A");
|
||||||
this.favoriteDefender = new SimpleStringProperty("N/A");
|
favoriteDefender = new SimpleStringProperty("N/A");
|
||||||
}
|
}
|
||||||
|
|
||||||
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, R6Attacker favoriteAttacker, R6Defender favoriteDefender) {
|
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.playerNumber = new SimpleIntegerProperty(playerNumber);
|
||||||
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
|
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
|
||||||
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
|
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
|
||||||
this.favoriteAgent = new SimpleStringProperty("N/A");
|
favoriteAgent = new SimpleStringProperty("N/A");
|
||||||
this.favoriteAttacker = new SimpleStringProperty(favoriteAttacker.getAttacker());
|
this.favoriteAttacker = new SimpleStringProperty(favoriteAttacker.getAttacker());
|
||||||
this.favoriteDefender = new SimpleStringProperty(favoriteDefender.getDefender());
|
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() {
|
public int getPlayerNumber() {
|
||||||
return this.playerNumber.get();
|
return playerNumber.get();
|
||||||
}
|
}
|
||||||
public String getPlayerName() {
|
public String getPlayerName() {
|
||||||
return this.playerName.get();
|
return playerName.get();
|
||||||
}
|
}
|
||||||
public Rank getPlayerLevel() {
|
public Rank getPlayerLevel() {
|
||||||
return this.playerLevel.get();
|
return playerLevel.get();
|
||||||
}
|
}
|
||||||
public String getScores() {
|
public String getScores() {
|
||||||
return this.scores.get();
|
return scores.get();
|
||||||
}
|
}
|
||||||
public String getFavoriteAgent() {
|
public String getFavoriteAgent() {
|
||||||
return this.favoriteAgent.get();
|
return favoriteAgent.get();
|
||||||
}
|
}
|
||||||
public String getFavoriteAttacker() {
|
public String getFavoriteAttacker() {
|
||||||
return this.favoriteAttacker.get();
|
return favoriteAttacker.get();
|
||||||
}
|
}
|
||||||
public String getFavoriteDefender() {
|
public String getFavoriteDefender() {
|
||||||
return this.favoriteDefender.get();
|
return favoriteDefender.get();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue