add waste

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

diff --git a/src/solitaire/Main.java b/src/solitaire/Main.java
index 1dd7555ec96c811c658dedfc2f223e709f51f276..75d65d91e811a60512c809fd2c313dc5d003cf1b 100644 (file)
--- a/src/solitaire/Main.java
+++ b/src/solitaire/Main.java
@@ -1,18 +1,25 @@
 package solitaire;
 
 class Main {
+    private static Stock stock = new Stock();
+    private static Waste waste = new Waste();
+
+    private static void printTable() {
+       System.out.printf("%s   %s\n", stock, waste);
+    }
 
     public static void main(String[] args) {
-       Deck d = new Deck();
-       System.out.println(d);
+       Card c;
+
+       while (!stock.isEmpty()) {
+           printTable();
 
-       while (!d.isEmpty()) {
-           Card c = d.draw();
+           c = stock.draw();
            c.reveal();
-           System.out.println(c);
+           waste.add(c);
        }
 
-       System.out.println(d);
+       printTable();
     }
 
 }