Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Progark gruppe 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Ingebrigt Ørstad
Progark gruppe 3
Commits
899d17e8
Commit
899d17e8
authored
5 years ago
by
Turid Cecilie Dahl
Browse files
Options
Downloads
Patches
Plain Diff
#45
CreateJoinState done connecting to DB
parent
5c6737c0
No related branches found
No related tags found
1 merge request
!38
Resolve "TournamentHighScoreState"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/core/src/com/gameware/game/GameWare.java
+20
-0
20 additions, 0 deletions
frontend/core/src/com/gameware/game/GameWare.java
frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+6
-7
6 additions, 7 deletions
...c/com/gameware/game/states/CreateJoinTournamentState.java
with
26 additions
and
7 deletions
frontend/core/src/com/gameware/game/GameWare.java
+
20
−
0
View file @
899d17e8
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+
6
−
7
View file @
899d17e8
...
@@ -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
{
//
QueryInterm
i
diate.leaveTournament(
String
GameWare.getPlayer().getId()
, t.get_id()
);
QueryInterm
e
diate
.
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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment