Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Johan Gustav Thrane-Nielsen
inf101.v20.sem2.losning
Commits
f7f59cda
Commit
f7f59cda
authored
Mar 25, 2020
by
Anna Maria Eilertsen
Browse files
refactoring: rename
parent
c9d700d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/inf101/v20/sem2/mnkgames/GUI/MNKGameGUI.java
View file @
f7f59cda
...
...
@@ -55,12 +55,12 @@ s * Initializes a JFrame in which we place the game
private
Grid
<
GamePanel
>
clickablePanels
;
private
GameSupplier
gameSupplier
;
private
boolean
multiplayer
;
private
TwoPlayerGame
helperG
ame
;
private
TwoPlayerGame
g
ame
;
public
MNKGameGUI
(
GameSupplier
gameSupplier
)
{
this
.
gameSupplier
=
gameSupplier
;
//initialize to default values
helperG
ame
=
new
TwoPlayerGame
(
gameSupplier
.
getTicTacToeGame
());
g
ame
=
new
TwoPlayerGame
(
gameSupplier
.
getTicTacToeGame
());
}
/*
...
...
@@ -80,8 +80,8 @@ s * Initializes a JFrame in which we place the game
}
}
private
void
reset
(
MNKGame
g
ame
)
{
this
.
helperGame
=
helperG
ame
.
getNewGame
(
g
ame
);
private
void
reset
(
MNKGame
newG
ame
)
{
this
.
game
=
g
ame
.
getNewGame
(
newG
ame
);
updateMessage
();
removeAll
();
initialize
();
...
...
@@ -95,7 +95,7 @@ s * Initializes a JFrame in which we place the game
clickablePanels
.
forEach
(
item
->
item
.
updateToGame
());
updateMessage
();
MNKGameGUI
.
super
.
updateUI
();
if
(!
helperG
ame
.
hasPossibleMoves
())
{
if
(!
g
ame
.
hasPossibleMoves
())
{
stop
();
}
}
...
...
@@ -104,10 +104,10 @@ s * Initializes a JFrame in which we place the game
* Helper method to control the status message
*/
private
void
updateMessage
()
{
if
(
helperG
ame
.
hasWinner
())
statusMessage
.
setText
(
"The game is over! The winner is "
+
helperG
ame
.
getWinner
());
else
if
(
helperG
ame
.
hasPossibleMoves
())
{
statusMessage
.
setText
(
"Next move from "
+
helperG
ame
.
getCurrentPlayer
());
if
(
g
ame
.
hasWinner
())
statusMessage
.
setText
(
"The game is over! The winner is "
+
g
ame
.
getWinner
());
else
if
(
g
ame
.
hasPossibleMoves
())
{
statusMessage
.
setText
(
"Next move from "
+
g
ame
.
getCurrentPlayer
());
}
else
{
statusMessage
.
setText
(
"The game is over! No one won."
);
}
...
...
@@ -144,7 +144,7 @@ s * Initializes a JFrame in which we place the game
@Override
public
Dimension
getPreferredSize
()
{
return
new
Dimension
(
100
*
helperG
ame
.
height
(),
100
*
helperG
ame
.
width
());
return
new
Dimension
(
100
*
g
ame
.
height
(),
100
*
g
ame
.
width
());
}
/**
...
...
@@ -171,7 +171,7 @@ s * Initializes a JFrame in which we place the game
}
private
void
updateToGame
()
{
setBackground
(
pieceToColor
(
helperG
ame
.
getPieceAt
(
x
,
y
)));
setBackground
(
pieceToColor
(
g
ame
.
getPieceAt
(
x
,
y
)));
if
(
filled
())
{
makeUnClickable
();
}
...
...
@@ -182,11 +182,11 @@ s * Initializes a JFrame in which we place the game
}
private
boolean
filled
()
{
return
helperG
ame
.
getPieceAt
(
x
,
y
)
!=
Piece
.
NONE
;
return
g
ame
.
getPieceAt
(
x
,
y
)
!=
Piece
.
NONE
;
}
public
void
click
()
{
helperG
ame
.
takeTurnforHumanPlayer
(
x
,
y
);
g
ame
.
takeTurnforHumanPlayer
(
x
,
y
);
endOfTurn
();
}
...
...
@@ -197,7 +197,7 @@ s * Initializes a JFrame in which we place the game
@Override
public
Color
getBackground
()
{
return
pieceToColor
(
helperG
ame
.
getPieceAt
(
x
,
y
));
return
pieceToColor
(
g
ame
.
getPieceAt
(
x
,
y
));
}
}
...
...
@@ -207,11 +207,11 @@ s * Initializes a JFrame in which we place the game
public
void
initialize
()
{
setLayout
(
new
BorderLayout
());
JPanel
p
=
new
JPanel
();
p
.
setLayout
(
new
GridLayout
(
helperG
ame
.
height
(),
helperG
ame
.
width
()));
p
.
setLayout
(
new
GridLayout
(
g
ame
.
height
(),
g
ame
.
width
()));
p
.
setBorder
(
BorderFactory
.
createEmptyBorder
(
50
,
50
,
50
,
50
));
this
.
clickablePanels
=
new
Grid
<
GamePanel
>(
helperG
ame
.
width
(),
helperG
ame
.
height
(),
null
);
for
(
int
y
=
0
;
y
<
helperG
ame
.
height
();
y
++)
{
for
(
int
x
=
0
;
x
<
helperG
ame
.
width
();
x
++)
{
this
.
clickablePanels
=
new
Grid
<
GamePanel
>(
g
ame
.
width
(),
g
ame
.
height
(),
null
);
for
(
int
y
=
0
;
y
<
g
ame
.
height
();
y
++)
{
for
(
int
x
=
0
;
x
<
g
ame
.
width
();
x
++)
{
GamePanel
pan
=
new
GamePanel
(
x
,
y
);
pan
.
setEnabled
(
true
);
pan
.
setBorder
(
BorderFactory
.
createLineBorder
(
Color
.
GRAY
));
...
...
@@ -245,7 +245,7 @@ s * Initializes a JFrame in which we place the game
playConnectFourButton
.
setText
(
"Connect Four"
);
statusMessage
=
new
JLabel
();
statusMessage
.
setText
(
"Welcome to this game! "
+
helperG
ame
.
player1
()
+
" begins."
);
statusMessage
.
setText
(
"Welcome to this game! "
+
g
ame
.
player1
()
+
" begins."
);
JPanel
buttons
=
new
JPanel
();
buttons
.
setLayout
(
new
BorderLayout
());
...
...
@@ -260,12 +260,12 @@ s * Initializes a JFrame in which we place the game
private
void
collectPlayerInfo
()
{
JFrame
frame
=
new
JFrame
();
multiplayer
=
promptMultiplayer
(
frame
);
helperG
ame
.
setHumanPlayer1
(
promptPlayerName
(
frame
,
"Player 1"
));
g
ame
.
setHumanPlayer1
(
promptPlayerName
(
frame
,
"Player 1"
));
if
(
multiplayer
)
{
helperG
ame
.
setHumanPlayer2
(
promptPlayerName
(
frame
,
"Player 2"
));
g
ame
.
setHumanPlayer2
(
promptPlayerName
(
frame
,
"Player 2"
));
}
else
{
helperG
ame
.
setAIPlayer2
();
g
ame
.
setAIPlayer2
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment