cleanup

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

diff --git a/src/solitaire/Foundation.java b/src/solitaire/Foundation.java
index af9751084cae537a917447687f7799c87417d6ac..48995c0e8562b6ba40bb843fcef5d592a53e987a 100644 (file)
--- a/src/solitaire/Foundation.java
+++ b/src/solitaire/Foundation.java
@@ -8,20 +8,20 @@ final class Foundation {
     private final Suit suit;
 
     Foundation(Suit suit) {
-       this.cards = new LinkedList<>();
+       cards = new LinkedList<>();
        this.suit = suit;
     }
 
-    Suit getSuit() {
-       return suit;
-    }
+    @Override
+    public String toString() {
+       if (cards.isEmpty())
+           return String.format("( %s )", suit);
 
-    boolean isFull() {
-       return cards.size() == Rank.RANKS.size();
+       return String.format("(%s)", cards.getLast());
     }
 
     private boolean isValidNextCard(Card nextCard) {
-       if (nextCard.getSuit() != this.suit)
+       if (nextCard.getSuit() != suit)
            return false;
 
        if (cards.isEmpty())
@@ -40,11 +40,11 @@ final class Foundation {
        return true;
     }
 
-    @Override
-    public String toString() {
-       if (cards.isEmpty())
-           return String.format("( %s )", suit);
+    Suit getSuit() {
+       return suit;
+    }
 
-       return String.format("(%s)", cards.getLast());
+    boolean isFull() {
+       return cards.size() == Rank.RANKS.size();
     }
 }