Metric fixes

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

1 files changed, 13 insertions, 10 deletions

diff --git a/src/jrummikub/control/turn/BaseAIControl.java b/src/jrummikub/control/turn/BaseAIControl.java
index b02c127..3c48341 100644
--- a/src/jrummikub/control/turn/BaseAIControl.java
+++ b/src/jrummikub/control/turn/BaseAIControl.java
@@ -63,14 +63,16 @@ public class BaseAIControl extends AbstractTurnControl {
 	}
 
 	private void compute() {
-		if (inspectOnly) {
-			if (mayRedeal) {
-				emitRedeal();
-			} else {
-				emitEndOfTurn();
-			}
-		} else {
+		switch (turnMode) {
+		case MAY_REDEAL:
+			emitRedeal();
+			break;
+		case INSPECT_ONLY:
+			emitEndOfTurn();
+			break;
+		case NORMAL_TURN:
 			turn();
+			break;
 		}
 	}
 
@@ -124,7 +126,8 @@ public class BaseAIControl extends AbstractTurnControl {
 			for (Stone stone : set) {
 				handStones.add(pickUpMatchingStone(stone));
 			}
-			table.drop(new StoneSet(handStones), new Position((float)Math.random() * 30 - 15, (float)Math.random() * 6 - 3));
+			table.drop(new StoneSet(handStones), new Position(
+					(float) Math.random() * 30 - 15, (float) Math.random() * 6 - 3));
 		}
 
 		emitEndOfTurn();
@@ -144,8 +147,8 @@ public class BaseAIControl extends AbstractTurnControl {
 
 	private void emitEndOfTurn() {
 		long timeElapsed = System.currentTimeMillis() - startTime;
-		long timeNeeded = Math.min(
-				(long) (1000 + Math.random() * hand.getSize() * 100), 50000);
+		long timeNeeded = Math.min((long) (1000 + Math.random() * hand.getSize()
+				* 100), 50000);
 		long waitTime = timeNeeded - timeElapsed;
 
 		if (waitTime > 0) {