Merge branch 'master' of https://github.com/AllenDowney/ThinkJavaCode

ChrisMayfield · ChrisMayfield · commit 7302e62b627c · 2016-12-27T12:27:20.000-05:00
diff --git a/ap02/Moire.java b/ap02/Moire.java
@@ -18,7 +18,7 @@ public static void main(String[] args) {
     public void paint(Graphics g) {
         int i = 90;
         while (i < getWidth()) {
-            g.drawOval (0, 0, i, i);
+            g.drawOval(0, 0, i, i);
             i = i + 3;
         }
     }
diff --git a/ch05/Conditional.java b/ch05/Conditional.java
@@ -1,5 +1,3 @@
-import java.util.Scanner;
-
 /**
  * Examples from Chapter 5.
  */
diff --git a/ch05/Exercise.java b/ch05/Exercise.java
@@ -18,7 +18,7 @@ public static void main(String[] args) {
 
     public static void clink(int fork) {
         System.out.print("It's ");
-        zoop("breakfast ", fork) ;
+        zoop("breakfast ", fork);
     }
 
     public static void ping(String strangStrung) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static void main(String[] args) {`
`18`	`18`	`public void paint(Graphics g) {`
`19`	`19`	`int i = 90;`
`20`	`20`	`while (i < getWidth()) {`
`21`		`- g.drawOval (0, 0, i, i);`
	`21`	`+ g.drawOval(0, 0, i, i);`
`22`	`22`	`i = i + 3;`
`23`	`23`	`}`
`24`	`24`	`}`