review ap01..ch07

ap01/Series.java

@@ -0,0 +1,25 @@
+/**
+ * Example method from Chapter 6.
+ */
+public class Series {
+
+    public static int fibonacci(int n) {
+        if (n == 1 || n == 2) {
+            return 1;
+        }
+        return fibonacci(n - 1) + fibonacci(n - 2);
+    }
+
+    public static void main(String[] args) {
+        if (fibonacci(1) != 1) {
+            System.err.println("fibonacci(1) is incorrect");
+        }
+        if (fibonacci(2) != 1) {
+            System.err.println("fibonacci(2) is incorrect");
+        }
+        if (fibonacci(3) != 2) {
+            System.err.println("fibonacci(3) is incorrect");
+        }
+    }
+
+}

ch06/SeriesTest.java → ap01/SeriesTest.java

@@ -10,4 +10,5 @@ public void testFibonacci() {
         assertEquals(1, Series.fibonacci(2));
         assertEquals(2, Series.fibonacci(3));
     }
+
 }

ap02/Drawing.java

@@ -4,10 +4,6 @@
 
 public class Drawing extends Canvas {
 
-    // this is here to suppress a warning; you can read about it at
-    // http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html
-    static final long serialVersionUID = 1;
-
     public static void main(String[] args) {
         JFrame frame = new JFrame("My Drawing");
         Canvas drawing = new Drawing();
@@ -20,4 +16,5 @@ public static void main(String[] args) {
     public void paint(Graphics g) {
         g.fillOval(100, 100, 200, 200);
     }
+
 }

ap02/Mickey.java

@@ -1,20 +1,16 @@
 import java.awt.Canvas;
+import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Rectangle;
-
 import javax.swing.JFrame;
 
-
 public class Mickey extends Canvas {
 
-    // this is here to suppress a warning; you can read about it at
-    // http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html
-    static final long serialVersionUID = 1;
-
     public static void main(String[] args) {
-        JFrame frame = new JFrame("My Drawing");
+        JFrame frame = new JFrame("Mickey Mouse");
         Canvas canvas = new Mickey();
         canvas.setSize(400, 400);
+        canvas.setBackground(Color.white);
         frame.add(canvas);
         frame.pack();
         frame.setVisible(true);
@@ -25,6 +21,10 @@ public void paint(Graphics g) {
         mickey(g, bb);
     }
 
+    public void boxOval(Graphics g, Rectangle bb) {
+        g.fillOval(bb.x, bb.y, bb.width, bb.height);
+    }
+
     public void mickey(Graphics g, Rectangle bb) {
         boxOval(g, bb);
 
@@ -39,7 +39,4 @@ public void mickey(Graphics g, Rectangle bb) {
         boxOval(g, half);
     }
 
-    public void boxOval(Graphics g, Rectangle bb) {
-        g.fillOval(bb.x, bb.y, bb.width, bb.height);
-    }
 }

ap02/Moire.java

@@ -1,15 +1,19 @@
 import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.Graphics;
-
 import javax.swing.JFrame;
 
-
 public class Moire extends Canvas {
 
-    // this is here to suppress a warning; you can read about it at
-    // http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html
-    static final long serialVersionUID = 1;
+    public static void main(String[] args) {
+        JFrame frame = new JFrame("Moire Pattern");
+        Canvas canvas = new Moire();
+        canvas.setSize(400, 400);
+        canvas.setBackground(Color.white);
+        frame.add(canvas);
+        frame.pack();
+        frame.setVisible(true);
+    }
 
     public void paint(Graphics g) {
         int i = 90;
@@ -19,19 +23,4 @@ public void paint(Graphics g) {
         }
     }
 
-    public static void main(String[] args) {
-        // make the frame
-        JFrame frame = new JFrame();
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        // add the canvas
-        Canvas canvas = new Moire();
-        canvas.setSize(400, 400);
-        canvas.setBackground(Color.white);
-        frame.getContentPane().add(canvas);
-
-        // show the frame
-        frame.pack();
-        frame.setVisible(true);
-    }
 }

ch01/Goodbye.java

@@ -10,4 +10,5 @@ public static void main(String[] args) {
         System.out.print("Goodbye, ");  // note the space
         System.out.println("cruel world");
     }
+
 }

ch01/Hello.java

@@ -4,4 +4,5 @@ public static void main(String[] args) {
         // generate some simple output
         System.out.println("Hello, World!");
     }
+
 }

ch02/Variables.java

@@ -6,7 +6,6 @@ public class Variables {
     public static void main(String[] args) {
 
         String message;
-
         int x;
 
         String firstName;
@@ -80,4 +79,5 @@ public static void main(String[] args) {
         hour = minute + 1;  // correct
         // minute + 1 = hour;  // compiler error
     }
+
 }

ch03/Convert.java

@@ -23,4 +23,5 @@ public static void main(String[] args) {
         System.out.printf("%.2f cm = %d ft, %d in\n",
                           cm, feet, remainder);
     }
+
 }

ch03/Echo.java

@@ -14,4 +14,5 @@ public static void main(String[] args) {
         line = in.nextLine();
         System.out.println("You also said: " + line);
     }
+
 }

ch03/GuessStarter.java

@@ -11,4 +11,5 @@ public static void main(String[] args) {
         int number = random.nextInt(100) + 1;
         System.out.println(number);
     }
+
 }

ch03/Input.java

@@ -12,4 +12,5 @@ public static void main(String[] args) {
         double pi = 3.14159;
         double x = (int) pi * 20.0;
     }
+
 }

ch03/ScannerBug.java

@@ -22,4 +22,5 @@ public static void main(String[] args) {
         name = in.nextLine();
         System.out.printf("Hello %s, age %d\n", name, age);
     }
+
 }

ch04/Methods.java

@@ -18,4 +18,5 @@ public static void main(String[] args) {
         double x3 = Math.exp(Math.log(10.0));
         double x4 = Math.pow(2.0, 10.0);
     }
+
 }

ch04/NewLine.java

@@ -15,4 +15,5 @@ public static void main(String[] args) {
         threeLine();
         System.out.println("Second line.");
     }
+
 }

ch04/PrintTime.java

@@ -11,4 +11,5 @@ public static void main(String[] args) {
         int minute = 59;
         printTime(hour, minute);
     }
+
 }

ch04/PrintTwice.java

@@ -8,4 +8,5 @@ public static void printTwice(String s) {
     public static void main(String[] args) {
         printTwice("Don't make me say this twice!");
     }
+
 }

ch06/Series.java

@@ -146,4 +146,5 @@ public static void main(String[] args) {
         System.out.println("fibonacci");
         System.out.println(fibonacci(3));
     }
+
 }

ch07/Exercise.java

@@ -0,0 +1,19 @@
+public class Exercise {
+
+    public static void main(String[] args) {
+        loop(10);
+    }
+
+    public static void loop(int n) {
+        int i = n;
+        while (i > 1) {
+            System.out.println(i);
+            if (i % 2 == 0) {
+                i = i / 2;
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+
+}

ch07/Loops.java

@@ -29,4 +29,5 @@ public static void main(String[] args) {
         System.out.println("sequence");
         sequence(10);
     }
+
 }

ch07/Tables.java

@@ -153,4 +153,5 @@ public static void main(String[] args) {
         System.out.println("printTable4");
         printTable4(6);
     }
+
 }

ch07/Validate.java

@@ -50,4 +50,5 @@ public static double addNumbers() {
         }
         return sum;
     }
+
 }