librejack

commit c66c0c4e1bd27fb3e2f87f991c0541b3b2821ed5
parent e7b31d1c53ed505f0a275ed9878352eab5d6ab1b
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date:   Fri,  7 Oct 2022 17:56:46 +0200

update Card.java
Diffstat:
M
src/model/Card.java
 | 
127
+++++++++++++++++++++++++++++++++++++++++++++----------------------------------

1 file changed, 73 insertions(+), 54 deletions(-)
diff --git a/src/model/Card.java b/src/model/Card.java
@@ -7,70 +7,89 @@ package model;
 public class Card {
      
     // TODO change name to image
-    enum Suit {
-        CLUBS,
-        DIAMONDS,
-        HEARTS,
-        SPADES,
+    public enum Suit {
+
+        CLUBS("Clubs"),
+        DIAMONDS("Diamonds"),
+        HEARTS("Hearts"),
+        SPADES("Spades");
+
+        public String suitName;
+
+        Suit(String suitName) {
+            this.suitName = suitName;
+        }
+
+        public String toString() {
+            return suitName;
+        }
     }
     
-    enum Rank {
-        TWO(2),
-        THREE(3),
-        FOUR(4),
-        FIVE(5),
-        SIX(6),
-        SEVEN(7),
-        EIGHT(8),
-        NINE(9),
-        TEN(10),
-        JACK(10),
-        QUEEN(10),
-        KING(10),
-        ACE(11);
-
-        int rankValue;
-        Rank(int rankValue) {
+    public enum Rank {
+        
+        TWO("Two", 2),
+        THREE("Three", 3),
+        FOUR("Four",4),
+        FIVE("Five",5),
+        SIX("Six",6),
+        SEVEN("Seven",7),
+        EIGHT("Eight",8),
+        NINE("Nine",9),
+        TEN("Ten",10),
+        JACK("Jack",10),
+        QUEEN("Queen",10),
+        KING("King",10),
+        ACE("Ace", 11);
+    
+        String rankName;
+        public int rankValue;
+    
+        Rank(String rankName, int rankValue){
+            this.rankName = rankName;
             this.rankValue = rankValue;
         }
+    
+        public String toString(){
+            return rankName;
+        }
     }
     
-    private Suit suit;
-    private Rank rank;
+     private Suit suit;
+     private Rank rank;
 
-    /**
-     * Card constructor
-     * @param suit Card suit
-     * @param rank Card rank
-     */
-    public Card(Suit suit, Rank rank) {
-        this.suit = suit;
-        this.rank = rank;
-    }
+     /**
+      * Card constructor
+      * @param suit Card suit
+      * @param rank Card rank
+      */
+     public Card(Suit suit, Rank rank) {
+         this.suit = suit;
+         this.rank = rank;
+     }
 
-    public Card(Card card) {
-        this.suit = card.getSuit();
-        this.rank = card.getRank();
-    }
+    // public Card(Card card) {
+    //     this.suit = card.getSuit();
+    //     this.rank = card.getRank();
+    // }
    
-    /**
-     * Rank value getter method
-     * @return card rank value
-     */
-    public int getValue() {
-        return this.rank.rankValue;
-    }
+    // /**
+    //  * Rank value getter method
+    //  * @return card rank value
+    //  */
+    // public int getValue() {
+    //     return this.rank.rankValue;
+    // }
     
-    public Suit getSuit() {
-        return suit;
-    }
+    // public Suit getSuit() {
+    //     return suit;
+    // }
 
-    public Rank getRank() {
-        return rank;
-    }
+    // public Rank getRank() {
+    //     return rank;
+    // }
 
-    @Override
-    public String toString() {
-        return this.suit.toString() + "-" + this.rank.toString();
-    }
+    // @Override
+    // public String toString() {
+    //     return this.suit.toString() + "-" + this.rank.toString();
+    // }
 }
 \ No newline at end of file