revised ch16

ChrisMayfield · ChrisMayfield · commit 2a634e3712c7 · 2019-10-07T07:06:56.000-04:00
diff --git a/ch16/BlinkingPolygon.java b/ch16/BlinkingPolygon.java
@@ -34,8 +34,8 @@ public void step() {
         // toggle visibility every 10 steps
         count++;
         if (count == 10) {
-            count = 0;
             visible = !visible;
+            count = 0;
         }
     }
 
diff --git a/ch16/DrawablePolygon.java b/ch16/DrawablePolygon.java
@@ -5,14 +5,14 @@
 /**
  * Specialization of Polygon that has a color and the ability to draw itself.
  */
-public class ColorPolygon extends Polygon implements Actor {
+public class DrawablePolygon extends Polygon implements Actor {
 
-    protected Color color;
+    public Color color;
 
     /**
      * Creates an empty polygon.
      */
-    public ColorPolygon() {
+    public DrawablePolygon() {
         super();
         color = Color.GRAY;
     }
@@ -38,7 +38,7 @@ public void step() {
      * @param args command-line arguments
      */
     public static void main(String[] args) {
-        ColorPolygon p = new ColorPolygon();
+        DrawablePolygon p = new DrawablePolygon();
         p.addPoint(57, 110);
         p.addPoint(100, 35);
         p.addPoint(143, 110);
diff --git a/ch16/Drawing.bak b/ch16/Drawing.bak
@@ -25,10 +25,10 @@ public class Drawing extends Canvas {
     /**
      * Adds a new actor to the drawing.
      * 
-     * @param cp the object to add
+     * @param dp the object to add
      */
-    public void add(ColorPolygon cp) {
-        list.add(cp);
+    public void add(ColorPolygon dp) {
+        list.add(dp);
     }
 
     /**
@@ -47,17 +47,17 @@ public class Drawing extends Canvas {
      */
     @Override
     public void paint(Graphics g) {
-        for (ColorPolygon cp : list) {
-            cp.draw(g);
+        for (ColorPolygon dp : list) {
+            dp.draw(g);
         }
     }
 
     /**
      * Calls the step method of each actor and updates the drawing.
      */
     public void step() {
-        for (ColorPolygon cp : list) {
-            cp.step();
+        for (ColorPolygon dp : list) {
+            dp.step();
         }
         repaint();
     }
diff --git a/ch16/RegularPolygon.java b/ch16/RegularPolygon.java
@@ -4,7 +4,7 @@
  * A polygon that is equiangular (all angles are equal in measure) and
  * equilateral (all sides have the same length). It also has a color.
  */
-public class RegularPolygon extends ColorPolygon {
+public class RegularPolygon extends DrawablePolygon {
 
     public static final String[] NAMES = {null, null, null,
             "Triangle", "Square", "Pentagon", "Hexagon",
diff --git a/ch16/Sim1.java b/ch16/Sim1.java
@@ -14,9 +14,9 @@ public class Sim1 {
     public static void main(String[] args) {
 
         // create some regular polygons
-        ColorPolygon p1 = new RegularPolygon(3, 50, Color.GREEN);
-        ColorPolygon p2 = new RegularPolygon(6, 50, Color.ORANGE);
-        ColorPolygon p3 = new RegularPolygon(360, 50, Color.BLUE);
+        DrawablePolygon p1 = new RegularPolygon(3, 50, Color.GREEN);
+        DrawablePolygon p2 = new RegularPolygon(6, 50, Color.ORANGE);
+        DrawablePolygon p3 = new RegularPolygon(360, 50, Color.BLUE);
 
         // move them out of the corner
         p1.translate(100, 80);
diff --git a/ch16/Sprite.java b/ch16/Sprite.java
@@ -12,7 +12,6 @@
 public class Sprite implements Actor, KeyListener {
 
     private Image image;
-
     private int xpos;
     private int ypos;
     private int dx;
@@ -26,10 +25,10 @@ public class Sprite implements Actor, KeyListener {
      * @param ypos initial Y coordinate
      */
     public Sprite(String path, int xpos, int ypos) {
+        this.xpos = xpos;
+        this.ypos = ypos;
         try {
             this.image = ImageIO.read(new File(path));
-            this.xpos = xpos;
-            this.ypos = ypos;
         } catch (IOException e) {
             e.printStackTrace();
         }

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public void step() {`
`34`	`34`	`// toggle visibility every 10 steps`
`35`	`35`	`count++;`
`36`	`36`	`if (count == 10) {`
`37`		`- count = 0;`
`38`	`37`	`visible = !visible;`
	`38`	`+ count = 0;`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ public class Drawing extends Canvas {`
`25`	`25`	`/**`
`26`	`26`	`* Adds a new actor to the drawing.`
`27`	`27`	`*`
`28`		`- * @param cp the object to add`
	`28`	`+ * @param dp the object to add`
`29`	`29`	`*/`
`30`		`- public void add(ColorPolygon cp) {`
`31`		`- list.add(cp);`
	`30`	`+ public void add(ColorPolygon dp) {`
	`31`	`+ list.add(dp);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
`@@ -47,17 +47,17 @@ public class Drawing extends Canvas {`
`47`	`47`	`*/`
`48`	`48`	`@Override`
`49`	`49`	`public void paint(Graphics g) {`
`50`		`- for (ColorPolygon cp : list) {`
`51`		`- cp.draw(g);`
	`50`	`+ for (ColorPolygon dp : list) {`
	`51`	`+ dp.draw(g);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`	`56`	`* Calls the step method of each actor and updates the drawing.`
`57`	`57`	`*/`
`58`	`58`	`public void step() {`
`59`		`- for (ColorPolygon cp : list) {`
`60`		`- cp.step();`
	`59`	`+ for (ColorPolygon dp : list) {`
	`60`	`+ dp.step();`
`61`	`61`	`}`
`62`	`62`	`repaint();`
`63`	`63`	`}`