ch13 revisions

Author: ChrisMayfield

Checkstyle.xml

@@ -62,14 +62,11 @@ Checkstyle configuration for Think Java, 2nd Edition.
 
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="AtclauseOrder"/>
-        <module name="JavadocMethod"/>
-        <module name="JavadocStyle"/>
-        <module name="JavadocType">
 <!--
-           <property name="authorFormat" value="\S"/>
-           <property name="versionFormat" value="\S"/>
+        <module name="JavadocMethod"/>
 -->
-        </module>
+        <module name="JavadocStyle"/>
+        <module name="JavadocType"/>
         <module name="NonEmptyAtclauseDescription"/>
 
         <!-- See http://checkstyle.sf.net/config_misc.html -->

ch13/Deck.java

@@ -1,11 +1,14 @@
-import java.util.Arrays;
 import java.util.Random;
 
 /**
  * A deck of playing cards (of fixed length).
  */
 public class Deck {
 
+    // This is a class variable so we don't have to create
+    // a new Random object every time we call randomInt.
+    private static Random random = new Random();
+
     private Card[] cards;
 
     /**
@@ -49,7 +52,7 @@ public void print() {
      * Returns a string representation of the deck.
      */
     public String toString() {
-        return Arrays.toString(this.cards);
+        return "TODO";
     }
 
     /**
@@ -122,4 +125,11 @@ public Deck mergeSort() {
      */
     public void insertionSort() {
     }
+
+    /**
+     * Helper method for insertion sort.
+     */
+    private void insert(Card card, int i) {
+    }
+
 }

ch13/Pile.java

@@ -31,17 +31,17 @@ public void addDeck(Deck deck) {
     }
 
     /**
-     * Removes a card from the top of the pile.
+     * Returns true if this pile has no cards.
      */
-    public Card popCard() {
-        return this.cards.remove(0);
+    public boolean isEmpty() {
+        return this.cards.isEmpty();
     }
 
     /**
-     * Returns the number of cards in the pile.
+     * Removes a card from the top of the pile.
      */
-    public int size() {
-        return this.cards.size();
+    public Card popCard() {
+        return this.cards.remove(0);
     }
 
 }

ch13/War.java

@@ -16,7 +16,7 @@ public static void main(String[] args) {
         p2.addDeck(deck.subdeck(26, 51));
 
         // while both piles are not empty
-        while (p1.size() > 0 && p2.size() > 0) {
+        while (!p1.isEmpty() && !p2.isEmpty()) {
             Card c1 = p1.popCard();
             Card c2 = p2.popCard();
 
@@ -34,7 +34,7 @@ public static void main(String[] args) {
         }
 
         // display the winner
-        if (p1.size() > 0) {
+        if (p2.isEmpty()) {
             System.out.println("Player 1 wins!");
         } else {
             System.out.println("Player 2 wins!");