From 80205154320b6ecb7882b2e3c0ad9a18f430cca2 Mon Sep 17 00:00:00 2001
From: Asecave <39377667+Asecave@users.noreply.github.com>
Date: Wed, 2 Sep 2020 21:34:30 +0200
Subject: [PATCH] added number input

---
 Tic-Tac-Toe/src/main/Input.java     | 17 ++++++++++++++---
 Tic-Tac-Toe/src/main/Player.java    |  9 ++++++++-
 Tic-Tac-Toe/src/main/TicTacToe.java |  8 +++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Tic-Tac-Toe/src/main/Input.java b/Tic-Tac-Toe/src/main/Input.java
index d211412..7485a2b 100644
--- a/Tic-Tac-Toe/src/main/Input.java
+++ b/Tic-Tac-Toe/src/main/Input.java
@@ -4,13 +4,24 @@ import java.util.Scanner;
 
 public class Input {
 	
-	Scanner s;
+	private static Scanner s;
 	
-	public Input() {
+	static {
 		s = new Scanner(System.in);
 	}
+	
+	public static int scanFieldInput() {
+		String input;
+		do {
+			input = s.next();
+			if (!input.contains("[0-9]+")) {
+				System.out.println("Bitte eine Zahl eingeben!");
+			}
+		} while (!input.contains("[0-9]+"));
+		return Integer.parseInt(input);
+	}
 
-	public void close() {
+	public static void close() {
 		s.close();
 	}
 
diff --git a/Tic-Tac-Toe/src/main/Player.java b/Tic-Tac-Toe/src/main/Player.java
index c8351d6..a7e352d 100644
--- a/Tic-Tac-Toe/src/main/Player.java
+++ b/Tic-Tac-Toe/src/main/Player.java
@@ -1,9 +1,16 @@
 package main;
 
 public class Player {
+	
+	private char symbol;
+	
+	public Player(char symbol) {
+		this.symbol = symbol;
+	}
 
 	public void makeTurn() {
-		
+		System.out.println(symbol + " ist am Zug!");
+		int in = Input.scanFieldInput();
 	}
 
 }
diff --git a/Tic-Tac-Toe/src/main/TicTacToe.java b/Tic-Tac-Toe/src/main/TicTacToe.java
index 8541fdc..96a0fd1 100644
--- a/Tic-Tac-Toe/src/main/TicTacToe.java
+++ b/Tic-Tac-Toe/src/main/TicTacToe.java
@@ -4,14 +4,12 @@ public class TicTacToe {
 	
 	Player player1, player2;
 	Player turn;
-
-	public static Input input = new Input();
 	
 	private boolean running;
 	
 	public TicTacToe() {
-		player1 = new Player();
-		player2 = new Player();
+		player1 = new Player('X');
+		player2 = new Player('O');
 		turn = player1;
 		
 		running = true;
@@ -32,7 +30,7 @@ public class TicTacToe {
 	}
 	
 	public void close() {
-		input.close();
+		Input.close();
 	}
 	
 }