Develope game branch #33

Merged
schrom01 merged 23 commits from develope_Game_branch into main 2022-05-12 13:44:47 +02:00
3 changed files with 9 additions and 1 deletions
Showing only changes of commit 89e72a1592 - Show all commits

View File

@ -93,6 +93,12 @@ public class FactoryDecorator implements IsObservable{
controller.addListener(gameDecorators.get(j*2)); controller.addListener(gameDecorators.get(j*2));
controller.addListener(gameDecorators.get(j*2+1)); controller.addListener(gameDecorators.get(j*2+1));
} }
gameDecorator.addListener(new IsObserver() {
@Override
public void update() {
tournamentDecorator.saveTournament();
}
});
controller.loadContent(); controller.loadContent();
} }
hBoxCenter.getChildren().add(vBox); hBoxCenter.getChildren().add(vBox);

View File

@ -39,6 +39,8 @@ public class GameController extends FXController{
participantNameTwo.setText(gameDecorator.getParticipantTwo()); participantNameTwo.setText(gameDecorator.getParticipantTwo());
pointsTeamOne.setText(String.valueOf(gameDecorator.getPoints1())); pointsTeamOne.setText(String.valueOf(gameDecorator.getPoints1()));
pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2())); pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2()));
placesChoiceBox.setItems(getTournamentDecorator().getTournament().getPlaces());
placesChoiceBox.setValue(gameDecorator.getPlace());
} }
public void refreshParticipants(){ public void refreshParticipants(){

View File

@ -57,7 +57,7 @@ public class GameDecorator implements IsObservable{
game.refreshParticipants(); game.refreshParticipants();
} }
public Place getLocation() { public Place getPlace() {
return game.getPlace(); return game.getPlace();
} }