Added generics for easier use.

App still broken, doesn't paint the Ships and fails on first MouseClick

battleships/src/Battleships/Adapters/AttackMousePressListener.java

@@ -7,7 +7,7 @@
 import javax.swing.JTextField;
 
 import Battleships.GameState;
-import Battleships.Factories.AxisResolverFactory;
+import Battleships.Factories.ResolverFactory;
 import Battleships.Graphics.PlayerPanel;
 
 public class AttackMousePressListener extends MouseAdapter
@@ -45,6 +45,6 @@ public void mousePressed(MouseEvent event)
 			}
 
 			private int resolveAxisCoOrdinate(int x) {
-				return AxisResolverFactory.resolveAxisCoOrdinate(x);
+				return ResolverFactory.AxisCoOrdinate(x);
 			}	
 }

battleships/src/Battleships/Adapters/HomeMousePressListener.java

@@ -4,28 +4,37 @@
 import java.awt.event.MouseEvent;
 
 import Battleships.GUI;
-import Battleships.Factories.AxisResolverFactory;
+import Battleships.Factories.ResolverFactory;
+import Battleships.Ships.AircraftCarrier;
+import Enums.Position;
 
 public class HomeMousePressListener extends MouseAdapter {
 	private GUI gui;
-
+	private String currentShip;
+
 	public HomeMousePressListener(GUI gui)
 	{
 		this.gui = gui;
+		this.currentShip = AircraftCarrier.class.getName();
 	}
-	
+
 	public void mousePressed(MouseEvent event) {
 		int gridj= resolveAxisCoOrdinate(event.getX());
 		int gridi= resolveAxisCoOrdinate(event.getY());
-				
-		if(!this.gui.gameState.isBothPlayerAndAgentShipsDeployed()) {
-				gui.deploy(gridi,gridj);	
-		}
-
+
+		gui.placeShip(currentShip, new Position(gridi, gridj, gui.orientation));
+		currentShip = ResolverFactory.nextShip(currentShip);
+		if(currentShip == null)
+			gui.gameState.setPlayerShipsDeployed();
 		System.out.println("Element corresponds to " + gridi + gridj);
+
+		if(gui.gameState.arePlayerShipsDeployed()) {
+			gui.setOut("All Ships Deployed, Player's Turn! Click on the left grid to fire shots");
+			gui.setOut(gui.gameState.turnToString());
+		}	
 	}
 	private int resolveAxisCoOrdinate(int x) {
-		return AxisResolverFactory.resolveAxisCoOrdinate(x);
+		return ResolverFactory.AxisCoOrdinate(x);
 	}
 
 }

battleships/src/Battleships/Agent.java

@@ -2,6 +2,7 @@
 import java.util.Random;
 
 import Battleships.Behaviors.ShooterBehavior;
+import Battleships.Factories.ShipFactory;
 import Battleships.Factories.ShotFactory;
 import Battleships.Ships.AircraftCarrier;
 import Battleships.Ships.Battleship;
@@ -13,19 +14,17 @@
 public class Agent
 {
 	private InfluenceMap m = null;
-	private Grid g = null;
+	private Grid grid = null;
 	private int i=-1;
 	private int j=-1;
 	private ShooterBehavior shooterBehavior;
-//	private Random generator;
 
 	public Agent()
 	{
 		m = new InfluenceMap();		
-		g= new Grid(10,10);
+		grid = new Grid(10,10);
 	}
 
-
 	public int getI()
 	{
 		return i;
@@ -45,33 +44,42 @@ public InfluenceMap setSunk(int i, int j)
 	public void nextShot(InfluenceMap m1, Grid Attackgrid)
 	{
 		m = m1;
-		g = Attackgrid;
+		grid = Attackgrid;
 		shooterBehavior = ShotFactory.getShooterBehavior(m.getNumberOfHotspots());
-		shooterBehavior.nextShot(m, g);
+		shooterBehavior.nextShot(m, grid);
 		i = shooterBehavior.i;
 		j = shooterBehavior.j;
 	}
 
 	public Grid placeShips()
 	{
-		while(!g.areShipsPlaced())
+		while(!grid.areShipsPlaced())
 		{
 			Random random = new Random();
 			int x = random.nextInt(10);
 			int y = random.nextInt(10);
 			boolean orientation = random.nextBoolean();
 			Position position = new Position(x, y, orientation == true ? Orientation.Horizontal : Orientation.Vertical);
-
-//			factory.setNextShip(AircraftCarrier.class.getName());
-//			factory.setNextShip(Battleship.class.getName());
-//			factory.setNextShip(Destroyer.class.getName());
-//			factory.setNextShip(Minesweeper.class.getName());
-//			factory.setNextShip(Submarine.class.getName());
+			if(!grid.isShipPlaced(AircraftCarrier.class.getSimpleName())) {
+				grid.addShip(AircraftCarrier.class.getSimpleName(), position);
+			}
+			else if(!grid.isShipPlaced(Battleship.class.getSimpleName())) {
+				grid.addShip(Battleship.class.getSimpleName(), position);
+			} 
+			else if(!grid.isShipPlaced(Destroyer.class.getSimpleName())) {
+				grid.addShip(Destroyer.class.getSimpleName(), position);
+			}
+			else if(!grid.isShipPlaced(Submarine.class.getSimpleName())) {
+				grid.addShip(Submarine.class.getSimpleName(), position);
+			}
+			else if(!grid.isShipPlaced(Minesweeper.class.getName())) {
+				grid.addShip(Minesweeper.class.getSimpleName(), position);
+			}
 		}
 
 		System.out.println("agent grid");
-		System.out.println(g.toString());
+		System.out.println(grid.toString());
 
-	return g;
+		return grid;
 	}
 }

battleships/src/Battleships/BattleShipsEngine.java

@@ -1,18 +1,7 @@
 package Battleships;
 
 public class BattleShipsEngine {
-
 	public GameState gameState;
-	public boolean agentWins;
-	public boolean minePlaced;
-	public boolean destPlaced;
-	public boolean subPlaced;
-	public boolean battlePlaced;
-
-	public boolean agentMineSunk;
-	public boolean agentDestSunk;
-	public boolean agentSubSunk;
-	public boolean agentAirSunk;
 	private GUI gui;
 	private Agent smith;
 
@@ -40,10 +29,6 @@ private void endGame() {
 	}
 
 	private void initializeVariables() {
-		minePlaced = false;
-		destPlaced = false;
-		subPlaced = false;
-		battlePlaced = false;
 		gameState = new GameState();
 		gui = new GUI(gameState);
 		smith = new Agent();
@@ -64,11 +49,11 @@ private void waitForPlayerToPlaceShips() {
 	private void loadingGame() {
 		gameState.addAgentShips(smith.placeShips());
 		gameState.setPlayerTurn();
-		gui.outText.setText(gameState.turnToString());
+		gui.setOut(gameState.turnToString());
 	}
 
 	private void startGame() {
-		while (!gameState.IsGameOver())
+		while (!gameState.areAgentShipsSunk() && !gameState.arePlayerShipsSunk())
 		{
 			this.PlayerTurn();
 			gui.repaint();
@@ -78,26 +63,23 @@ private void startGame() {
 	private void isAgentWinner() {
 		if(gameState.arePlayerShipsSunk())
 		{
-			gameState.SetGameOver();
 			gameState.setPlayerTurn();
 		}
 	}
 	private void isPlayerWinner() {
 		if(gameState.areAgentShipsSunk())
 		{
 			System.out.println("All sunk");
-			gameState.SetGameOver();
-			gameState.PlayerIsTheWinner();
 		}
 	}
 	private void AgentTurn() {
 		while(gameState.isAgentTurn()) {
 			System.out.println("agent turn");
 			smith.nextShot(gameState.influenceMap, gameState.compHomeGrid);
-			gui.agentShot(smith.getI(),smith.getJ());
+			gameState.agentShot(smith.getI(),smith.getJ(),this.gui);
 			System.out.println("shot at " + smith.getI() + " " +smith.getJ());
 			System.out.println(gameState.compHomeGrid.toString());
-			gameState.determineIfShotSunkAShip(gui, smith);
+			smith.setSunk(smith.getI(), smith.getJ());
 			gameState.setShipSunkStates();
 			this.threadSleep(1000);
 			this.isAgentWinner();
@@ -118,11 +100,6 @@ private void PlayerTurn() {
 		}
 	}
 
-	private void resetGame() {
-		gameState = new GameState();
-		gui.reset();
-	}
-
 	public static void main (String args[])
 	{
 		BattleShipsEngine engine = new BattleShipsEngine();

battleships/src/Battleships/Behaviors/HShipGridSetter.java

@@ -14,7 +14,7 @@ protected void UpdateBoard(int CoordinateX, int CoordinateY) {
 		}
 
 	@Override
-	protected void IsPositionOccupied(int CoordinateX, int CoordinateY) {
+	protected void IsPositionOccupied(int CoordinateX, int CoordinateY) throws PositionOccupiedException {
 		for (int c = CoordinateY; c < CoordinateY + shipLength; c++) {
 			while (board.getGridVal(CoordinateX, c) != GridValue.EmptyCellValue) {
 				throw new PositionOccupiedException();
@@ -23,7 +23,7 @@ protected void IsPositionOccupied(int CoordinateX, int CoordinateY) {
 	}
 
 	@Override
-	protected void IsPositionExceedsBoard(int CoordinateX, int CoordinateY) {
+	protected void IsPositionExceedsBoard(int CoordinateX, int CoordinateY) throws PositionExceedsBoardException {
 		if (CoordinateY + shipLength > board.getWidth()) {
 			throw new PositionExceedsBoardException();
 		}

battleships/src/Battleships/Behaviors/ShipGridSetterBehavior.java

@@ -1,6 +1,8 @@
 package Battleships.Behaviors;
 
 import Battleships.Grid;
+import Battleships.exception.PositionExceedsBoardException;
+import Battleships.exception.PositionOccupiedException;
 import Enums.GridValue;
 
 public abstract class ShipGridSetterBehavior {
@@ -24,7 +26,7 @@ public void placeShipOnGrid(int CoordinateX, int CoordinateY) {
 		this.UpdateBoard(CoordinateX, CoordinateY);
 	}
 
-	protected abstract void IsPositionExceedsBoard(int CoordinateX, int CoordinateY);
-	protected abstract void IsPositionOccupied(int CoordinateX, int CoordinateY);
+	protected abstract void IsPositionExceedsBoard(int CoordinateX, int CoordinateY) throws PositionExceedsBoardException;
+	protected abstract void IsPositionOccupied(int CoordinateX, int CoordinateY) throws PositionOccupiedException;
 	protected abstract void UpdateBoard(int CoordinateX, int CoordinateY);
 }

battleships/src/Battleships/Behaviors/VShipGridSetter.java

@@ -14,7 +14,7 @@ protected void UpdateBoard(int CoordinateX, int CoordinateY) {
 		}
 
 	@Override
-	protected void IsPositionOccupied(int CoordinateX, int CoordinateY) {
+	protected void IsPositionOccupied(int CoordinateX, int CoordinateY) throws PositionOccupiedException {
 		for (int c = CoordinateX; c < CoordinateX + shipLength; c++) {
 			while (board.getGridVal(c, CoordinateY) != GridValue.EmptyCellValue) {
 				throw new PositionOccupiedException();
@@ -23,7 +23,7 @@ protected void IsPositionOccupied(int CoordinateX, int CoordinateY) {
 	}
 
 	@Override
-	protected void IsPositionExceedsBoard(int CoordinateX, int CoordinateY) {
+	protected void IsPositionExceedsBoard(int CoordinateX, int CoordinateY) throws PositionExceedsBoardException {
 		if (CoordinateX + shipLength > board.getHeight()) {
 			throw new PositionExceedsBoardException();
 		}

battleships/src/Battleships/Factories/GUIFactory.java

@@ -32,16 +32,13 @@ public GUIFactory(GUI gui) {
 	}
 
 	public void resetLayout() {
+		this.setLayout();
 		this.initializeVariables();
+		this.setContentPane();
 		this.finishLayout();
 	}
 
 	private void initializeVariables() {
-		gui.paintMineSunk= false;
-		gui.paintDestSunk= false;
-		gui.paintSubSunk= false;
-		gui.paintBattleSunk= false;
-		gui.paintAirSunk= false;
 		gui.orientation = Orientation.Vertical;
 		gui.showMap= true;
 	}

battleships/src/Battleships/Factories/ResolverFactory.java

@@ -0,0 +1,44 @@
+package Battleships.Factories;
+
+import Battleships.Ships.AircraftCarrier;
+import Battleships.Ships.Battleship;
+import Battleships.Ships.Destroyer;
+import Battleships.Ships.Minesweeper;
+import Battleships.Ships.Submarine;
+
+public class ResolverFactory {
+	public static int AxisCoOrdinate(int Coordinate) {
+		if (Coordinate < 20)
+			return 0;
+		else if (Coordinate < 40)
+			return 1;
+		else if (Coordinate < 60)
+			return 2;
+		else if (Coordinate < 80)
+			return 3;
+		else if (Coordinate < 100)
+			return 4;
+		else if (Coordinate < 120)
+			return 5;
+		else if (Coordinate < 140)
+			return 6;
+		else if (Coordinate < 160)
+			return 7;
+		else if (Coordinate < 180)
+			return 8;
+		else if (Coordinate < 200)
+			return 9;
+		return -1;
+	}
+	public static String nextShip(String current) {
+		if(current.equalsIgnoreCase(AircraftCarrier.class.getSimpleName()))
+			return Battleship.class.getSimpleName();
+		else if(current.equalsIgnoreCase(Battleship.class.getSimpleName())) 
+			return Destroyer.class.getSimpleName();
+		else if(current.equalsIgnoreCase(Destroyer.class.getSimpleName())) 
+			return Submarine.class.getSimpleName();
+		else if(current.equalsIgnoreCase(Submarine.class.getSimpleName()))
+			return Minesweeper.class.getSimpleName();
+		return null;
+	}
+}

battleships/src/Battleships/Factories/ShipFactory.java

@@ -1,5 +1,7 @@
 package Battleships.Factories;
 
+import java.util.Random;
+
 import Battleships.Grid;
 import Battleships.Ships.AircraftCarrier;
 import Battleships.Ships.Battleship;
@@ -9,6 +11,7 @@
 import Battleships.Ships.Submarine;
 import Battleships.exception.PositionExceedsBoardException;
 import Battleships.exception.PositionOccupiedException;
+import Enums.Orientation;
 import Enums.Position;
 
 public class ShipFactory {