From 58ac3cffd4f42eb95583cfbf933cb29454f41c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sas=CC=8Ca=20Kocic=CC=81?= <sasa.kocic@yogaeasy.de>
Date: Thu, 18 Jun 2020 10:36:00 +0200
Subject: [PATCH] refactored Card.Suit

---
 src/Card.java     | 7 +++++++
 src/CardGame.java | 4 ++--
 src/Main.java     | 7 -------
 src/Player.java   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Card.java b/src/Card.java
index 485b3a0..503159d 100644
--- a/src/Card.java
+++ b/src/Card.java
@@ -1,6 +1,13 @@
 public class Card {
     int number;
     Suit suit;
+    enum Suit {
+        CLUBS,
+        SPADES,
+        HEARTS,
+        DIAMONDS
+    };
+
 
     public Card(int number, Suit suit) {
         this.number = number;
diff --git a/src/CardGame.java b/src/CardGame.java
index f6cf2d7..79027e4 100644
--- a/src/CardGame.java
+++ b/src/CardGame.java
@@ -21,8 +21,8 @@ public class CardGame {
     private Pile createDeck(int numberOfCards) {
         Pile deck = new Pile();
         for (int number = 0; number < numberOfCards * Suit.COUNT; number++) {
-            for (int suit = 0; suit < Suit.COUNT; suit++) {
-                deck.add(new Card(number + 1, new Suit(suit)));
+            for (Card.Suit suit: Card.Suit.values()) {
+                deck.add(new Card(number + 1, suit));
             }
         }
         return deck;
diff --git a/src/Main.java b/src/Main.java
index be2637a..6be0e60 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,11 +1,4 @@
 public class Main {
-    enum Suits {
-        CLUBS,
-        SPADES,
-        HEARTS,
-        DIAMONDS
-    };
-
     public static void main(String[] args) {
         System.out.println("Card Game");
         CardGame cardGame = new CardGame(10, 2);
diff --git a/src/Player.java b/src/Player.java
index 979cd44..2bbca8b 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -30,7 +30,7 @@ public class Player {
             discardPile.shuffle();
             drawPile.takeDiscarded();
         }
-        Card draw = new Card(1, new Suit(Suit.SPADES));
+        Card draw = new Card(1, Card.Suit.SPADES);
         return draw;
     }