add deck and format

[solitaire.git] / src / solitaire / Card.java

diff --git a/src/solitaire/Card.java b/src/solitaire/Card.java
index b0fbb5c618b1033d55e46c3db944e1ddfcfae283..ec6efcfad09442b6eb63b897e9a61435270a7232 100644 (file)
--- a/src/solitaire/Card.java
+++ b/src/solitaire/Card.java
@@ -1,41 +1,41 @@
 package solitaire;
 
 final class Card {
-       private final Suit suit;
-       private final Rank rank;
-       private boolean hidden;
-       
-       Card(Suit suit, Rank rank, boolean hidden) {
-               this.suit = suit;
-               this.rank = rank;
-               this.hidden = hidden;
-       }
-
-       Card(Suit suit, Rank rank) {
-               this(suit, rank, true);
-       }
-
-       Suit getSuit() {
-               return this.suit;
-       }
-
-       Rank getRank() {
-               return this.rank;
-       }
-
-       boolean isHidden() {
-               return this.hidden;
-       }
-       
-       void reveal() {
-               this.hidden = false;
-       }
-       
-       @Override
-       public String toString() {
-               if (this.hidden)
-                       return " * ";
-               
-               return String.format("%s%2s", this.suit, this.rank);
-       }
+    private final Suit suit;
+    private final Rank rank;
+    private boolean hidden;
+
+    Card(Suit suit, Rank rank, boolean hidden) {
+       this.suit = suit;
+       this.rank = rank;
+       this.hidden = hidden;
+    }
+
+    Card(Suit suit, Rank rank) {
+       this(suit, rank, true);
+    }
+
+    Suit getSuit() {
+       return suit;
+    }
+
+    Rank getRank() {
+       return rank;
+    }
+
+    boolean isHidden() {
+       return hidden;
+    }
+
+    void reveal() {
+       hidden = false;
+    }
+
+    @Override
+    public String toString() {
+       if (isHidden())
+           return "[ * ]";
+
+       return String.format("[%s%2s]", suit, rank);
+    }
 }