Most recent and change to (c)

Ant-Common.xml

@@ -15,6 +15,12 @@
     To see options, type: ant -p
   </description>
 
+  <condition property="version1.8">
+    <equals arg1="1.8" arg2="${ant.java.version}"/>
+  </condition>
+
+
+  <!--===========================================================-->
   <macrodef name="jrun">
      <attribute name="cls" default="NOT SET"/>
      <attribute name="dirpath" default=""/>
@@ -46,6 +52,8 @@
      </sequential>
   </macrodef>
 
+
+  <!--===========================================================-->
   <macrodef name="jrunconsole">
      <attribute name="cls" default="NOT SET"/>
      <attribute name="dirpath" default=""/>
@@ -72,11 +80,10 @@
      </sequential>
   </macrodef>
 
-  <condition property="version1.8">
-    <equals arg1="1.8" arg2="${ant.java.version}"/>
-  </condition>
 
-  <target name="base">
+  <!--===========================================================-->
+  <target name="base"
+   description="Build all common dependencies">
     <javac includeantruntime="false"
      classpath="${java.class.path};${basedir};${basedir}/.."
      srcdir="${basedir}/../onjava/">
@@ -89,12 +96,24 @@
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="10"/>
     </javac>
+    <javac includeantruntime="false"
+     classpath="${java.class.path};${basedir};${basedir}/.."
+     srcdir="${basedir}/../polymorphism/music/">
+      <compilerarg value="-Xmaxerrs"/>
+      <compilerarg value="10"/>
+    </javac>
     <javac includeantruntime="false"
      classpath="${java.class.path};${basedir};${basedir}/.."
      srcdir="${basedir}/../typeinfo/pets/">
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="10"/>
     </javac>
+    <javac includeantruntime="false"
+     classpath="${java.class.path};${basedir};${basedir}/.."
+     srcdir="${basedir}/../collections/">
+      <compilerarg value="-Xmaxerrs"/>
+      <compilerarg value="10"/>
+    </javac>
     <javac includeantruntime="false"
      classpath="${java.class.path};${basedir};${basedir}/.."
      srcdir="${basedir}/../generics/coffee/">
@@ -107,18 +126,13 @@
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="10"/>
     </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../polymorphism/music/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
   </target>
 
-  <target
+
-   depends="base"
+  <!--===========================================================-->
+  <target name="build"
    description="Build all classes in this directory"
-   name="build">
+   depends="base">
     <fail message="Java 8 required" unless="version1.8"/>
     <echo message="Building '${chapter}'&#13;"/>
     <echo file="${antoutput}" append="true" message="Building '${chapter}'&#13;"/>
@@ -134,10 +148,11 @@
     <echo file="${antoutput}" append="true" message="Build '${chapter}' succeeded&#13;"/>
   </target>
 
-  <target
+
-   depends="base"
+  <!--===========================================================-->
+  <target name="buildw"
    description="Build all classes in this directory, enabling 'Unchecked' warnings"
-   name="buildw">
+   depends="base">
     <fail message="Java 8 required" unless="version1.8"/>
     <echo message="Building '${chapter}'&#13;"/>
     <echo file="${antoutput}" append="true" message="Building '${chapter}'&#13;"/>
@@ -154,10 +169,22 @@
     <echo file="${antoutput}" append="true" message="Build '${chapter}' succeeded&#13;"/>
   </target>
 
-  <target
+  <!--===========================================================-->
-   depends="base"
+  <target name="verifyclean"
+    description="delete ant verify output files" >
+    <delete>
+      <fileset dir="${basedir}" casesensitive="yes">
+        <include name="**/update_output.bat" />
+        <include name="**/validate_failures.txt" />
+        <include name="**/strategies.txt" />
+      </fileset>
+    </delete>
+    <echo message="verifyclean successful"/>
+  </target>
+
+  <target name="verify"
    description="Verify output; requires Python 3.5"
-   name="verify">
+   depends="verifyclean">
     <exec dir="${basedir}" executable="python" failonerror="true">
       <arg line="../verify_output.py" />
     </exec>

HelloDate.java

@@ -1,5 +1,5 @@
 // HelloDate.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

annotations/AtUnitComposition.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitComposition.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Creating non-embedded tests.

annotations/AtUnitExample1.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitExample1.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations;

annotations/AtUnitExample2.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitExample2.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Assertions and exceptions can be used in @Tests.

annotations/AtUnitExample3.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitExample3.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations;

annotations/AtUnitExample4.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitExample4.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations;
@@ -66,16 +66,15 @@ starting
 annotations.AtUnitExample4
   . words 'All'
 (failed)
-  . scramble1 'brontosauruses'
+  . scramble2 'brontosauruses'
-ntsaueorosurbs
+tsaeborornussu
-(failed)
+
-  . scramble2 'are'
+  . scramble1 'are'
-are
+rae
 (failed)
 (3 tests)
 
->>> 3 FAILURES <<<
+>>> 2 FAILURES <<<
   annotations.AtUnitExample4: words
   annotations.AtUnitExample4: scramble1
-  annotations.AtUnitExample4: scramble2
 */

annotations/AtUnitExample5.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitExample5.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations;

annotations/AtUnitExternalTest.java

@@ -1,5 +1,5 @@
 // annotations/AtUnitExternalTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Creating non-embedded tests.

annotations/HashSetTest.java

@@ -1,5 +1,5 @@
 // annotations/HashSetTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations;

annotations/PasswordUtils.java

@@ -1,5 +1,5 @@
 // annotations/PasswordUtils.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

annotations/SimulatingNull.java

@@ -1,5 +1,5 @@
 // annotations/SimulatingNull.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.lang.annotation.*;

annotations/StackL.java

@@ -1,5 +1,5 @@
 // annotations/StackL.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // A stack built on a linkedList.

annotations/StackLStringTest.java

@@ -1,5 +1,5 @@
 // annotations/StackLStringTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Applying @Unit to generics.

annotations/Testable.java

@@ -1,5 +1,5 @@
 // annotations/Testable.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations;

annotations/UseCase.java

@@ -1,5 +1,5 @@
 // annotations/UseCase.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.lang.annotation.*;

annotations/UseCaseTracker.java

@@ -1,5 +1,5 @@
 // annotations/UseCaseTracker.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.lang.reflect.*;

annotations/database/Constraints.java

@@ -1,5 +1,5 @@
 // annotations/database/Constraints.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations.database;

annotations/database/DBTable.java

@@ -1,5 +1,5 @@
 // annotations/database/DBTable.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations.database;

annotations/database/Member.java

@@ -1,5 +1,5 @@
 // annotations/database/Member.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations.database;

annotations/database/SQLInteger.java

@@ -1,5 +1,5 @@
 // annotations/database/SQLInteger.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations.database;

annotations/database/SQLString.java

@@ -1,5 +1,5 @@
 // annotations/database/SQLString.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package annotations.database;

annotations/database/TableCreator.java

@@ -1,5 +1,5 @@
 // annotations/database/TableCreator.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Reflection-based annotation processor.

annotations/database/Uniqueness.java

@@ -1,5 +1,5 @@
 // annotations/database/Uniqueness.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Sample of nested annotations

annotations/ifx/ExtractInterface.java

@@ -1,5 +1,5 @@
 // annotations/ifx/ExtractInterface.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // javac-based annotation processing.

annotations/ifx/IfaceExtractorProcessor.java

@@ -1,5 +1,5 @@
 // annotations/ifx/IfaceExtractorProcessor.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // javac-based annotation processing.
@@ -50,30 +50,28 @@ extends AbstractProcessor {
   }
   private void
   writeInterfaceFile(String interfaceName) {
-   try {
+    try(Writer writer = processingEnv.getFiler()
-      try(Writer writer = processingEnv.getFiler()
+      .createSourceFile(interfaceName)
-        .createSourceFile(interfaceName)
+      .openWriter()) {
-        .openWriter()) {
+      String packageName = elementUtils
-        String packageName = elementUtils
+        .getPackageOf(interfaceMethods
-          .getPackageOf(interfaceMethods
+                      .get(0)).toString();
-                        .get(0)).toString();
+      writer.write(
-        writer.write(
+        "package " + packageName + ";\n");
-          "package " + packageName + ";\n");
+      writer.write("public interface " +
-        writer.write("public interface " +
+        interfaceName + " {\n");
-          interfaceName + " {\n");
+      for(Element elem : interfaceMethods) {
-        for(Element elem : interfaceMethods) {
+        ExecutableElement method =
-          ExecutableElement method =
+          (ExecutableElement)elem;
-            (ExecutableElement)elem;
+        String signature = "  public ";
-          String signature = "  public ";
+        signature += method.getReturnType()+" ";
-          signature += method.getReturnType()+" ";
+        signature += method.getSimpleName();
-          signature += method.getSimpleName();
+        signature += createArgList(
-          signature += createArgList(
+          method.getParameters());
-            method.getParameters());
+        System.out.println(signature);
-          System.out.println(signature);
+        writer.write(signature + ";\n");
-          writer.write(signature + ";\n");
-        }
-        writer.write("}");
       }
+      writer.write("}");
     } catch(Exception e) {
       throw new RuntimeException(e);
     }

annotations/ifx/Multiplier.java

@@ -1,5 +1,5 @@
 // annotations/ifx/Multiplier.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // javac-based annotation processing.

annotations/simplest/Simple.java

@@ -1,5 +1,5 @@
 // annotations/simplest/Simple.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // A bare-bones annotation.

annotations/simplest/SimpleProcessor.java

@@ -1,5 +1,5 @@
 // annotations/simplest/SimpleProcessor.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // A bare-bones annotation processor.

annotations/simplest/SimpleTest.java

@@ -1,5 +1,5 @@
 // annotations/simplest/SimpleTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Test the "Simple" annotation

arrays/AlphabeticSearch.java

@@ -1,5 +1,5 @@
 // arrays/AlphabeticSearch.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Searching with a Comparator.

arrays/ArrayOfGenericType.java

@@ -1,5 +1,5 @@
 // arrays/ArrayOfGenericType.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Arrays of generic types won't compile.

arrays/ArrayOfGenerics.java

@@ -1,5 +1,5 @@
 // arrays/ArrayOfGenerics.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // It is possible to create arrays of generics.
@@ -29,4 +29,3 @@ public class ArrayOfGenerics {
       spheres[i] = new ArrayList<>();
   }
 }
-/* Output: (None) */

arrays/ArrayOptions.java

@@ -1,5 +1,5 @@
 // arrays/ArrayOptions.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Initialization & re-assignment of arrays.

arrays/ArraySearching.java

@@ -1,5 +1,5 @@
 // arrays/ArraySearching.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using Arrays.binarySearch().

arrays/AssemblingMultidimensionalArrays.java

@@ -1,5 +1,5 @@
 // arrays/AssemblingMultidimensionalArrays.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Creating multidimensional arrays.

arrays/AutoboxingArrays.java

@@ -1,5 +1,5 @@
 // arrays/AutoboxingArrays.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

arrays/CollectionComparison.java

@@ -1,5 +1,5 @@
-// arrays/ContainerComparison.java
+// arrays/CollectionComparison.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;
@@ -11,7 +11,7 @@ class BerylliumSphere {
   public String toString() { return "Sphere " + id; }
 }
 
-public class ContainerComparison {
+public class CollectionComparison {
   public static void main(String[] args) {
     BerylliumSphere[] spheres = new BerylliumSphere[10];
     for(int i = 0; i < 5; i++)

arrays/CompType.java

@@ -1,5 +1,5 @@
 // arrays/CompType.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Implementing Comparable in a class.

arrays/ComparatorTest.java

@@ -1,5 +1,5 @@
 // arrays/ComparatorTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Implementing a Comparator for a class.

arrays/ComparingArrays.java

@@ -1,5 +1,5 @@
 // arrays/ComparingArrays.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using Arrays.equals()

arrays/CopyingArrays.java

@@ -1,5 +1,5 @@
 // arrays/CopyingArrays.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using System.arraycopy()

arrays/FillingArrays.java

@@ -1,5 +1,5 @@
 // arrays/FillingArrays.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using Arrays.fill()

arrays/IceCream.java

@@ -1,5 +1,5 @@
 // arrays/IceCream.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Returning arrays from methods.

arrays/MultiDimWrapperArray.java

@@ -1,5 +1,5 @@
 // arrays/MultiDimWrapperArray.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Multidimensional arrays of "wrapper" objects.

arrays/MultidimensionalObjectArrays.java

@@ -1,5 +1,5 @@
 // arrays/MultidimensionalObjectArrays.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

arrays/MultidimensionalPrimitiveArray.java

@@ -1,5 +1,5 @@
 // arrays/MultidimensionalPrimitiveArray.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Creating multidimensional arrays.

arrays/ParameterizedArrayType.java

@@ -1,5 +1,5 @@
 // arrays/ParameterizedArrayType.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 
@@ -23,4 +23,3 @@ public class ParameterizedArrayType {
     doubles2 = MethodParameter.f(doubles);
   }
 }
-/* Output: (None) */

arrays/PrimitiveConversionDemonstration.java

@@ -1,5 +1,5 @@
 // arrays/PrimitiveConversionDemonstration.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

arrays/PythonLists.py

@@ -1,5 +1,5 @@
 # arrays/PythonLists.py
-# ©2016 MindView LLC: see Copyright.txt
+# (c)2016 MindView LLC: see Copyright.txt
 # We make no guarantees that this code is fit for any purpose.
 # Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 

arrays/RaggedArray.java

@@ -1,5 +1,5 @@
 // arrays/RaggedArray.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

arrays/RandomSuppliersTest.java

@@ -1,5 +1,5 @@
 // arrays/RandomSuppliersTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import onjava.*;

arrays/Reverse.java

@@ -1,5 +1,5 @@
 // arrays/Reverse.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // The Collections.reverseOrder() Comparator

arrays/StringSorting.java

@@ -1,5 +1,5 @@
 // arrays/StringSorting.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Sorting an array of Strings.

arrays/SuppliersTest.java

@@ -1,5 +1,5 @@
 // arrays/SuppliersTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.function.*;

arrays/TestArrayGeneration.java

@@ -1,5 +1,5 @@
 // arrays/TestArrayGeneration.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Test the tools that use generators to fill arrays.

arrays/TestGenerated.java

@@ -1,5 +1,5 @@
 // arrays/TestGenerated.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

arrays/ThreeDWithNew.java

@@ -1,5 +1,5 @@
 // arrays/ThreeDWithNew.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

arrays/build.xml

@@ -13,10 +13,10 @@
     <jrun cls="ArraySearching" />
     <jrun cls="AssemblingMultidimensionalArrays" />
     <jrun cls="AutoboxingArrays" />
+    <jrun cls="CollectionComparison" />
     <jrun cls="ComparatorTest" />
     <jrun cls="ComparingArrays" />
     <jrun cls="CompType" />
-    <jrun cls="ContainerComparison" />
     <jrun cls="CopyingArrays" />
     <jrun cls="FillingArrays" />
     <jrun cls="IceCream" />

assertions/Assert1.java

@@ -1,5 +1,5 @@
 // assertions/Assert1.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Non-informative style of assert

assertions/Assert2.java

@@ -1,5 +1,5 @@
 // assertions/Assert2.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Assert with an informative message

assertions/LoaderAssertions.java

@@ -1,5 +1,5 @@
 // assertions/LoaderAssertions.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using the class loader to enable assertions

assertions/Queue.java

@@ -1,5 +1,5 @@
 // assertions/Queue.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstration of Design by Contract (DbC) combined

build.xml

@@ -31,14 +31,14 @@
       interfaces/build.xml
       innerclasses/build.xml
       functional/build.xml
-      containers/build.xml
+      collections/build.xml
       streams/build.xml
       exceptions/build.xml
       strings/build.xml
       typeinfo/build.xml
       generics/build.xml
       arrays/build.xml
-      containersindepth/build.xml
+      collectionsindepth/build.xml
       files/build.xml
       enums/build.xml
       annotations/build.xml
@@ -62,6 +62,46 @@
       staticchecking/build.xml
       "/>
 
+  <filelist id="testablefiles" dir="."
+    description="All directories that produce auto-testable results"
+    files="objects/build.xml
+      operators/build.xml
+      control/build.xml
+      housekeeping/build.xml
+      hiding/build.xml
+      com/build.xml
+      reuse/build.xml
+      polymorphism/build.xml
+      interfaces/build.xml
+      innerclasses/build.xml
+      functional/build.xml
+      collections/build.xml
+      streams/build.xml
+      exceptions/build.xml
+      strings/build.xml
+      typeinfo/build.xml
+      generics/build.xml
+      arrays/build.xml
+      collectionsindepth/build.xml
+      files/build.xml
+      enums/build.xml
+      annotations/build.xml
+      concurrency/build.xml
+      patterns/build.xml
+      unittesting/build.xml
+      assertions/build.xml
+      references/build.xml
+      iostreams/build.xml
+      standardio/build.xml
+      newio/build.xml
+      compression/build.xml
+      serialization/build.xml
+      preferences/build.xml
+      logging/build.xml
+      debugging/build.xml
+      staticchecking/build.xml
+      "/>
+
   <target name="run" description="Compiles and runs all examples">
     <delete file="errors.txt"/>
     <subant>
@@ -71,6 +111,15 @@
     <antcall target="finish"/>
   </target>
 
+  <target name="testable" description="Compiles and runs all examples">
+    <delete file="errors.txt"/>
+    <subant>
+      <filelist refid="testablefiles"/>
+    </subant>
+    <available file="errors.txt" property="errors"/>
+    <antcall target="finish"/>
+  </target>
+
   <target name="build" description="Compiles all examples">
     <fail message="Java 8 required" unless="version1.8"/>
     <delete file="errors.txt"/>
@@ -85,8 +134,21 @@
     <echo message="Errors occurred.  See errors.txt for information."/>
   </target>
 
+  <target name="verifyclean"
+    description="delete ant verify output files" >
+    <delete>
+      <fileset dir="${basedir}" casesensitive="yes">
+        <include name="update_output.bat" />
+        <include name="validate_failures.txt" />
+        <include name="strategies.txt" />
+      </fileset>
+    </delete>
+    <echo message="verifyclean successful"/>
+  </target>
+
   <target name="verify"
-   description="Verify output; requires Python 3.5">
+   description="Verify output; requires Python 3.5"
+   depends="verifyclean">
     <exec dir="${basedir}" executable="python" failonerror="true">
       <arg line="verify_output.py" />
     </exec>

collections/AdapterMethodIdiom.java

@@ -1,5 +1,5 @@
-// containers/AdapterMethodIdiom.java
+// collections/AdapterMethodIdiom.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // The "Adapter Method" idiom uses for-in
@@ -9,15 +9,16 @@ import java.util.*;
 class ReversibleArrayList<T> extends ArrayList<T> {
   public ReversibleArrayList(Collection<T> c) { super(c); }
   public Iterable<T> reversed() {
-    return () -> new Iterator<T>() {  // <* Describe *>
+    return new Iterable<T>() {
-      int current = size() - 1;
+      public Iterator<T> iterator() {
-      @Override
+        return new Iterator<T>() {
-      public boolean hasNext() { return current > -1; }
+          int current = size() - 1;
-      @Override
+          public boolean hasNext() { return current > -1; }
-      public T next() { return get(current--); }
+          public T next() { return get(current--); }
-      @Override
+          public void remove() { // Not implemented
-      public void remove() { // Not implemented
+            throw new UnsupportedOperationException();
-        throw new UnsupportedOperationException();
+          }
+        };
       }
     };
   }
@@ -26,7 +27,7 @@ class ReversibleArrayList<T> extends ArrayList<T> {
 public class AdapterMethodIdiom {
   public static void main(String[] args) {
     ReversibleArrayList<String> ral =
-      new ReversibleArrayList<>(
+      new ReversibleArrayList<String>(
         Arrays.asList("To be or not to be".split(" ")));
     // Grabs the ordinary iterator via iterator():
     for(String s : ral)

collections/AddingGroups.java

@@ -1,5 +1,5 @@
-// containers/AddingGroups.java
+// collections/AddingGroups.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Adding groups of elements to Collection objects.
@@ -22,4 +22,3 @@ public class AddingGroups {
                      // underlying array cannot be resized.
   }
 }
-/* Output: (None) */

collections/ApplesAndOrangesWithGenerics.java

@@ -1,5 +1,5 @@
-// containers/ApplesAndOrangesWithGenerics.java
+// collections/ApplesAndOrangesWithGenerics.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/ApplesAndOrangesWithoutGenerics.java

@@ -1,8 +1,8 @@
-// containers/ApplesAndOrangesWithoutGenerics.java
+// collections/ApplesAndOrangesWithoutGenerics.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-// Simple container use (suppressing compiler warnings)
+// Simple collection use (suppressing compiler warnings)
 // {ThrowsException}
 import java.util.*;
 

collections/ArrayIsNotIterable.java

@@ -1,5 +1,5 @@
-// containers/ArrayIsNotIterable.java
+// collections/ArrayIsNotIterable.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/AsListInference.java

@@ -1,5 +1,5 @@
-// containers/AsListInference.java
+// collections/AsListInference.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Arrays.asList() makes its best guess about type.
@@ -34,4 +34,3 @@ public class AsListInference {
        new Light(), new Heavy());
   }
 }
-/* Output: (None) */

collections/CollectionMethods.java

@@ -1,12 +1,12 @@
-// containers/ContainerMethods.java
+// collections/CollectionMethods.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import onjava.*;
 
-public class ContainerMethods {
+public class CollectionMethods {
   public static void main(String[] args) {
-    ContainerMethodDifferences.main(args);
+    CollectionMethodDifferences.main(args);
   }
 }
 /* Output:

collections/CollectionSequence.java

@@ -1,5 +1,5 @@
-// containers/CollectionSequence.java
+// collections/CollectionSequence.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
@@ -7,12 +7,12 @@ import java.util.*;
 
 public class CollectionSequence
 extends AbstractCollection<Pet> {
-  private Pet[] pets = Pets.createArray(8);
+  private Pet[] pets = Pets.array(8);
   @Override
   public int size() { return pets.length; }
   @Override
   public Iterator<Pet> iterator() {
-    return new Iterator<Pet>() {
+    return new Iterator<Pet>() { // (1)
       private int index = 0;
       @Override
       public boolean hasNext() {

collections/CrossCollectionIteration.java

@@ -1,11 +1,11 @@
-// containers/CrossContainerIteration.java
+// collections/CrossCollectionIteration.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
 import java.util.*;
 
-public class CrossContainerIteration {
+public class CrossCollectionIteration {
   public static void display(Iterator<Pet> it) {
     while(it.hasNext()) {
       Pet p = it.next();
@@ -14,7 +14,7 @@ public class CrossContainerIteration {
     System.out.println();
   }
   public static void main(String[] args) {
-    ArrayList<Pet> pets = Pets.arrayList(8);
+    List<Pet> pets = Pets.list(8);
     LinkedList<Pet> petsLL = new LinkedList<>(pets);
     HashSet<Pet> petsHS = new HashSet<>(pets);
     TreeSet<Pet> petsTS = new TreeSet<>(pets);

collections/EnvironmentVariables.java

@@ -1,5 +1,5 @@
-// containers/EnvironmentVariables.java
+// collections/EnvironmentVariables.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/ForInCollections.java

@@ -1,5 +1,5 @@
-// containers/ForInCollections.java
+// collections/ForInCollections.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // All collections work with for-in.

collections/GenericsAndUpcasting.java

@@ -1,5 +1,5 @@
-// containers/GenericsAndUpcasting.java
+// collections/GenericsAndUpcasting.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/InterfaceVsIterator.java

@@ -1,5 +1,5 @@
-// containers/InterfaceVsIterator.java
+// collections/InterfaceVsIterator.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
@@ -19,7 +19,7 @@ public class InterfaceVsIterator {
     System.out.println();
   }
   public static void main(String[] args) {
-    List<Pet> petList = Pets.arrayList(8);
+    List<Pet> petList = Pets.list(8);
     Set<Pet> petSet = new HashSet<>(petList);
     Map<String, Pet> petMap = new LinkedHashMap<>();
     String[] names = ("Ralph, Eric, Robin, Lacey, " +

collections/IterableClass.java

@@ -1,5 +1,5 @@
-// containers/IterableClass.java
+// collections/IterableClass.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Anything Iterable works with for-in.

collections/LinkedListFeatures.java

@@ -1,5 +1,5 @@
-// containers/LinkedListFeatures.java
+// collections/LinkedListFeatures.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
@@ -8,7 +8,7 @@ import java.util.*;
 public class LinkedListFeatures {
   public static void main(String[] args) {
     LinkedList<Pet> pets =
-      new LinkedList<>(Pets.arrayList(5));
+      new LinkedList<>(Pets.list(5));
     System.out.println(pets);
     // Identical:
     System.out.println(
@@ -27,9 +27,9 @@ public class LinkedListFeatures {
     System.out.println(pets);
     pets.addFirst(new Rat());
     System.out.println("After addFirst(): " + pets);
-    pets.offer(Pets.randomPet());
+    pets.offer(Pets.get());
     System.out.println("After offer(): " + pets);
-    pets.add(Pets.randomPet());
+    pets.add(Pets.get());
     System.out.println("After add(): " + pets);
     pets.addLast(new Hamster());
     System.out.println("After addLast(): " + pets);

collections/ListFeatures.java

@@ -1,5 +1,5 @@
-// containers/ListFeatures.java
+// collections/ListFeatures.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
@@ -8,7 +8,7 @@ import java.util.*;
 public class ListFeatures {
   public static void main(String[] args) {
     Random rand = new Random(47);
-    List<Pet> pets = Pets.arrayList(7);
+    List<Pet> pets = Pets.list(7);
     System.out.println("1: " + pets);
     Hamster h = new Hamster();
     pets.add(h); // Automatically resizes
@@ -53,7 +53,7 @@ public class ListFeatures {
     pets.clear(); // Remove all elements
     System.out.println("19: " + pets);
     System.out.println("20: " + pets.isEmpty());
-    pets.addAll(Pets.arrayList(4));
+    pets.addAll(Pets.list(4));
     System.out.println("21: " + pets);
     Object[] o = pets.toArray();
     System.out.println("22: " + o[3]);

collections/ListIteration.java

@@ -1,5 +1,5 @@
-// containers/ListIteration.java
+// collections/ListIteration.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
@@ -7,7 +7,7 @@ import java.util.*;
 
 public class ListIteration {
   public static void main(String[] args) {
-    List<Pet> pets = Pets.arrayList(8);
+    List<Pet> pets = Pets.list(8);
     ListIterator<Pet> it = pets.listIterator();
     while(it.hasNext())
       System.out.print(it.next() + ", " + it.nextIndex() +
@@ -21,7 +21,7 @@ public class ListIteration {
     it = pets.listIterator(3);
     while(it.hasNext()) {
       it.next();
-      it.set(Pets.randomPet());
+      it.set(Pets.get());
     }
     System.out.println(pets);
   }

collections/MapOfList.java

@@ -1,8 +1,8 @@
-// containers/MapOfList.java
+// collections/MapOfList.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package containers;
+package collections;
 import typeinfo.pets.*;
 import java.util.*;
 

collections/ModifyingArraysAsList.java

@@ -1,5 +1,5 @@
-// containers/ModifyingArraysAsList.java
+// collections/ModifyingArraysAsList.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/MultiIterableClass.java

@@ -1,5 +1,5 @@
-// containers/MultiIterableClass.java
+// collections/MultiIterableClass.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Adding several Adapter Methods.
@@ -7,24 +7,27 @@ import java.util.*;
 
 public class MultiIterableClass extends IterableClass {
   public Iterable<String> reversed() {
-    return () -> new Iterator<String>() {
+    return new Iterable<String>() {
-      int current = words.length - 1;
+      public Iterator<String> iterator() {
-      @Override
+        return new Iterator<String>() {
-      public boolean hasNext() { return current > -1; }
+          int current = words.length - 1;
-      @Override
+          public boolean hasNext() { return current > -1; }
-      public String next() { return words[current--]; }
+          public String next() { return words[current--]; }
-      @Override
+          public void remove() { // Not implemented
-      public void remove() { // Not implemented
+            throw new UnsupportedOperationException();
-        throw new UnsupportedOperationException();
+          }
+        };
       }
     };
   }
   public Iterable<String> randomized() {
-    return () -> {
+    return new Iterable<String>() {
-      List<String> shuffled =
+      public Iterator<String> iterator() {
-              new ArrayList<>(Arrays.asList(words));
+        List<String> shuffled =
-      Collections.shuffle(shuffled, new Random(47));
+          new ArrayList<String>(Arrays.asList(words));
-      return shuffled.iterator();
+        Collections.shuffle(shuffled, new Random(47));
+        return shuffled.iterator();
+      }
     };
   }
   public static void main(String[] args) {

collections/NonCollectionSequence.java

@@ -1,12 +1,12 @@
-// containers/NonCollectionSequence.java
+// collections/NonCollectionSequence.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
 import java.util.*;
 
 class PetSequence {
-  protected Pet[] pets = Pets.createArray(8);
+  protected Pet[] pets = Pets.array(8);
 }
 
 public class NonCollectionSequence extends PetSequence {

collections/PetMap.java

@@ -1,5 +1,5 @@
-// containers/PetMap.java
+// collections/PetMap.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;

collections/PrintingCollections.java

@@ -1,11 +1,11 @@
-// containers/PrintingContainers.java
+// collections/PrintingCollections.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-// Containers print themselves automatically.
+// Collections print themselves automatically.
 import java.util.*;
 
-public class PrintingContainers {
+public class PrintingCollections {
   static Collection fill(Collection<String> collection) {
     collection.add("rat");
     collection.add("cat");

collections/PriorityQueueDemo.java

@@ -1,5 +1,5 @@
-// containers/PriorityQueueDemo.java
+// collections/PriorityQueueDemo.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/QueueDemo.java

@@ -1,5 +1,5 @@
-// containers/QueueDemo.java
+// collections/QueueDemo.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Upcasting to a Queue from a LinkedList.

collections/SetOfInteger.java

@@ -1,5 +1,5 @@
-// containers/SetOfInteger.java
+// collections/SetOfInteger.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/SetOperations.java

@@ -1,5 +1,5 @@
-// containers/SetOperations.java
+// collections/SetOperations.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/SimpleCollection.java

@@ -1,5 +1,5 @@
-// containers/SimpleCollection.java
+// collections/SimpleCollection.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/SimpleIteration.java

@@ -1,5 +1,5 @@
-// containers/SimpleIteration.java
+// collections/SimpleIteration.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import typeinfo.pets.*;
@@ -7,7 +7,7 @@ import java.util.*;
 
 public class SimpleIteration {
   public static void main(String[] args) {
-    List<Pet> pets = Pets.arrayList(12);
+    List<Pet> pets = Pets.list(12);
     Iterator<Pet> it = pets.iterator();
     while(it.hasNext()) {
       Pet p = it.next();

collections/SortedSetOfInteger.java

@@ -1,5 +1,5 @@
-// containers/SortedSetOfInteger.java
+// collections/SortedSetOfInteger.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;

collections/StackCollision.java

@@ -1,5 +1,5 @@
-// containers/StackCollision.java
+// collections/StackCollision.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 

collections/StackTest.java

@@ -1,5 +1,5 @@
-// containers/StackTest.java
+// collections/StackTest.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import onjava.*;

collections/Statistics.java

@@ -1,5 +1,5 @@
-// containers/Statistics.java
+// collections/Statistics.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Simple demonstration of HashMap.

collections/UniqueWords.java

@@ -1,5 +1,5 @@
-// containers/UniqueWords.java
+// collections/UniqueWords.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 import java.util.*;
@@ -20,7 +20,7 @@ public class UniqueWords {
 /* Output:
 [A, B, C, Collections, D, E, F, G, H, HashSet, I, J, K, L,
 M, N, Output, Set, SetOperations, String, System, X, Y, Z,
-add, addAll, added, args, class, containers, contains,
+add, addAll, added, args, class, collections, contains,
 containsAll, false, from, import, in, java, main, new, out,
 println, public, remove, removeAll, removed, set1, set2,
 split, static, to, true, util, void]

collections/UniqueWordsAlphabetic.java

@@ -1,5 +1,5 @@
-// containers/UniqueWordsAlphabetic.java
+// collections/UniqueWordsAlphabetic.java
-// ©2016 MindView LLC: see Copyright.txt
+// (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Producing an alphabetic listing.
@@ -20,10 +20,10 @@ public class UniqueWordsAlphabetic {
   }
 }
 /* Output:
-[A, add, addAll, added, args, B, C, class, Collections,
+[A, add, addAll, added, args, B, C, class, collections,
-containers, contains, containsAll, D, E, F, false, from, G,
+contains, containsAll, D, E, F, false, from, G, H, HashSet,
-H, HashSet, I, import, in, J, java, K, L, M, main, N, new,
+I, import, in, J, java, K, L, M, main, N, new, out, Output,
-out, Output, println, public, remove, removeAll, removed,
+println, public, remove, removeAll, removed, Set, set1,
-Set, set1, set2, SetOperations, split, static, String,
+set2, SetOperations, split, static, String, System, to,
-System, to, true, util, void, X, Y, Z]
+true, util, void, X, Y, Z]
 */

collections/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 
 <project default="run">
-  <property name="chapter" value="containers"/>
+  <property name="chapter" value="collections"/>
   <property name="excludedfiles" value=""/>
   <import file="../Ant-Common.xml"/>
   <import file="../Ant-Clean.xml"/>
@@ -13,9 +13,9 @@
     <jrun cls="ApplesAndOrangesWithoutGenerics" failOnError='false' msg='* Exception was Expected *' />
     <jrun cls="ArrayIsNotIterable" />
     <jrun cls="AsListInference" />
+    <jrun cls="CollectionMethods" />
     <jrun cls="CollectionSequence" />
-    <jrun cls="ContainerMethods" />
+    <jrun cls="CrossCollectionIteration" />
-    <jrun cls="CrossContainerIteration" />
     <jrun cls="EnvironmentVariables" />
     <jrun cls="ForInCollections" />
     <jrun cls="GenericsAndUpcasting" />
@@ -24,12 +24,12 @@
     <jrun cls="LinkedListFeatures" />
     <jrun cls="ListFeatures" />
     <jrun cls="ListIteration" />
-    <jrun cls="containers.MapOfList" dirpath="../containers" />
+    <jrun cls="collections.MapOfList" dirpath="../collections" />
     <jrun cls="ModifyingArraysAsList" />
     <jrun cls="MultiIterableClass" />
     <jrun cls="NonCollectionSequence" />
     <jrun cls="PetMap" />
-    <jrun cls="PrintingContainers" />
+    <jrun cls="PrintingCollections" />
     <jrun cls="PriorityQueueDemo" />
     <jrun cls="QueueDemo" />
     <jrun cls="SetOfInteger" />