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
Quentin DRUAULT-AUBIN
lo23-project
Commits
a65b934b
Commit
a65b934b
authored
Dec 14, 2017
by
Quentin DRUAULT-AUBIN
Browse files
[Ship] Call getTemplateShips
parent
c76ce055
Changes
1
Hide whitespace changes
Inline
Side-by-side
Battleship/src/main/java/com/utclo23/ihmtable/controller/InGameGUIController.java
View file @
a65b934b
...
...
@@ -327,22 +327,12 @@ public class InGameGUIController {
startPosition
=
null
;
endPosition
=
null
;
// Get the ships.
// TODO: ships = facade.getFacadeData().getTemplateShips();
ships
=
new
ArrayList
<>();
ships
.
add
(
new
Ship
(
ShipType
.
BATTLESHIP
,
4
));
ships
.
add
(
new
Ship
(
ShipType
.
BATTLESHIP
,
4
));
ships
.
add
(
new
Ship
(
ShipType
.
CARRIER
,
4
));
ships
.
add
(
new
Ship
(
ShipType
.
CRUISER
,
3
));
ships
.
add
(
new
Ship
(
ShipType
.
DESTROYER
,
2
));
ships
.
add
(
new
Ship
(
ShipType
.
SUBMARINE
,
2
));
ships
.
add
(
new
Ship
(
ShipType
.
BATTLESHIP
,
4
));
ships
.
add
(
new
Ship
(
ShipType
.
BATTLESHIP
,
4
));
ships
.
add
(
new
Ship
(
ShipType
.
CARRIER
,
4
));
ships
.
add
(
new
Ship
(
ShipType
.
CRUISER
,
3
));
ships
.
add
(
new
Ship
(
ShipType
.
DESTROYER
,
2
));
ships
.
add
(
new
Ship
(
ShipType
.
SUBMARINE
,
2
));
try
{
// Get the ships.
ships
=
facade
.
getFacadeData
().
getTemplateShips
();
}
catch
(
DataException
ex
)
{
Logger
.
getLogger
(
InGameGUIController
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
}
//Add manually the button to set them up
mapBtnType
=
new
HashMap
<>();
...
...
Write
Preview
Supports
Markdown
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