Skip to content
Snippets Groups Projects
Commit 899d17e8 authored by Turid Cecilie Dahl's avatar Turid Cecilie Dahl
Browse files

#45 CreateJoinState done connecting to DB

parent 5c6737c0
No related branches found
No related tags found
1 merge request!38Resolve "TournamentHighScoreState"
...@@ -43,6 +43,7 @@ public class GameWare extends ApplicationAdapter { ...@@ -43,6 +43,7 @@ public class GameWare extends ApplicationAdapter {
private static String darkModeLabelString = "default"; private static String darkModeLabelString = "default";
private Player player; private Player player;
private List<Game> games = new ArrayList<>(); private List<Game> games = new ArrayList<>();
// private List<Tournament> tournaments = new ArrayList<>();
public static Map<String, State> gameIdToPlayState = new HashMap<>(); public static Map<String, State> gameIdToPlayState = new HashMap<>();
...@@ -135,6 +136,25 @@ public class GameWare extends ApplicationAdapter { ...@@ -135,6 +136,25 @@ public class GameWare extends ApplicationAdapter {
} }
return games; return games;
} }
//
// public List<Tournament> getTournaments() throws IOException {
// if(tournaments.isEmpty()){
// tournaments = QueryIntermediate.getTournamentsForPlayer(player.getId());
// }
// return tournaments;
// }
//
// public void addTournament(Tournament t){
// if(!tournaments.contains(t)) {
// tournaments.add(t);
// }
// }
//
// public void removeTournament(Tournament t){
// if(tournaments.contains(t)){
// tournaments.remove(t);
// }
// }
public String getDarkModeLabelString(){ public String getDarkModeLabelString(){
return darkModeLabelString; return darkModeLabelString;
......
...@@ -70,8 +70,8 @@ public class CreateJoinTournamentState extends State { ...@@ -70,8 +70,8 @@ public class CreateJoinTournamentState extends State {
public CreateJoinTournamentState(GameStateManager gsm) { public CreateJoinTournamentState(GameStateManager gsm) {
super(gsm); super(gsm);
try{ try{
// tournaments = GameWare.getInstance().getTournaments();
tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId()); tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId());
System.out.println(tournaments);
}catch(Exception e){ }catch(Exception e){
System.out.println(e); System.out.println(e);
} }
...@@ -223,11 +223,10 @@ public class CreateJoinTournamentState extends State { ...@@ -223,11 +223,10 @@ public class CreateJoinTournamentState extends State {
private void handleLeaveBtnClick(Tournament t){ private void handleLeaveBtnClick(Tournament t){
System.out.println("Left tournament with id = "+ t.get_id()); System.out.println("Left tournament with id = "+ t.get_id());
//TODO: fjern remove og heller ha update eller noe når faktisk oppkobling
tournaments.remove(t); tournaments.remove(t);
try { try {
// QueryIntermidiate.leaveTournament(String GameWare.getPlayer().getId(), t.get_id()); QueryIntermediate.leaveTournament(t.get_id(), GameWare.getInstance().getPlayer().getId());
//tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getPlayer().getId()); // GameWare.getInstance().removeTournament(t);
//Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte //Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte
outerTable.remove(); outerTable.remove();
...@@ -244,9 +243,9 @@ public class CreateJoinTournamentState extends State { ...@@ -244,9 +243,9 @@ public class CreateJoinTournamentState extends State {
private void handleJoinBtnClick(){ private void handleJoinBtnClick(){
try { try {
QueryIntermediate.joinATournament(GameWare.getInstance().getPlayer().getId()); Tournament newT = QueryIntermediate.joinATournament(GameWare.getInstance().getPlayer().getId());
tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId()); // GameWare.getInstance().addTournament(newT);
tournaments.add(newT);
//Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte //Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte
outerTable.remove(); outerTable.remove();
makeStage(); makeStage();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment