cleanup

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

diff --git a/src/solitaire/Card.java b/src/solitaire/Card.java
index ec6efcfad09442b6eb63b897e9a61435270a7232..1f75859b46cfa4c41502a2c43d9fcc310090e7f8 100644 (file)
--- a/src/solitaire/Card.java
+++ b/src/solitaire/Card.java
@@ -5,24 +5,32 @@ final class Card {
     private final Rank rank;
     private boolean hidden;
 
     private final Rank rank;
     private boolean hidden;
 

+    Card(Suit suit, Rank rank) {
+       this(suit, rank, true);
+    }
+

     Card(Suit suit, Rank rank, boolean hidden) {
        this.suit = suit;
        this.rank = rank;
        this.hidden = 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);
-    }
+    @Override
+    public String toString() {
+       if (isHidden())
+           return " * ";

 
 

-    Suit getSuit() {
-       return suit;
+       return String.format("%s%2s", suit, rank);

     }
 
     Rank getRank() {
        return rank;
     }
 
     }
 
     Rank getRank() {
        return rank;
     }
 

+    Suit getSuit() {
+       return suit;
+    }
+

     boolean isHidden() {
        return hidden;
     }
     boolean isHidden() {
        return hidden;
     }


@@ -30,12 +38,4 @@ final class Card {
     void reveal() {
        hidden = false;
     }
     void reveal() {
        hidden = false;
     }

-
-    @Override
-    public String toString() {
-       if (isHidden())
-           return "[ * ]";
-
-       return String.format("[%s%2s]", suit, rank);
-    }

 }
 }