Testing2

src/com/codecool/klondike/Card.java

@@ -9,8 +9,8 @@
 
 public class Card extends ImageView {
 
-    private int suit;
-    private int rank;
+    private Suits suit;
+    private Ranks rank;
     private boolean faceDown;
 
     private Image backFace;
@@ -23,7 +23,7 @@ public class Card extends ImageView {
     public static final int WIDTH = 150;
     public static final int HEIGHT = 215;
 
-    public Card(int suit, int rank, boolean faceDown) {
+    public Card(Suits suit, Ranks rank, boolean faceDown) {
         this.suit = suit;
         this.rank = rank;
         this.faceDown = faceDown;
@@ -34,14 +34,18 @@ public Card(int suit, int rank, boolean faceDown) {
         setEffect(dropShadow);
     }
 
-    public int getSuit() {
+    public Suits getSuit() {
         return suit;
     }
 
-    public int getRank() {
+    public Ranks getRank() {
         return rank;
     }
 
+    public int getRankNumber() {
+        return Integer.parseInt(rank.getNumber());
+    }
+
     public boolean isFaceDown() {
         return faceDown;
     }
@@ -88,39 +92,29 @@ public static boolean isSameSuit(Card card1, Card card2) {
 
     public static List<Card> createNewDeck() {
         List<Card> result = new ArrayList<>();
-        for (int suit = 1; suit < 5; suit++) {
-            for (int rank = 1; rank < 14; rank++) {
+        for (Suits suit : Suits.values()) {
+            for (Ranks rank : Ranks.values()) {
                 result.add(new Card(suit, rank, true));
             }
         }
+
+        Collections.shuffle(result);
         return result;
     }
 
+
     public static void loadCardImages() {
         cardBackImage = new Image("card_images/card_back.png");
-        String suitName = "";
-        for (int suit = 1; suit < 5; suit++) {
-            switch (suit) {
-                case 1:
-                    suitName = "hearts";
-                    break;
-                case 2:
-                    suitName = "diamonds";
-                    break;
-                case 3:
-                    suitName = "spades";
-                    break;
-                case 4:
-                    suitName = "clubs";
-                    break;
-            }
-            for (int rank = 1; rank < 14; rank++) {
-                String cardName = suitName + rank;
+        for (Suits suit : Suits.values())  {
+            String suitName = suit.getName();
+            for (Ranks rank : Ranks.values()) {
+                String rankNumber = rank.getNumber();
+                String cardName = suitName + rankNumber;
                 String cardId = "S" + suit + "R" + rank;
                 String imageFileName = "card_images/" + cardName + ".png";
                 cardFaceImages.put(cardId, new Image(imageFileName));
             }
         }
     }
-
+    
 }