X-Git-Url: https://git.wirehaze.ovh/solitaire.git/blobdiff_plain/7cd86679b79a117283843210ae45ed1e78079e97..refs/heads/main:/src/solitaire/Foundation.java?ds=sidebyside

diff --git a/src/solitaire/Foundation.java b/src/solitaire/Foundation.java
index 54d4162..48995c0 100644
--- a/src/solitaire/Foundation.java
+++ b/src/solitaire/Foundation.java
@@ -8,32 +8,28 @@ 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 card) {
-	Rank cardRank, lastRank;
-
-	if (card.getSuit() != this.suit)
+    private boolean isValidNextCard(Card nextCard) {
+	if (nextCard.getSuit() != suit)
 	    return false;
 
-	cardRank = card.getRank();
-
 	if (cards.isEmpty())
-	    return cardRank == Rank.ACE;
+	    return nextCard.getRank() == Rank.ACE;
 
-	lastRank = cards.getLast().getRank();
+	Card lastCard = cards.getLast();
 
-	return cardRank.isSuccessorOf(lastRank);
+	return nextCard.getRank().isSuccessorOf(lastCard.getRank());
     }
 
     boolean add(Card card) {
@@ -44,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();
     }
 }