minor edits for consistency

ChrisMayfield · ChrisMayfield · commit 5486f9fdb668 · 2017-08-10T22:40:04.000-04:00
diff --git a/ch14/CardCollection.java b/ch14/CardCollection.java
@@ -88,7 +88,7 @@ public Card getCard(int i) {
     /**
      * Returns the last card.
      */
-    public Card last() {
+    public Card lastCard() {
         int i = size() - 1;
         return cards.get(i);
     }
diff --git a/ch14/Eights.java b/ch14/Eights.java
@@ -67,7 +67,7 @@ public void reshuffle() {
     /**
      * Returns a card from the draw pile.
      */
-    public Card draw() {
+    public Card drawCard() {
         if (drawPile.empty()) {
             reshuffle();
         }
@@ -94,20 +94,14 @@ public void displayState() {
         discardPile.display();
         System.out.print("Draw pile: ");
         System.out.println(drawPile.size() + " cards");
-    }
-
-    /**
-     * Waits for the user to press enter.
-     */
-    public void waitForUser() {
         in.nextLine();
     }
 
     /**
      * One player takes a turn.
      */
     public void takeTurn(Player player) {
-        Card prev = discardPile.last();
+        Card prev = discardPile.lastCard();
         Card next = player.play(this, prev);
         discardPile.addCard(next);
 
@@ -124,7 +118,6 @@ public void playGame() {
         // keep playing until there's a winner
         while (!isDone()) {
             displayState();
-            waitForUser();
             takeTurn(player);
             player = nextPlayer(player);
         }
diff --git a/ch14/Player.java b/ch14/Player.java
@@ -57,7 +57,7 @@ public Card searchForMatch(Card prev) {
      */
     public Card drawForMatch(Eights eights, Card prev) {
         while (true) {
-            Card card = eights.draw();
+            Card card = eights.drawCard();
             System.out.println(name + " draws " + card);
             if (cardMatches(card, prev)) {
                 return card;

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public Card getCard(int i) {`
`88`	`88`	`/**`
`89`	`89`	`* Returns the last card.`
`90`	`90`	`*/`
`91`		`- public Card last() {`
	`91`	`+ public Card lastCard() {`
`92`	`92`	`int i = size() - 1;`
`93`	`93`	`return cards.get(i);`
`94`	`94`	`}`