X-Git-Url: https://git.wirehaze.ovh/solitaire.git/blobdiff_plain/2ba4b0c8426f9fbe13a41fdefaf141a643e365b6..626d75d21593081644437dc6fa7392d6990df782:/src/solitaire/Main.java?ds=sidebyside

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