#67 Improves constructor of CreateJoinTournamentState, with consequences....

#67 Improves constructor of CreateJoinTournamentState, with consequences. Removes an unnecessary comment. Fixes checing of finished tournament.

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{

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(){

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(){

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)); }

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(){