cleanup

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

diff --git a/src/solitaire/Main.java b/src/solitaire/Main.java
index 75d65d91e811a60512c809fd2c313dc5d003cf1b..922d824063d57580e9d097395e52d4ed195c5341 100644 (file)
--- a/src/solitaire/Main.java
+++ b/src/solitaire/Main.java
@@ -3,10 +3,7 @@ package solitaire;
 class Main {
     private static Stock stock = new Stock();
     private static Waste waste = new Waste();
 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);
-    }
+    private static Foundation foundation = new Foundation(Suit.CLUBS);

 
     public static void main(String[] args) {
        Card c;
 
     public static void main(String[] args) {
        Card c;


@@ -16,10 +13,16 @@ class Main {
 
            c = stock.draw();
            c.reveal();
 
            c = stock.draw();
            c.reveal();

-           waste.add(c);
+
+           if (!foundation.add(c))
+               waste.add(c);

        }
 
        printTable();
     }
 
        }
 
        printTable();
     }
 

+    private static void printTable() {
+       System.out.printf("%s  %s\n\n%s\n\n", stock, waste, foundation);
+    }
+

 }
 }