From 48d771648469874bf93bb216965c1d50d1657a8d Mon Sep 17 00:00:00 2001
From: Haakon Gunleiksrud <haakogun@stud.ntnu.no>
Date: Thu, 2 Apr 2020 15:50:11 +0200
Subject: [PATCH] #67 Improves constructor of CreateJoinTournamentState, with
consequences. Removes an unnecessary comment. Fixes checing of finished
tournament.
---
.../gameware/game/states/CreateJoinTournamentState.java | 7 ++++---
.../com/gameware/game/states/CreateNewTournamentState.java | 2 +-
.../com/gameware/game/states/FinishedTournamentState.java | 6 ++----
frontend/core/src/com/gameware/game/states/MenuState.java | 2 +-
.../src/com/gameware/game/states/ViewTournamentState.java | 4 ++--
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
index d9c52ed..f917f99 100644
--- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
@@ -84,10 +84,11 @@ public class CreateJoinTournamentState extends State {
}
- public CreateJoinTournamentState(GameStateManager gsm, Boolean includeFin) {
+ public CreateJoinTournamentState(GameStateManager gsm) {
super(gsm);
- includeFinishedTournaments = includeFin;
+
+ includeFinishedTournaments = GameWare.getInstance().getIncludeFin();
try{
tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId(),true);
@@ -310,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){
+ if(!t.isActive()){
gsm.set(new FinishedTournamentState(gsm,t));
}
else{
diff --git a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
index e478160..d6495de 100644
--- a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
@@ -195,7 +195,7 @@ public class CreateNewTournamentState extends State {
private void handleCancelBtnClick() {
- gsm.set(new CreateJoinTournamentState(gsm,GameWare.getInstance().getIncludeFin()));
+ gsm.set(new CreateJoinTournamentState(gsm));
}
private void handleCreateBtnClick(){
diff --git a/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java b/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java
index 887bae6..12cd600 100644
--- a/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java
@@ -45,8 +45,6 @@ public class FinishedTournamentState extends State {
private List<Point> points = new ArrayList<>();
public class LeaveClickListener extends ClickListener{
- //TODO: if (tournamentpoints != null && currentRoundNr == (tournament.totalGames) -> gå til finished state
-
public void clicked(InputEvent event, float x, float y) {
handleLeaveBtnClick();
};
@@ -117,7 +115,7 @@ public class FinishedTournamentState extends State {
if(obj.equals(true)){
try {
QueryIntermediate.leaveTournament(tournament.get_id(), GameWare.getInstance().getPlayer().getId());
- CreateJoinTournamentState state = new CreateJoinTournamentState(gsm,GameWare.getInstance().getIncludeFin());
+ CreateJoinTournamentState state = new CreateJoinTournamentState(gsm);
state.tournamentFeedbackLabel.setText(state.leftTournamentText+tournament.getName());
gsm.set(state);
} catch(Exception e){
@@ -168,7 +166,7 @@ public class FinishedTournamentState extends State {
public void reset() { }
private void handleBackBtnClick(){
- gsm.set(new CreateJoinTournamentState(gsm,GameWare.getInstance().getIncludeFin()));
+ gsm.set(new CreateJoinTournamentState(gsm));
}
private void handleLeaveBtnClick(){
diff --git a/frontend/core/src/com/gameware/game/states/MenuState.java b/frontend/core/src/com/gameware/game/states/MenuState.java
index 8e5c8cc..4a53d25 100644
--- a/frontend/core/src/com/gameware/game/states/MenuState.java
+++ b/frontend/core/src/com/gameware/game/states/MenuState.java
@@ -123,7 +123,7 @@ public class MenuState extends State{
}
private void handleMultiBtnClick(){
- gsm.set(new CreateJoinTournamentState(gsm,GameWare.getInstance().getIncludeFin()));
+ gsm.set(new CreateJoinTournamentState(gsm));
}
private void handleSingleBtnClick() { gsm.set(new SinglePlayerSelectGameState(gsm)); }
diff --git a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java
index c15541e..dd9814c 100644
--- a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java
@@ -86,7 +86,7 @@ public class ViewTournamentState extends State {
if(obj.equals(true)){
try {
QueryIntermediate.leaveTournament(tournament.get_id(), GameWare.getInstance().getPlayer().getId());
- CreateJoinTournamentState state = new CreateJoinTournamentState(gsm,GameWare.getInstance().getIncludeFin());
+ CreateJoinTournamentState state = new CreateJoinTournamentState(gsm);
state.tournamentFeedbackLabel.setText(state.leftTournamentText+tournament.getName());
gsm.set(state);
} catch(Exception e){
@@ -162,7 +162,7 @@ public class ViewTournamentState extends State {
public void reset() { }
private void handleBackBtnClick(){
- gsm.set(new CreateJoinTournamentState(gsm,GameWare.getInstance().getIncludeFin()));
+ gsm.set(new CreateJoinTournamentState(gsm));
}
private void handlePlayBtnClick(){
--
GitLab