Adding {main: when necessary

Bruce Eckel · Bruce Eckel · commit 2478dc168bb2 · 2016-07-07T14:58:56.000-06:00
diff --git a/collectionsindepth/RandomBounds.java b/collectionsindepth/RandomBounds.java
@@ -3,8 +3,8 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Does Math.random() produce 0.0 and 1.0?
-// {TimeOutDuringTesting}
 // {Args: lower}
+import onjava.*;
 
 public class RandomBounds {
   static void usage() {
@@ -15,6 +15,7 @@ static void usage() {
   }
   public static void main(String[] args) {
     if(args.length != 1) usage();
+    new TimedAbort(3);
     switch(args[0]) {
       case "lower":
         while(Math.random() != 0.0)
diff --git a/enums/Burrito.java b/enums/Burrito.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: enums.Burrito}
 package enums;
 import static enums.Spiciness.*;
 
diff --git a/enums/EnumMaps.java b/enums/EnumMaps.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Basics of EnumMaps
+// {main: enums.EnumMaps}
 package enums;
 import java.util.*;
 import static enums.AlarmPoints.*;
diff --git a/enums/EnumSets.java b/enums/EnumSets.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Operations on EnumSets
+// {main: enums.EnumSets}
 package enums;
 import java.util.*;
 import static enums.AlarmPoints.*;
diff --git a/enums/Reflection.java b/enums/Reflection.java
@@ -34,7 +34,7 @@ public static void main(String[] args) {
     exploreMethods.removeAll(enumMethods);
     System.out.println(exploreMethods);
     // Decompile the code for the enum:
-    OSExecute.command("javap Explore");
+    OSExecute.command("javap -cp build/classes/main Explore");
   }
 }
 /* Output:
diff --git a/enums/RoShamBo1.java b/enums/RoShamBo1.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstration of multiple dispatching
+// {main: enums.RoShamBo1}
 package enums;
 import java.util.*;
 import static enums.Outcome.*;
diff --git a/enums/RoShamBo2.java b/enums/RoShamBo2.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Switching one enum on another
+// {main: enums.RoShamBo2}
 package enums;
 import static enums.Outcome.*;
 
diff --git a/enums/RoShamBo3.java b/enums/RoShamBo3.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using constant-specific methods
+// {main: enums.RoShamBo3}
 package enums;
 import static enums.Outcome.*;
 
diff --git a/enums/RoShamBo4.java b/enums/RoShamBo4.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: enums.RoShamBo4}
 package enums;
 
 public enum RoShamBo4 implements Competitor<RoShamBo4> {
diff --git a/enums/RoShamBo5.java b/enums/RoShamBo5.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Multiple dispatching using an EnumMap of EnumMaps
+// {main: enums.RoShamBo5}
 package enums;
 import java.util.*;
 import static enums.Outcome.*;
diff --git a/enums/RoShamBo6.java b/enums/RoShamBo6.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Enums using "tables" instead of multiple dispatch
+// {main: enums.RoShamBo6}
 package enums;
 import static enums.Outcome.*;
 
diff --git a/enums/cartoons/EnumImplementation.java b/enums/cartoons/EnumImplementation.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // An enum can implement an interface
+// {main: enums.cartoons.EnumImplementation}
 package enums.cartoons;
 import java.util.*;
 import java.util.function.*;
diff --git a/enums/menu/Meal.java b/enums/menu/Meal.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: enums.menu.Meal}
 package enums.menu;
 
 public class Meal {
diff --git a/enums/menu/Meal2.java b/enums/menu/Meal2.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: enums.menu.Meal2}
 package enums.menu;
 import onjava.*;
 
diff --git a/enums/menu/TypeOfFood.java b/enums/menu/TypeOfFood.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: enums.menu.TypeOfFood}
 package enums.menu;
 import static enums.menu.Food.*;
 
diff --git a/generics/coffee/CoffeeSupplier.java b/generics/coffee/CoffeeSupplier.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: generics.coffee.CoffeeSupplier}
 package generics.coffee;
 import java.util.*;
 import java.util.function.*;
diff --git a/generics/decorator/Decoration.java b/generics/decorator/Decoration.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: generics.decorator.Decoration}
 package generics.decorator;
 import java.util.*;
 
diff --git a/innerclasses/Callbacks.java b/innerclasses/Callbacks.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using inner classes for callbacks
+// {main: innerclasses.Callbacks}
 package innerclasses;
 
 interface Incrementable {
diff --git a/innerclasses/MultiImplementation.java b/innerclasses/MultiImplementation.java
@@ -4,6 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // For concrete or abstract classes, inner classes
 // produce "multiple implementation inheritance"
+// {main: innerclasses.MultiImplementation}
 package innerclasses;
 
 class D {}
diff --git a/innerclasses/mui/MultiInterfaces.java b/innerclasses/mui/MultiInterfaces.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Two ways that a class can implement multiple interfaces
+// {main: innerclasses.mui.MultiInterfaces}
 package innerclasses.mui;
 
 interface A {}
diff --git a/interfaces/interfaceprocessor/FilterProcessor.java b/interfaces/interfaceprocessor/FilterProcessor.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: interfaces.interfaceprocessor.FilterProcessor}
 package interfaces.interfaceprocessor;
 import interfaces.filters.*;
 
diff --git a/interfaces/interfaceprocessor/StringProcessor.java b/interfaces/interfaceprocessor/StringProcessor.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: interfaces.interfaceprocessor.StringProcessor}
 package interfaces.interfaceprocessor;
 import java.util.*;
 
diff --git a/interfaces/music4/Music4.java b/interfaces/music4/Music4.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Abstract classes and methods
+// {main: interfaces.music4.Music4}
 package interfaces.music4;
 import polymorphism.music.Note;
 
diff --git a/interfaces/music5/Music5.java b/interfaces/music5/Music5.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: interfaces.music5.Music5}
 package interfaces.music5;
 import polymorphism.music.Note;
 
diff --git a/interfaces/nesting/NestingInterfaces.java b/interfaces/nesting/NestingInterfaces.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: interfaces.nesting.NestingInterfaces}
 package interfaces.nesting;
 
 class A {
diff --git a/onjava/CollectionMethodDifferences.java b/onjava/CollectionMethodDifferences.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: onjava.CollectionMethodDifferences}
 package onjava;
 import java.lang.reflect.*;
 import java.util.*;
diff --git a/onjava/CountMap.java b/onjava/CountMap.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Unlimited-length Map containing sample data
+// {main: onjava.CountMap}
 package onjava;
 import java.util.*;
 
diff --git a/onjava/CountingIntegerList.java b/onjava/CountingIntegerList.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // List of any length, containing sample data
+// {main: onjava.CountingIntegerList}
 package onjava;
 import java.util.*;
 
diff --git a/onjava/Countries.java b/onjava/Countries.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // "Flyweight" Maps and Lists of sample data
+// {main: onjava.Countries}
 package onjava;
 import java.util.*;
 
diff --git a/onjava/Hex.java b/onjava/Hex.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: onjava.Hex}
 package onjava;
 import java.io.*;
 import java.nio.file.*;
@@ -25,7 +26,8 @@ public static String format(byte[] data) {
     if(args.length == 0)
       // Test by displaying this class file:
       System.out.println(format(
-        Files.readAllBytes(Paths.get("Hex.class"))));
+        Files.readAllBytes(Paths.get(
+          "build/classes/main/onjava/Hex.class"))));
     else
       System.out.println(format(
         Files.readAllBytes(Paths.get(args[0]))));
diff --git a/onjava/ProcessFiles.java b/onjava/ProcessFiles.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // {ValidateByHand}
+// {main: onjava.ProcessFiles}
 package onjava;
 import java.io.*;
 import java.nio.file.*;
diff --git a/onjava/atunit/AtUnit.java b/onjava/atunit/AtUnit.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // An annotation-based unit-test framework
+// {main: onjava.atunit.AtUnit}
 package onjava.atunit;
 import java.lang.reflect.*;
 import java.io.*;
diff --git a/onjava/atunit/ClassNameFinder.java b/onjava/atunit/ClassNameFinder.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: onjava.atunit.ClassNameFinder}
 package onjava.atunit;
 import java.io.*;
 import java.nio.file.*;
diff --git a/patterns/absfactory/GameEnvironment.java b/patterns/absfactory/GameEnvironment.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // An example of the Abstract Factory pattern
+// {main: patterns.absfactory.GameEnvironment}
 package patterns.absfactory;
 import java.util.function.*;
 
diff --git a/patterns/adapt/Adapter.java b/patterns/adapt/Adapter.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Variations on the Adapter pattern
+// {main: patterns.adapt.Adapter}
 package patterns.adapt;
 
 class WhatIHave {
diff --git a/patterns/chain/ChainOfResponsibility.java b/patterns/chain/ChainOfResponsibility.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using the Functional interface
+// {main: patterns.chain.ChainOfResponsibility}
 package patterns.chain;
 import java.util.*;
 import java.util.function.*;
diff --git a/patterns/doubledispatch/DoubleDispatch.java b/patterns/doubledispatch/DoubleDispatch.java
@@ -4,6 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using multiple dispatching to handle more
 // than one unknown type during a method call
+// {main: patterns.doubledispatch.DoubleDispatch}
 package patterns.doubledispatch;
 import patterns.trash.*;
 import java.util.*;
diff --git a/patterns/dynatrash/DynaTrash.java b/patterns/dynatrash/DynaTrash.java
@@ -5,6 +5,7 @@
 // Using a Map of Lists and RTTI to automatically
 // sort trash into Lists. This solution, despite
 // the use of RTTI, is extensible.
+// {main: patterns.dynatrash.DynaTrash}
 package patterns.dynatrash;
 import patterns.trash.*;
 import java.util.*;
diff --git a/patterns/factory/ShapeFactory1.java b/patterns/factory/ShapeFactory1.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // A simple static factory method
+// {main: patterns.factory.ShapeFactory1}
 package patterns.factory;
 import java.util.*;
 import java.util.stream.*;
diff --git a/patterns/observer/ObservedFlower.java b/patterns/observer/ObservedFlower.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstration of "Observer" pattern
+// {main: patterns.observer.ObservedFlower}
 package patterns.observer;
 import java.util.*;
 
diff --git a/patterns/recyclea/RecycleA.java b/patterns/recyclea/RecycleA.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Recycling with RTTI
+// {main: patterns.recyclea.RecycleA}
 package patterns.recyclea;
 import java.util.*;
 import java.util.function.*;
diff --git a/patterns/recycleb/RecycleB.java b/patterns/recycleb/RecycleB.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: patterns.recycleb.RecycleB}
 package patterns.recycleb;
 import patterns.trash.*;
 import java.util.*;
diff --git a/patterns/recyclec/RecycleC.java b/patterns/recyclec/RecycleC.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Adding more objects to the recycling problem
+// {main: patterns.recyclec.RecycleC}
 package patterns.recyclec;
 import patterns.trash.*;
 import java.util.*;
diff --git a/patterns/state/StateMachineDemo.java b/patterns/state/StateMachineDemo.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // The StateMachine pattern and Template method
+// {main: patterns.state.StateMachineDemo}
 package patterns.state;
 
 interface State {
diff --git a/patterns/strategy/StrategyPattern.java b/patterns/strategy/StrategyPattern.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: patterns.strategy.StrategyPattern}
 package patterns.strategy;
 import java.util.function.*;
 import java.util.*;
diff --git a/patterns/strategy/StrategyPattern2.java b/patterns/strategy/StrategyPattern2.java
@@ -2,6 +2,7 @@
 // (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.
+// {main: patterns.strategy.StrategyPattern2}
 package patterns.strategy;
 import java.util.function.*;
 import java.util.*;
diff --git a/patterns/trash/ParseTrash.java b/patterns/trash/ParseTrash.java
@@ -4,6 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Open a file and parse its contents into
 // Trash objects, placing each into a List
+// {main: patterns.trash.ParseTrash}
 package patterns.trash;
 import java.util.*;
 import java.util.stream.*;
diff --git a/patterns/trashvisitor/TrashVisitor.java b/patterns/trashvisitor/TrashVisitor.java
diff --git a/patterns/visitor/BeeAndFlowers.java b/patterns/visitor/BeeAndFlowers.java
diff --git a/patterns/visualobserver/BoxObserver.java b/patterns/visualobserver/BoxObserver.java
diff --git a/standardio/OSExecuteDemo.java b/standardio/OSExecuteDemo.java
diff --git a/threads/AtomicityTest.java b/threads/AtomicityTest.java
diff --git a/threads/EvenSupplier.java b/threads/EvenSupplier.java

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static void main(String[] args) {`
`34`	`34`	`exploreMethods.removeAll(enumMethods);`
`35`	`35`	`System.out.println(exploreMethods);`
`36`	`36`	`// Decompile the code for the enum:`
`37`		`- OSExecute.command("javap Explore");`
	`37`	`+ OSExecute.command("javap -cp build/classes/main Explore");`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`/* Output:`