diff --git a/src/battleship/model/player/Player.java b/src/battleship/model/player/Player.java index 8cd2ca0..325c578 100644 --- a/src/battleship/model/player/Player.java +++ b/src/battleship/model/player/Player.java @@ -13,7 +13,7 @@ public abstract class Player { protected ArrayList ships = new ArrayList<>(); protected ArrayList> moves = new ArrayList<>(); protected int id; - protected final int[] bato = { 5, 4, 3, 3, 2}; + protected final static int[] bato = { 5, 4, 3, 3, 2}; public boolean setShips(Ship ship) { if(ship.getDirection() == Direction.DEFAULT) diff --git a/src/battleship/view/Terminal.java b/src/battleship/view/Terminal.java index 38eb3bb..6096dfe 100644 --- a/src/battleship/view/Terminal.java +++ b/src/battleship/view/Terminal.java @@ -60,8 +60,6 @@ public class Terminal extends View { } - - @Override public void displayBoard() { System.out.println(toString()); diff --git a/src/battleship/view/View.java b/src/battleship/view/View.java index c5be070..284fc30 100644 --- a/src/battleship/view/View.java +++ b/src/battleship/view/View.java @@ -6,6 +6,7 @@ import battleship.model.player.Player; import battleship.utils.Pair; import battleship.utils.Triplet; +import java.awt.Graphics; import java.awt.*; import java.util.ArrayList; @@ -21,7 +22,7 @@ public abstract class View { public abstract void setShips(Player player); - public abstract void displayBoard(/*Graphics g*/); + public abstract void displayBoard(); @Override public String toString() { diff --git a/src/battleship/view/Window.java b/src/battleship/view/Window.java index c0a35b1..0d474c2 100644 --- a/src/battleship/view/Window.java +++ b/src/battleship/view/Window.java @@ -3,17 +3,24 @@ package battleship.view; import battleship.model.Game; import battleship.model.player.Player; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.geom.Line2D; import javax.swing.*; import java.awt.*; public class Window extends View { private JFrame frame; + private final int hauteur = 600; + private final int largeur = 1200; public Window(Game game) { super(game); this.frame = new JFrame("Battleship"); - frame.setSize(600,400); + frame.setSize(largeur+largeur/38,hauteur+hauteur/13); + frame.setContentPane(new Draw()); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); frame.setVisible(true); } @@ -23,12 +30,35 @@ public class Window extends View { } - @Override - public void displayBoard() { - - } + class Draw extends JPanel { + public void paintComponent(Graphics g) { + /*JTextArea area = new JTextArea(); + area.setBounds(20,10,400,20); + //area.append("A B C D E F G H I J"); + frame.add(area);*/ + for (int abscisse=largeur/24; abscisse