From 3d671e62b344b694a33f58d65646727a170bf6fa Mon Sep 17 00:00:00 2001 From: Haakon Gunleiksrud <haakogun@stud.ntnu.no> Date: Thu, 2 Apr 2020 13:59:33 +0200 Subject: [PATCH] #67 Removes unnecessary code. --- .../com/gameware/game/states/CreateJoinTournamentState.java | 2 +- .../src/com/gameware/game/states/FinishedTournamentState.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java index 0ddb7de..d9c52ed 100644 --- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java @@ -311,7 +311,7 @@ public class CreateJoinTournamentState extends State { private void handleEnterBtnClick(Tournament t, Round r){ System.out.println("Entered tournament with id = "+ t.get_id()); if(r == null){ - gsm.set(new FinishedTournamentState(gsm,t,r)); + gsm.set(new FinishedTournamentState(gsm,t)); } else{ gsm.set(new ViewTournamentState(gsm, t, r)); diff --git a/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java b/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java index f1cd743..887bae6 100644 --- a/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java @@ -30,7 +30,6 @@ public class FinishedTournamentState extends State { private Table btnTable; private ScrollPane scrollPane; private Tournament tournament; - private Round round; private Dialog dialog; private int padding = 50; @@ -53,10 +52,9 @@ public class FinishedTournamentState extends State { }; } - public FinishedTournamentState(GameStateManager gsm, Tournament tournament, Round r) { + public FinishedTournamentState(GameStateManager gsm, Tournament tournament) { super(gsm); this.tournament = tournament; - this.round = r; tournamentNameText = new Label(tournament.getName(), skin, "big"); try { points = QueryIntermediate.getTournamentPoints(tournament.get_id()); -- GitLab