Fixed bug when Newgame throws NullException

Bogatinov · Jan 10, 2014 · b5e26b5 · b5e26b5
1 parent c0320ce
commit b5e26b5
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 18 deletions.
diff --git a/battleships/bin/Battleships/Adapters/HomeMousePressListener.class b/battleships/bin/Battleships/Adapters/HomeMousePressListener.class
diff --git a/battleships/bin/Battleships/Factories/GUIFactory.class b/battleships/bin/Battleships/Factories/GUIFactory.class
diff --git a/battleships/bin/Battleships/GUI.class b/battleships/bin/Battleships/GUI.class
diff --git a/battleships/src/Battleships/Adapters/HomeMousePressListener.java b/battleships/src/Battleships/Adapters/HomeMousePressListener.java
@@ -15,27 +15,41 @@ public class HomeMousePressListener extends MouseAdapter {
 	public HomeMousePressListener(GUI gui)
 	{
 		this.gui = gui;
-		this.currentShip = AircraftCarrier.class.getSimpleName();
+	}
+
+	private void NewGame() {
+		if(currentShip == null) {
+			this.currentShip = AircraftCarrier.class.getSimpleName();
+		}
+	}
+
+	private void AddShip(int gridX, int gridY) {
+		boolean valid = gui.placeShip(currentShip, new Position(gridX, gridY, gui.orientation));
+		if(valid) 
+			currentShip = ResolverFactory.nextShip(currentShip);
+	}
+
+	private void NoMoreShips() {
+		if(currentShip == null) {
+			gui.gameState.setPlayerShipsDeployed();
+		}
+	}
+
+	private void Print() {
+		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());
+		}
 	}
 
 	public void mousePressed(MouseEvent event) {
 		if(!gui.gameState.arePlayerShipsDeployed()) {
+			this.NewGame();
 			int gridj= resolveAxisCoOrdinate(event.getX());
 			int gridi= resolveAxisCoOrdinate(event.getY());
-
-			boolean valid = gui.placeShip(currentShip, new Position(gridi, gridj, gui.orientation));
-			if(valid) 
-				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());
-			}
+			this.AddShip(gridi, gridj);
+			this.NoMoreShips();
+			this.Print();
 		}
 	}
 	private int resolveAxisCoOrdinate(int x) {

diff --git a/battleships/src/Battleships/Factories/GUIFactory.java b/battleships/src/Battleships/Factories/GUIFactory.java
@@ -10,6 +10,7 @@
 import javax.swing.JTextField;
 
 import Battleships.GUI;
+import Battleships.GameState;
 import Battleships.Adapters.AttackMousePressListener;
 import Battleships.Adapters.HideButtonAction;
 import Battleships.Adapters.HomeMousePressListener;
@@ -36,6 +37,9 @@ public void resetLayout() {
 		this.initializeVariables();
 		this.setContentPane();
 		this.finishLayout();
+		 gui.i = 0;
+		 gui.j = 0;
+		 gui.gameState = new GameState();
 	}
 
 	private void initializeVariables() {

diff --git a/battleships/src/Battleships/GUI.java b/battleships/src/Battleships/GUI.java
@@ -59,9 +59,6 @@ else if (gameState.isPlayerHitShot(i,j))
 
 	public void reset()
 	{
-		 i = 0;
-		 j = 0;
-		 gameState = new GameState();
 		 guiFactory.resetLayout();
 	}