1 files changed, 16 insertions, 18 deletions

diff --git a/src/jrummikub/control/turn/HumanTurnControl.java b/src/jrummikub/control/turn/HumanTurnControl.java
index 85f242f..427fe53 100644
--- a/src/jrummikub/control/turn/HumanTurnControl.java
+++ b/src/jrummikub/control/turn/HumanTurnControl.java
@@ -76,8 +76,8 @@ public class HumanTurnControl extends AbstractTurnControl {
 		if (turnMode == TurnMode.NORMAL_TURN) {
 			addTablePanelHandlers();
 		}
-		
-		view.getHandPanel().setStones(hand.clone());
+
+		view.getHandPanel().setStones(player.getHand().clone());
 		view.getHandPanel().resetCurrentRow();
 		view.setBottomPanel(BottomPanelType.HUMAN_HAND_PANEL);
 
@@ -226,7 +226,7 @@ public class HumanTurnControl extends AbstractTurnControl {
 	private void handClick(Position pos) {
 		List<Stone> handStones = new ArrayList<Stone>();
 		for (Stone s : selectedStones) {
-			if (hand.pickUp(s)) {
+			if (player.getHand().pickUp(s)) {
 				handStones.add(s);
 			}
 		}
@@ -235,27 +235,27 @@ public class HumanTurnControl extends AbstractTurnControl {
 		for (Stone s : handStones) {
 			float x = Math.max(0,
 					Math.min(13, pos.getX() - handStones.size() / 2.0f + i));
-			hand.drop(s, new Position(x, (float) Math.floor(pos.getY())));
+			player.getHand().drop(s, new Position(x, (float) Math.floor(pos.getY())));
 			selectedStones.remove(s);
 			i++;
 		}
 		view.setSelectedStones(selectedStones);
-		view.getHandPanel().setStones(hand);
+		view.getHandPanel().setStones(player.getHand());
 	}
 
 	private void sortStones(Comparator<Stone> comparator) {
 		List<Stone> stones = new ArrayList<Stone>();
-		for (Pair<Stone, Position> entry : hand) {
+		for (Pair<Stone, Position> entry : player.getHand()) {
 			stones.add(entry.getFirst());
 		}
 		for (Stone stone : stones) {
-			hand.pickUp(stone);
+			player.getHand().pickUp(stone);
 		}
 
 		Collections.sort(stones, comparator);
 		int x = 0, y = 0;
 		for (Stone stone : stones) {
-			hand.drop(stone, new Position(x, y));
+			player.getHand().drop(stone, new Position(x, y));
 			x++;
 			if (x >= Hand.WIDTH) {
 				x = 0;
@@ -263,7 +263,7 @@ public class HumanTurnControl extends AbstractTurnControl {
 			}
 		}
 
-		view.getHandPanel().setStones(hand);
+		view.getHandPanel().setStones(player.getHand());
 	}
 
 	private void sortByRuns() {
@@ -304,7 +304,7 @@ public class HumanTurnControl extends AbstractTurnControl {
 
 	private void pickUpSelectedStones() {
 		for (Stone stone : selectedStones) {
-			hand.pickUp(stone);
+			player.getHand().pickUp(stone);
 			table.pickUpStone(stone);
 		}
 	}
@@ -320,7 +320,7 @@ public class HumanTurnControl extends AbstractTurnControl {
 		selectedStones.clear();
 
 		view.getTablePanel().setStoneSets(table);
-		view.getHandPanel().setStones(hand);
+		view.getHandPanel().setStones(player.getHand());
 		view.setSelectedStones(selectedStones);
 	}
 
@@ -380,7 +380,7 @@ public class HumanTurnControl extends AbstractTurnControl {
 			return;
 		}
 		List<Pair<Stone, Position>> handPairs = new ArrayList<Pair<Stone, Position>>();
-		for (Pair<Stone, Position> entry : hand) {
+		for (Pair<Stone, Position> entry : player.getHand()) {
 			handPairs.add(entry);
 		}
 
@@ -436,17 +436,15 @@ public class HumanTurnControl extends AbstractTurnControl {
 						new Position(newPos.getX() - selectedStones.size(), newPos.getY()));
 			}
 		} else {
-			table.drop(
-					new StoneSet(selectedStones),
-					new Position(
-							pos.getX() + (set.getSize() - selectedStones.size()) * 0.5f, pos
-									.getY()));
+			table.drop(new StoneSet(selectedStones),
+					new Position(pos.getX() + (set.getSize() - selectedStones.size())
+							* 0.5f, pos.getY()));
 		}
 
 		selectedStones.clear();
 
 		view.getTablePanel().setStoneSets(table);
-		view.getHandPanel().setStones(hand);
+		view.getHandPanel().setStones(player.getHand());
 		view.setSelectedStones(selectedStones);
 	}