GinoGG
diff --git a/Collapse file
‎ch17/DrawablePolygon.java‎
Copy file name to clipboardExpand all lines: ch17/DrawablePolygon.java
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎ch17/DrawablePolygon.java‎
Copy file name to clipboardExpand all lines: ch17/DrawablePolygon.java
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎ch17/Drawing.bak‎
Copy file name to clipboardExpand all lines: ch17/Drawing.bak
+6-15Lines changed: 6 additions & 15 deletions b/Collapse file
‎ch17/Drawing.bak‎
Copy file name to clipboardExpand all lines: ch17/Drawing.bak
+6-15Lines changed: 6 additions & 15 deletions
diff --git a/Collapse file
‎ch17/Sim1.java‎ ‎ch17/Main.java‎ch17/Sim1.java renamed to ch17/Main.java
Copy file name to clipboardExpand all lines: ch17/Main.java
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎ch17/Sim1.java‎ ‎ch17/Main.java‎ch17/Sim1.java renamed to ch17/Main.java
Copy file name to clipboardExpand all lines: ch17/Main.java
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎ch17/Mole.java‎
Copy file name to clipboardExpand all lines: ch17/Mole.java
-43Lines changed: 0 additions & 43 deletions b/Collapse file
‎ch17/Mole.java‎
Copy file name to clipboardExpand all lines: ch17/Mole.java
-43Lines changed: 0 additions & 43 deletions
diff --git a/Collapse file
‎ch17/MoleHill.java‎
Copy file name to clipboardExpand all lines: ch17/MoleHill.java
-54Lines changed: 0 additions & 54 deletions b/Collapse file
‎ch17/MoleHill.java‎
Copy file name to clipboardExpand all lines: ch17/MoleHill.java
-54Lines changed: 0 additions & 54 deletions
diff --git a/Collapse file
‎ch17/MovingPolygon.java‎
Copy file name to clipboardExpand all lines: ch17/MovingPolygon.java
-56Lines changed: 0 additions & 56 deletions b/Collapse file
‎ch17/MovingPolygon.java‎
Copy file name to clipboardExpand all lines: ch17/MovingPolygon.java
-56Lines changed: 0 additions & 56 deletions
diff --git a/Collapse file
‎ch17/RegularPolygon.java‎
Copy file name to clipboardExpand all lines: ch17/RegularPolygon.java
+4-33Lines changed: 4 additions & 33 deletions b/Collapse file
‎ch17/RegularPolygon.java‎
Copy file name to clipboardExpand all lines: ch17/RegularPolygon.java
+4-33Lines changed: 4 additions & 33 deletions
diff --git a/Collapse file
‎ch17/RotatingPolygon.java‎
Copy file name to clipboardExpand all lines: ch17/RotatingPolygon.java
-75Lines changed: 0 additions & 75 deletions b/Collapse file
‎ch17/RotatingPolygon.java‎
Copy file name to clipboardExpand all lines: ch17/RotatingPolygon.java
-75Lines changed: 0 additions & 75 deletions
@@ -7,7 +7,7 @@
  */
 public class DrawablePolygon extends Polygon implements Actor {
 
-    public Color color;
+    protected Color color;
 
     /**
      * Creates an empty polygon.
 
@@ -4,11 +4,11 @@ import java.awt.Graphics;
 import java.util.ArrayList;
 
 /**
- * Draws a collection of actors.
+ * Draws a collection of DrawablePolygons.
  */
 public class Drawing extends Canvas {
 
-    private ArrayList<ColorPolygon> list;
+    private ArrayList<DrawablePolygon> list;
 
     /**
      * Constructs a drawing of given size.
@@ -19,35 +19,26 @@ public class Drawing extends Canvas {
     public Drawing(int width, int height) {
         setSize(width, height);
         setBackground(Color.WHITE);
-        list = new ArrayList<ColorPolygon>();
+        list = new ArrayList<DrawablePolygon>();
     }
 
     /**
      * Adds a new actor to the drawing.
      * 
      * @param dp the object to add
      */
-    public void add(ColorPolygon dp) {
+    public void add(DrawablePolygon dp) {
         list.add(dp);
     }
 
-    /**
-     * Gets current actors as an array.
-     * 
-     * @return array of actor objects
-     */
-    public Object[] getActors() {
-        return list.toArray();
-    }
-
     /**
      * Draws all the actors on the canvas.
      * 
      * @param g graphics context
      */
     @Override
     public void paint(Graphics g) {
-        for (ColorPolygon dp : list) {
+        for (DrawablePolygon dp : list) {
             dp.draw(g);
         }
     }
@@ -56,7 +47,7 @@ public class Drawing extends Canvas {
      * Calls the step method of each actor and updates the drawing.
      */
     public void step() {
-        for (ColorPolygon dp : list) {
+        for (DrawablePolygon dp : list) {
             dp.step();
         }
         repaint();
 
@@ -4,7 +4,7 @@
 /**
  * Initial drawing of stationary objects.
  */
-public class Sim1 {
+public class Main {
 
     /**
      * Test program that draws a few polygons.
@@ -30,7 +30,7 @@ public static void main(String[] args) {
         drawing.add(p3);
 
         // set up the window frame
-        JFrame frame = new JFrame("Drawing (no animation)");
+        JFrame frame = new JFrame("Drawing");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.add(drawing);
         frame.pack();
 
@@ -6,10 +6,6 @@
  */
 public class RegularPolygon extends DrawablePolygon {
 
-    public static final String[] NAMES = {null, null, null,
-            "Triangle", "Square", "Pentagon", "Hexagon",
-            "Heptagon", "Octagon", "Nonagon", "Decagon"};
-
     /**
      * Constructs a regular polygon, given the number of sides.
      * 
@@ -26,7 +22,7 @@ public RegularPolygon(int nsides) {
      * @param radius from center to vertex
      */
     public RegularPolygon(int nsides, int radius) {
-        this(nsides, radius, Color.BLACK);
+        this(nsides, radius, Color.GRAY);
     }
 
     /**
@@ -57,43 +53,18 @@ public RegularPolygon(int nsides, int radius, Color color) {
         this.color = color;
 
         // the amount to rotate for each vertex (in radians)
-        double angle = 2.0 * Math.PI / nsides;
+        double theta = 2.0 * Math.PI / nsides;
 
         // rotation that makes the polygon right-side up
         double rotate = Math.PI / nsides + Math.PI / 2.0;
 
         // compute x and y coordinates, centered at the origin
         for (int i = 0; i < nsides; i++) {
-            double x = radius * Math.cos(i * angle + rotate);
+            double x = radius * Math.cos(i * theta + rotate);
+            double y = radius * Math.sin(i * theta + rotate);
             xpoints[i] = (int) Math.round(x);
-            double y = radius * Math.sin(i * angle + rotate);
             ypoints[i] = (int) Math.round(y);
         }
     }
 
-    @Override
-    public String toString() {
-        StringBuilder str = new StringBuilder();
-        if (npoints < NAMES.length) {
-            str.append(NAMES[npoints]);
-        } else {
-            str.append("Polygon");
-        }
-        // append the list of vertexes
-        str.append('[');
-        for (int i = 0; i < npoints; i++) {
-            if (i > 0) {
-                str.append(", ");
-            }
-            // append the next (x, y) point
-            str.append('(');
-            str.append(xpoints[i]);
-            str.append(", ");
-            str.append(ypoints[i]);
-            str.append(')');
-        }
-        str.append(']');
-        return str.toString();
-    }
-
 }