rename act to step

ChrisMayfield · ChrisMayfield · commit 445db0e0e29e · 2019-09-12T19:03:49.000-04:00
diff --git a/ch16/Actor.java b/ch16/Actor.java
@@ -5,16 +5,16 @@
  */
 public interface Actor {
 
-    /**
-     * Updates the state of the simulation element.
-     */
-    void act();
-
     /**
      * Draws the simulation element in the context.
      * 
      * @param g graphics context
      */
     void draw(Graphics g);
 
+    /**
+     * Updates the state of the simulation element.
+     */
+    void step();
+
 }
diff --git a/ch16/BlinkingPolygon.java b/ch16/BlinkingPolygon.java
@@ -20,7 +20,7 @@ public BlinkingPolygon(int nsides, int length, Color color) {
     }
 
     @Override
-    public void act() {
+    public void step() {
         if (color != onColor) {
             color = onColor;
         } else {
diff --git a/ch16/Drawing.java b/ch16/Drawing.java
@@ -42,11 +42,11 @@ public Object[] getActors() {
     }
 
     /**
-     * Calls the act method of each actor and updates the drawing.
+     * Calls the step method of each actor and updates the drawing.
      */
-    public void next() {
+    public void step() {
         for (Actor actor : actors) {
-            actor.act();
+            actor.step();
         }
         repaint();
     }
diff --git a/ch16/Mole.java b/ch16/Mole.java
@@ -22,10 +22,10 @@ public Mole(int x, int y) {
     }
 
     @Override
-    public void act() {
+    public void step() {
         // blink on/off at random times
         if (alive && Math.random() < 0.5) {
-            super.act();
+            super.step();
         }
     }
 
diff --git a/ch16/MovingPolygon.java b/ch16/MovingPolygon.java
@@ -33,7 +33,7 @@ public void setDy(int dy) {
     }
 
     @Override
-    public void act() {
+    public void step() {
 
         // edge detection
         for (int i = 0; i < npoints; i++) {
diff --git a/ch16/RegularPolygon.java b/ch16/RegularPolygon.java
@@ -80,7 +80,7 @@ public RegularPolygon(int nsides, int length, Color color) {
     }
 
     @Override
-    public void act() {
+    public void step() {
         // nothing to do
     }
 
diff --git a/ch16/RotatingPolygon.java b/ch16/RotatingPolygon.java
@@ -50,7 +50,7 @@ public void center() {
     }
 
     @Override
-    public void act() {
+    public void step() {
         // update the rotation angle
         angle = (angle + 1) % 360;
         final double RAD = Math.toRadians(angle);
diff --git a/ch16/Sim2.java b/ch16/Sim2.java
@@ -44,7 +44,7 @@ public static void main(String[] args) {
 
             // update the drawing
             toolkit.sync();
-            drawing.next();
+            drawing.step();
 
             // delay the simulation
             try {
diff --git a/ch16/Sim3.java b/ch16/Sim3.java
@@ -57,7 +57,7 @@ public static void main(String[] args) {
     @Override
     public void actionPerformed(ActionEvent e) {
         toolkit.sync();
-        drawing.next();
+        drawing.step();
     }
 
 }
diff --git a/ch16/WhackAMole.java b/ch16/WhackAMole.java
@@ -48,7 +48,7 @@ public static void main(String[] args) {
     @Override
     public void actionPerformed(ActionEvent e) {
         toolkit.sync();
-        drawing.next();
+        drawing.step();
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public BlinkingPolygon(int nsides, int length, Color color) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
`23`		`- public void act() {`
	`23`	`+ public void step() {`
`24`	`24`	`if (color != onColor) {`
`25`	`25`	`color = onColor;`
`26`	`26`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ public Object[] getActors() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * Calls the act method of each actor and updates the drawing.`
	`45`	`+ * Calls the step method of each actor and updates the drawing.`
`46`	`46`	`*/`
`47`		`- public void next() {`
	`47`	`+ public void step() {`
`48`	`48`	`for (Actor actor : actors) {`
`49`		`- actor.act();`
	`49`	`+ actor.step();`
`50`	`50`	`}`
`51`	`51`	`repaint();`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ public Mole(int x, int y) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- public void act() {`
	`25`	`+ public void step() {`
`26`	`26`	`// blink on/off at random times`
`27`	`27`	`if (alive && Math.random() < 0.5) {`
`28`		`- super.act();`
	`28`	`+ super.step();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void setDy(int dy) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public void act() {`
	`36`	`+ public void step() {`
`37`	`37`
`38`	`38`	`// edge detection`
`39`	`39`	`for (int i = 0; i < npoints; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public RegularPolygon(int nsides, int length, Color color) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
`83`		`- public void act() {`
	`83`	`+ public void step() {`
`84`	`84`	`// nothing to do`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void center() {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
`53`		`- public void act() {`
	`53`	`+ public void step() {`
`54`	`54`	`// update the rotation angle`
`55`	`55`	`angle = (angle + 1) % 360;`
`56`	`56`	`final double RAD = Math.toRadians(angle);`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static void main(String[] args) {`
`57`	`57`	`@Override`
`58`	`58`	`public void actionPerformed(ActionEvent e) {`
`59`	`59`	`toolkit.sync();`
`60`		`- drawing.next();`
	`60`	`+ drawing.step();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static void main(String[] args) {`
`48`	`48`	`@Override`
`49`	`49`	`public void actionPerformed(ActionEvent e) {`
`50`	`50`	`toolkit.sync();`
`51`		`- drawing.next();`
	`51`	`+ drawing.step();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`}`