ijeetu
diff --git a/Collapse file
‎Checkstyle.xml‎
Copy file name to clipboardExpand all lines: Checkstyle.xml
+3-6Lines changed: 3 additions & 6 deletions b/Collapse file
‎Checkstyle.xml‎
Copy file name to clipboardExpand all lines: Checkstyle.xml
+3-6Lines changed: 3 additions & 6 deletions
diff --git a/Collapse file
‎ch13/Deck.java‎
Copy file name to clipboardExpand all lines: ch13/Deck.java
+12-2Lines changed: 12 additions & 2 deletions b/Collapse file
‎ch13/Deck.java‎
Copy file name to clipboardExpand all lines: ch13/Deck.java
+12-2Lines changed: 12 additions & 2 deletions
diff --git a/Collapse file
‎ch13/Pile.java‎
Copy file name to clipboardExpand all lines: ch13/Pile.java
+6-6Lines changed: 6 additions & 6 deletions b/Collapse file
‎ch13/Pile.java‎
Copy file name to clipboardExpand all lines: ch13/Pile.java
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/Collapse file
‎ch13/War.java‎
Copy file name to clipboardExpand all lines: ch13/War.java
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎ch13/War.java‎
Copy file name to clipboardExpand all lines: ch13/War.java
+2-2Lines changed: 2 additions & 2 deletions
@@ -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 -->
 
@@ -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) {
+    }
+
 }
@@ -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);
     }
 
 }
@@ -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!");
Original file line number	Diff line number	Diff line change
`@@ -31,17 +31,17 @@ public void addDeck(Deck deck) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
`34`		`- * Removes a card from the top of the pile.`
	`34`	`+ * Returns true if this pile has no cards.`
`35`	`35`	`*/`
`36`		`- public Card popCard() {`
`37`		`- return this.cards.remove(0);`
	`36`	`+ public boolean isEmpty() {`
	`37`	`+ return this.cards.isEmpty();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`		`- * Returns the number of cards in the pile.`
	`41`	`+ * Removes a card from the top of the pile.`
`42`	`42`	`*/`
`43`		`- public int size() {`
`44`		`- return this.cards.size();`
	`43`	`+ public Card popCard() {`
	`44`	`+ return this.cards.remove(0);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`}`