From 94f9d47c4e9fc6427f768b418aa3f2fb7dd130c4 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Fri, 18 Sep 2015 12:39:53 +0200
Subject: [PATCH] Cosmetics

---
 .../de/hdm_stuttgart/mi/sd1/tictactoe/TicTacToe.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/P/Sd1/TicTacToe/V4/src/main/java/de/hdm_stuttgart/mi/sd1/tictactoe/TicTacToe.java b/P/Sd1/TicTacToe/V4/src/main/java/de/hdm_stuttgart/mi/sd1/tictactoe/TicTacToe.java
index bfe087540..8b5610a2c 100644
--- a/P/Sd1/TicTacToe/V4/src/main/java/de/hdm_stuttgart/mi/sd1/tictactoe/TicTacToe.java
+++ b/P/Sd1/TicTacToe/V4/src/main/java/de/hdm_stuttgart/mi/sd1/tictactoe/TicTacToe.java
@@ -3,7 +3,7 @@ package de.hdm_stuttgart.mi.sd1.tictactoe;
 import java.util.Scanner;
 
 /**
- * Playing Tic-tac-toe with two players.
+ * Tic-tac-toe human vs. computer.
  * 
  */
 public class TicTacToe {
@@ -20,16 +20,20 @@ public class TicTacToe {
       
       System.out.println("Who is going to start? " + 
         Player.YOU.ordinal() + " = " + Player.YOU.nickname +
-          ", other = " + Player.COM.nickname);
+          ", " + Player.COM.ordinal() + " = " + Player.COM.nickname);
       
       final int firstPlayer = scan.nextShort();
       
       final Board board;
       if (Player.YOU.ordinal() == firstPlayer) {
         board = new Board(Player.YOU);
-      } else {
+      } else if (Player.COM.ordinal() == firstPlayer){
         board = new Board(Player.COM);
         board.nextPerfectMove();
+      } else {
+        board = null;
+        System.err.println("Wrong choice, you may re-start this program");
+        System.exit(1);
       }
       board.print(true, true);
       
-- 
GitLab