draw before step; whitespace

ChrisMayfield · ChrisMayfield · commit c3eb035f496f · 2019-09-14T15:41:18.000-04:00
diff --git a/ch16/BlinkingPolygon.java b/ch16/BlinkingPolygon.java
@@ -21,21 +21,22 @@ public BlinkingPolygon(int nsides, int radius, Color color) {
         drawFlag = true;
         count = 0;
     }
-    
+
+    @Override
+    public void draw(Graphics g) {
+        if (drawFlag) {
+            super.draw(g);
+        }
+    }
+
     @Override
     public void step() {
-        // every 10 steps toggle drawFlag
+        // toggle drawFlag every 10 steps
         count++;
         if (count == 10) {
             count = 0;
             drawFlag = !drawFlag;
         }
     }
-    
-    @Override
-    public void draw(Graphics g) {
-    	if (drawFlag) {
-    		super.draw(g);
-    	}
-    }
+
 }
diff --git a/ch16/MovingPolygon.java b/ch16/MovingPolygon.java
@@ -52,4 +52,5 @@ public void step() {
         // move one step
         translate(dx, dy);
     }
+
 }
diff --git a/ch16/RegularPolygon.java b/ch16/RegularPolygon.java
@@ -20,7 +20,7 @@ public class RegularPolygon extends Polygon implements Actor {
      * @param nsides the number of sides
      */
     public RegularPolygon(int nsides) {
-        this(nsides, 6);
+        this(nsides, 50);
     }
 
     /**
@@ -69,23 +69,23 @@ public RegularPolygon(int nsides, int radius, Color color) {
         // compute x and y coordinates, centered around the origin
         for (int i = 0; i < nsides; i++) {
             double x = radius * Math.cos(i * angle + rotate);
-			xpoints[i] = (int) Math.round(x);
+            xpoints[i] = (int) Math.round(x);
             double y = radius * Math.sin(i * angle + rotate);
-			ypoints[i] = (int) Math.round(y);
+            ypoints[i] = (int) Math.round(y);
         }
     }
 
-    @Override
-    public void step() {
-        // do nothing
-    }
-
     @Override
     public void draw(Graphics g) {
         g.setColor(color);
         g.fillPolygon(this);
     }
 
+    @Override
+    public void step() {
+        // do nothing
+    }
+
     @Override
     public String toString() {
         StringBuilder str = new StringBuilder();
@@ -110,4 +110,5 @@ public String toString() {
         str.append(']');
         return str.toString();
     }
+
 }
diff --git a/ch16/Sim1.java b/ch16/Sim1.java
@@ -37,4 +37,5 @@ public static void main(String[] args) {
         frame.pack();
         frame.setVisible(true);
     }
+
 }
diff --git a/ch16/Sim2.java b/ch16/Sim2.java
@@ -54,4 +54,5 @@ public static void main(String[] args) {
             }
         }
     }
+
 }
diff --git a/ch16/Sim3.java b/ch16/Sim3.java
@@ -48,7 +48,7 @@ public void actionPerformed(ActionEvent e) {
         toolkit.sync();
         drawing.step();
     }
-    
+
     /**
      * Create and start the timer.
      *
@@ -59,4 +59,5 @@ public static void main(String[] args) {
         Timer timer = new Timer(1000 / 30, sim);
         timer.start();
     }
+
 }
diff --git a/ch16/WhackAMole.java b/ch16/WhackAMole.java
@@ -42,17 +42,16 @@ public void actionPerformed(ActionEvent e) {
         toolkit.sync();
         drawing.step();
     }
-    
+
     /**
      * Create and start the timer.
      *
      * @param args command-line arguments
      */
     public static void main(String[] args) {
         WhackAMole sim = new WhackAMole();
-        
-        // TODO: Can we explain the 1000 / 30 or write it so it's obvious?
         Timer timer = new Timer(1000 / 30, sim);
         timer.start();
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,5 @@ public void step() {`
`52`	`52`	`// move one step`
`53`	`53`	`translate(dx, dy);`
`54`	`54`	`}`
	`55`	`+`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,5 @@ public static void main(String[] args) {`
`37`	`37`	`frame.pack();`
`38`	`38`	`frame.setVisible(true);`
`39`	`39`	`}`
	`40`	`+`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,5 @@ public static void main(String[] args) {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
	`57`	`+`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void actionPerformed(ActionEvent e) {`
`48`	`48`	`toolkit.sync();`
`49`	`49`	`drawing.step();`
`50`	`50`	`}`
`51`		`-`
	`51`	`+`
`52`	`52`	`/**`
`53`	`53`	`* Create and start the timer.`
`54`	`54`	`*`
`@@ -59,4 +59,5 @@ public static void main(String[] args) {`
`59`	`59`	`Timer timer = new Timer(1000 / 30, sim);`
`60`	`60`	`timer.start();`
`61`	`61`	`}`
	`62`	`+`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,16 @@ public void actionPerformed(ActionEvent e) {`
`42`	`42`	`toolkit.sync();`
`43`	`43`	`drawing.step();`
`44`	`44`	`}`
`45`		`-`
	`45`	`+`
`46`	`46`	`/**`
`47`	`47`	`* Create and start the timer.`
`48`	`48`	`*`
`49`	`49`	`* @param args command-line arguments`
`50`	`50`	`*/`
`51`	`51`	`public static void main(String[] args) {`
`52`	`52`	`WhackAMole sim = new WhackAMole();`
`53`		`-`
`54`		`- // TODO: Can we explain the 1000 / 30 or write it so it's obvious?`
`55`	`53`	`Timer timer = new Timer(1000 / 30, sim);`
`56`	`54`	`timer.start();`
`57`	`55`	`}`
	`56`	`+`
`58`	`57`	`}`