appendix revisions

ChrisMayfield · ChrisMayfield · commit 44526ccd44f4 · 2020-06-17T12:57:54.000-04:00
diff --git a/Checkstyle.xml b/Checkstyle.xml
@@ -34,7 +34,6 @@ Checkstyle configuration for Think Java, 2nd Edition.
         <module name="FallThrough"/>
         <module name="InnerAssignment"/>
         <module name="ModifiedControlVariable"/>
-        <module name="MultipleVariableDeclarations"/>
         <module name="OneStatementPerLine"/>
         <module name="ParameterAssignment"/>
         <module name="RequireThis">
@@ -62,7 +61,6 @@ Checkstyle configuration for Think Java, 2nd Edition.
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="AtclauseOrder"/>
         <module name="JavadocStyle"/>
-        <module name="JavadocType"/>
         <module name="NonEmptyAtclauseDescription"/>
 
         <!-- See http://checkstyle.sf.net/config_misc.html -->
diff --git a/appb/Convert.java b/appb/Convert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Allen Downey and Chris Mayfield
+ * Copyright (c) 2019 Allen Downey and Chris Mayfield
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 import java.util.Scanner;
 
 /**
- * Utility class for converting to/from the metric system.
+ * Methods for converting to/from the metric system.
  *
  * @author Allen Downey
  * @author Chris Mayfield
diff --git a/appb/DigitUtil.java b/appb/DigitUtil.java
@@ -13,20 +13,16 @@ public class DigitUtil {
      * @return true if x has one digit, false otherwise
      */
     public static boolean isSingleDigit(int x) {
-        if (x > -10 && x < 10) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public static boolean isSingleDigit2(int x) {
         return x > -10 && x < 10;
     }
 
     public static void main(String[] args) {
         System.out.println(isSingleDigit(2));
+
         boolean bigFlag = !isSingleDigit(17);
+        if (bigFlag) {
+            System.out.println("not single");
+        }
 
         int z = 9;
         if (isSingleDigit(z)) {
diff --git a/appc/Mickey.java b/appc/Mickey.java
@@ -11,7 +11,7 @@ public static void main(String[] args) {
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         Canvas canvas = new Mickey();
         canvas.setSize(400, 400);
-        canvas.setBackground(Color.white);
+        canvas.setBackground(Color.WHITE);
         frame.add(canvas);
         frame.pack();
         frame.setVisible(true);
diff --git a/appc/Moire.java b/appc/Moire.java
@@ -10,7 +10,7 @@ public static void main(String[] args) {
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         Canvas canvas = new Moire();
         canvas.setSize(400, 400);
-        canvas.setBackground(Color.white);
+        canvas.setBackground(Color.WHITE);
         frame.add(canvas);
         frame.pack();
         frame.setVisible(true);
diff --git a/appd/Complex.java b/appd/Complex.java
@@ -1,10 +1,13 @@
 import java.awt.Rectangle;
 
 /**
- * Example from "My method doesn't return what I expect."
+ * Examples from Logic Errors section.
  */
 public class Complex {
 
+    /**
+     * My method doesn't return what I expect.
+     */
     public static Rectangle intersection(Rectangle a, Rectangle b) {
         int x1 = Math.min(a.x, b.x);
         int y1 = Math.min(a.y, b.y);
@@ -14,10 +17,19 @@ public static Rectangle intersection(Rectangle a, Rectangle b) {
         return rect;
     }
 
+    /**
+     * I've got a big, hairy expression and it doesn’t do what I expect.
+     */
     public static void main(String[] args) {
-        Rectangle x = new Rectangle(0, 0, 10, 10);
-        Rectangle y = new Rectangle(-5, -5, -5, -5);
-        System.out.println(intersection(x, y));
+        Rectangle rect = new Rectangle(0, 0, 10, 10);
+        Rectangle ngle = new Rectangle(-5, -5, -5, -5);
+        System.out.println(intersection(rect, ngle));
+
+        double halfWidth = 0.5 * rect.getWidth();
+        double halfHeight = 0.5 * rect.getHeight();
+        int dx = (int) Math.round(halfWidth);
+        int dy = (int) Math.round(halfHeight);
+        rect.translate(dx, dy);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017 Allen Downey and Chris Mayfield`
	`2`	`+ * Copyright (c) 2019 Allen Downey and Chris Mayfield`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`5`	`5`	`* of this software and associated documentation files (the "Software"), to deal`
`@@ -23,7 +23,7 @@`
`23`	`23`	`import java.util.Scanner;`
`24`	`24`
`25`	`25`	`/**`
`26`		`- * Utility class for converting to/from the metric system.`
	`26`	`+ * Methods for converting to/from the metric system.`
`27`	`27`	`*`
`28`	`28`	`* @author Allen Downey`
`29`	`29`	`* @author Chris Mayfield`