cleanup

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

diff --git a/src/solitaire/Stock.java b/src/solitaire/Stock.java
index 91907fbee4c4a2fe4109de47c040e0271a9112da..704f0323ab550ad1a56c51895d4c9a9e27d57c7a 100644 (file)
--- a/src/solitaire/Stock.java
+++ b/src/solitaire/Stock.java
@@ -8,7 +8,7 @@ final class Stock {
     private final List<Card> cards;
 
     Stock() {
     private final List<Card> cards;
 
     Stock() {

-       this.cards = new LinkedList<>();
+       cards = new LinkedList<>();

 
        for (Suit s : Suit.SUITS)
            for (Rank r : Rank.RANKS)
 
        for (Suit s : Suit.SUITS)
            for (Rank r : Rank.RANKS)


@@ -17,14 +17,6 @@ final class Stock {
        Collections.shuffle(cards);
     }
 
        Collections.shuffle(cards);
     }
 

-    Card draw() {
-       return cards.removeLast();
-    }
-
-    boolean isEmpty() {
-       return cards.isEmpty();
-    }
-

     @Override
     public String toString() {
        if (isEmpty())
     @Override
     public String toString() {
        if (isEmpty())


@@ -32,4 +24,12 @@ final class Stock {
 
        return String.format("{%s}", cards.getLast());
     }
 
        return String.format("{%s}", cards.getLast());
     }

+
+    Card draw() {
+       return cards.removeLast();
+    }
+
+    boolean isEmpty() {
+       return cards.isEmpty();
+    }

 }
 }