ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

list all games in gameschedule 

prevent nullpointer exception for empty games
This commit is contained in:
Andrin Fassbind 2022-05-06 19:26:34 +02:00
parent e5dc6a913a
commit de728745f6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
View File

@ -94,18 +94,18 @@ public class Tournament implements Serializable {
private void calcGameSchedule() { private void calcGameSchedule() {
Collections.shuffle(participants); Collections.shuffle(participants);
for (int i = 0; i < (Math.log(participants.size()) / Math.log(2)); i++) { for (int i = 0; i <= (Math.log(participants.size()) / Math.log(2)); i++) {
List<Game> gameRound = new ArrayList<>(); List<Game> gameRound = new ArrayList<>();
if (i == 0) { if (i == 0) {
for (int j = 0; j < participants.size() - 1; j += 2) { for (int j = 0; j < participants.size() - 1; j += 2) {
gameRound.add(new Game(participants.get(j), participants.get(j+1))); gameRound.add(new Game(participants.get(j), participants.get(j+1)));
} }
gameList.add(gameRound);
} else { } else {
for (int j = 0; j < (participants.size() / Math.pow(2,i)); j++) { for (int j = 0; j < (participants.size() / Math.pow(2,i)); j++) {
gameRound.add(new Game(null,null)); gameRound.add(new Game(null,null));
} }
} }
gameList.add(gameRound);
} }
} }

10
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
View File

@ -37,11 +37,17 @@ public class GameDecorator {
} }
public String getParticipantOne() { public String getParticipantOne() {
return game.getParticipant1().getName(); if (game.getParticipant1() != null) {
return game.getParticipant1().getName();
}
return "1";
} }
public String getParticipantTwo() { public String getParticipantTwo() {
return game.getParticipant2().getName(); if (game.getParticipant2() != null) {
return game.getParticipant2().getName();
}
return "2";
} }
public Place getLocation() { public Place getLocation() {