Add some endOfTurn handling to RoundControl

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@155 72836036-5685-4462-b002-a69064685172

mock/jrummikub/model/MockGameState.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 public class MockGameState implements IGameState {
 	public MockTable table;
+	public ITable setTable;
 	public List<MockPlayer> players;
 	public int activePlayer;
 	public StoneHeap gameHeap;
@@ -56,4 +57,9 @@ public class MockGameState implements IGameState {
 	public IPlayer getNthNextPlayer(int i) {
 		return players.get((activePlayer + i) % players.size());
 	}
+
+	@Override
+	public void setTable(ITable table) {
+		setTable = table;
+	}
 }

src/jrummikub/control/RoundControl.java

@@ -60,6 +60,7 @@ public class RoundControl {
 				endOfTurn();
 			}
 		});
+
 		turnControl.startTurn();
 	}
 
@@ -74,7 +75,27 @@ public class RoundControl {
 	}
 
 	private void endOfTurn() {
+		Set<Stone> tableDiff = tableDifference(gameState.getTable(), clonedTable);
 
+		if (!tableDiff.isEmpty()) { // Player has made a move
+			if (clonedTable.isValid()) {
+				gameState.setTable(clonedTable);
+
+				// TODO Win check
+			} else {
+				gameState.getGameHeap().putBack(tableDiff);
+				dealPenalty(tableDiff.size());
+			}
+		} else { // Player hasn't made a move
+			if (clonedTable.isValid()) {
+				gameState.setTable(clonedTable);
+			}
+
+			dealStone();
+		}
+
+		gameState.nextPlayer();
+		prepareTurn();
 	}
 
 	static Set<Stone> tableDifference(ITable oldTable, ITable newTable) {
@@ -94,15 +115,12 @@ public class RoundControl {
 		return ret;
 	}
 
-	private void resetTable() {
-
-	}
-
-	private void preparePlayerTurn() {
-
-	}
-
 	private void dealStone() {
+		// gameState.getActivePlayer().getHand().drop(object, position)
+	}
 
+	private void dealPenalty(int count) {
+		for (int i = 0; i < count + 3; ++i)
+			dealStone();
 	}
 }

src/jrummikub/model/GameState.java

@@ -27,6 +27,11 @@ public class GameState implements IGameState {
 		return table;
 	}
 
+	@Override
+	public void setTable(ITable table) {
+		this.table = table;
+	}
+
 	@Override
 	public int getPlayerCount() {
 		return players.size();

src/jrummikub/model/IGameState.java

@@ -3,6 +3,7 @@ package jrummikub.model;
 public interface IGameState {
 
 	public ITable getTable();
+	public void setTable(ITable table);
 
 	public int getPlayerCount();
 

src/jrummikub/model/StoneHeap.java

@@ -1,6 +1,7 @@
 package jrummikub.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
@@ -56,4 +57,8 @@ public class StoneHeap {
 	public int getSize() {
 		return heap.size();
 	}
+
+	public void putBack(Collection<Stone> stones) {
+		heap.addAll(stones);
+	}
 }