edits

BruceEckel · BruceEckel · commit ded2d52c6660 · 2015-06-03T11:41:10.000-07:00
diff --git a/Checklist.txt b/Checklist.txt
@@ -32,7 +32,7 @@
 [ ]  Appendix: Passing & Returning Objects
 [X]  Appendix: Network Programming
 [X]  Appendix: Remote Methods
-[ ]  Appendix: Logging
+[X]  Appendix: Logging
 [X]  Appendix: Debugging
 [X]  Appendix: Profiling and Optimizing
 [ ]  Appendix: The Benefits and Costs of Static Type Checking
diff --git a/Copyright.txt b/Copyright.txt
@@ -64,11 +64,10 @@ ENHANCEMENTS, OR MODIFICATIONS.
 
 Please note that MindView LLC maintains a Web site which
 is the sole distribution point for electronic copies of the 
-Source Code, http://www.MindView.net (and official mirror
-sites), where it is freely available under the terms stated 
-above.
+Source Code, https://github.com/BruceEckel/TIJ-Directors-Cut/,
+where it is freely available under the terms stated above.
 
 If you think you've found an error in the Source Code,
-please submit a correction using the feedback system that 
-you will find at http://www.MindView.net.
+please submit a correction at:
+https://github.com/BruceEckel/TIJ-Directors-Cut/issues
 ///:~
diff --git a/concurrency/CarBuilder.java b/concurrency/CarBuilder.java
@@ -1,6 +1,7 @@
 //: concurrency/CarBuilder.java
 // �2015 MindView LLC: see Copyright.txt
 // A complex example of tasks working together.
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.*;
 import static net.mindview.util.Print.*;
@@ -209,4 +210,4 @@ public static void main(String[] args) throws Exception {
     TimeUnit.SECONDS.sleep(7);
     exec.shutdownNow();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/CountDownLatchDemo.java b/concurrency/CountDownLatchDemo.java
@@ -1,5 +1,6 @@
 //: concurrency/CountDownLatchDemo.java
 // �2015 MindView LLC: see Copyright.txt
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.*;
 import static net.mindview.util.Print.*;
@@ -68,4 +69,4 @@ public static void main(String[] args) throws Exception {
     print("Launched all tasks");
     exec.shutdown(); // Quit when all tasks complete
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/DaemonFromFactory.java b/concurrency/DaemonFromFactory.java
@@ -25,4 +25,4 @@ public static void main(String[] args) throws Exception {
     print("All daemons started");
     TimeUnit.MILLISECONDS.sleep(500); // Run for a while
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/DeadlockingDiningPhilosophers.java b/concurrency/DeadlockingDiningPhilosophers.java
@@ -2,6 +2,7 @@
 // �2015 MindView LLC: see Copyright.txt
 // Demonstrates how deadlock can be hidden in a program.
 // {Args: 0 5 timeout}
+// {FirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 
 public class DeadlockingDiningPhilosophers {
@@ -27,4 +28,4 @@ public static void main(String[] args) throws Exception {
     }
     exec.shutdownNow();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/FastSimulation.java b/concurrency/FastSimulation.java
@@ -1,5 +1,6 @@
 //: concurrency/FastSimulation.java
 // �2015 MindView LLC: see Copyright.txt
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.*;
@@ -49,4 +50,4 @@ public static void main(String[] args) throws Exception {
     TimeUnit.SECONDS.sleep(5);
     exec.shutdownNow();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/FixedDiningPhilosophers.java b/concurrency/FixedDiningPhilosophers.java
@@ -2,6 +2,7 @@
 // �2015 MindView LLC: see Copyright.txt
 // Dining philosophers without deadlock.
 // {Args: 5 5 timeout}
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 
 public class FixedDiningPhilosophers {
@@ -31,4 +32,4 @@ public static void main(String[] args) throws Exception {
     }
     exec.shutdownNow();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/GreenhouseScheduler.java b/concurrency/GreenhouseScheduler.java
@@ -3,6 +3,7 @@
 // Rewriting innerclasses/GreenhouseController.java
 // to use a ScheduledThreadPoolExecutor.
 // {Args: 5000}
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.*;
 
@@ -163,4 +164,4 @@ public static void main(String[] args) {
     gh.repeat(gh.new ThermostatDay(), 0, 1400);
     gh.repeat(gh.new CollectData(), 500, 500);
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/HorseRace.java b/concurrency/HorseRace.java
@@ -1,7 +1,7 @@
 //: concurrency/HorseRace.java
 // �2015 MindView LLC: see Copyright.txt
 // Using CyclicBarriers.
-// {ValidateByHand}
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.*;
 import static net.mindview.util.Print.*;
@@ -86,4 +86,4 @@ public static void main(String[] args) {
     }
     new HorseRace(nHorses, pause);
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/PriorityBlockingQueueDemo.java b/concurrency/PriorityBlockingQueueDemo.java
@@ -1,5 +1,6 @@
 //: concurrency/PriorityBlockingQueueDemo.java
 // �2015 MindView LLC: see Copyright.txt
+// {OutputFirstAndLast: 12 Lines}
 import java.util.concurrent.*;
 import java.util.*;
 import static net.mindview.util.Print.*;
@@ -121,4 +122,4 @@ public static void main(String[] args) throws Exception {
     exec.execute(new PrioritizedTaskProducer(queue, exec));
     exec.execute(new PrioritizedTaskConsumer(queue));
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/ReaderWriterList.java b/concurrency/ReaderWriterList.java
@@ -1,5 +1,6 @@
 //: concurrency/ReaderWriterList.java
 // �2015 MindView LLC: see Copyright.txt
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 import java.util.*;
@@ -83,4 +84,4 @@ public ReaderWriterListTest(int readers, int writers) {
     for(int i = 0; i < writers; i++)
       exec.execute(new Writer());
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/SemaphoreDemo.java b/concurrency/SemaphoreDemo.java
@@ -1,6 +1,7 @@
 //: concurrency/SemaphoreDemo.java
 // �2015 MindView LLC: see Copyright.txt
 // Testing the Pool class
+// {OutputFirstAndLast: 10 Lines}
 import java.util.concurrent.*;
 import java.util.*;
 import static net.mindview.util.Print.*;
@@ -65,4 +66,4 @@ public class SemaphoreDemo {
       pool.checkIn(f); // Second checkIn ignored
     exec.shutdown();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/ThreadVariations.java b/concurrency/ThreadVariations.java
@@ -161,4 +161,4 @@ public static void main(String[] args) {
     new InnerRunnable2("InnerRunnable2");
     new ThreadMethod("ThreadMethod").runTask();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/ToastOMatic.java b/concurrency/ToastOMatic.java
@@ -136,4 +136,4 @@ public static void main(String[] args) throws Exception {
     TimeUnit.SECONDS.sleep(5);
     exec.shutdownNow();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/concurrency/build.xml b/concurrency/build.xml
@@ -33,6 +33,7 @@
     <jrun cls="FixedDiningPhilosophers" arguments="5 5 timeout" />
     <jrun cls="FixedThreadPool" />
     <jrun cls="GreenhouseScheduler" arguments="5000" />
+    <jrun cls="HorseRace" />
     <jrun cls="Interrupting" />
     <jrun cls="Interrupting2" />
     <jrun cls="InterruptingIdiom" arguments="1100" />
diff --git a/containers/CanonicalMapping.java b/containers/CanonicalMapping.java
@@ -1,6 +1,7 @@
 //: containers/CanonicalMapping.java
 // �2015 MindView LLC: see Copyright.txt
 // Demonstrates WeakHashMap.
+// {NoOutput}
 import java.util.*;
 
 class Element {
@@ -47,4 +48,4 @@ public static void main(String[] args) {
     }
     System.gc();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/containers/Lists.java b/containers/Lists.java
@@ -1,6 +1,7 @@
 //: containers/Lists.java
 // �2015 MindView LLC: see Copyright.txt
 // Things you can do with Lists.
+// {OutputFirstAndLast: 10 Lines}
 import java.util.*;
 import net.mindview.util.*;
 import static net.mindview.util.Print.*;
@@ -123,4 +124,4 @@ public static void main(String[] args) {
       new LinkedList<>(Countries.names(25)));
     testLinkedList();
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/containers/References.java b/containers/References.java
@@ -1,6 +1,7 @@
 //: containers/References.java
 // �2015 MindView LLC: see Copyright.txt
 // Demonstrates Reference objects
+// {OutputFirstAndLast: 10 Lines}
 import java.lang.ref.*;
 import java.util.*;
 
@@ -60,4 +61,4 @@ public static void main(String[] args) {
       checkQueue();
     }
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/control/WhileTest.java b/control/WhileTest.java
@@ -1,6 +1,7 @@
 //: control/WhileTest.java
 // �2015 MindView LLC: see Copyright.txt
 // Demonstrates the while loop.
+// {OutputFirstAndLast: 5 Lines}
 
 public class WhileTest {
   static boolean condition() {
@@ -13,4 +14,4 @@ public static void main(String[] args) {
       System.out.println("Inside 'while'");
     System.out.println("Exited 'while'");
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/enums/ConstantSpecificMethod.java b/enums/ConstantSpecificMethod.java
@@ -28,4 +28,4 @@ public static void main(String[] args) {
     for(ConstantSpecificMethod csm : values())
       System.out.println(csm.getInfo());
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/generics/Apply.java b/generics/Apply.java
@@ -1,6 +1,7 @@
 //: generics/Apply.java
 // �2015 MindView LLC: see Copyright.txt
 // {main: ApplyTest}
+// {OutputFirstAndLast: 10 Lines}
 import java.lang.reflect.*;
 import java.util.*;
 import static net.mindview.util.Print.*;
@@ -69,4 +70,4 @@ public static void main(String[] args) throws Exception {
     }
     Apply.apply(shapeQ, Shape.class.getMethod("rotate"));
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/gui/LookAndFeel.java b/gui/LookAndFeel.java
@@ -4,11 +4,13 @@
 // {Args: motif}
 import javax.swing.*;
 import java.awt.*;
+import java.util.*;
 import static net.mindview.util.SwingConsole.*;
 
 public class LookAndFeel extends JFrame {
   private String[] choices =
-    "Eeny Meeny Minnie Mickey Moe Larry Curly".split(" ");
+    "Eeny Meeny Minnie Mickey Moe Larry Curly"
+    .split(" ");
   private Component[] samples = {
     new JButton("JButton"),
     new JTextField("JTextField"),
@@ -18,55 +20,66 @@ public class LookAndFeel extends JFrame {
     new JComboBox<>(choices),
     new JList<>(choices),
   };
+  private static
+  Map<String,String> optionMap = new HashMap<>();
+  private static String options = "";
   public LookAndFeel() {
     super("Look And Feel");
     setLayout(new FlowLayout());
     for(Component component : samples)
       add(component);
   }
+  public static void initOptions() {
+    if(optionMap.isEmpty()) {
+      UIManager.LookAndFeelInfo[] lafi =
+        UIManager.getInstalledLookAndFeels();
+      for(UIManager.LookAndFeelInfo lf : lafi) {
+        String classname = lf.getClassName();
+        String[] parts = classname.split("\\.");
+        String option = parts[parts.length - 2];
+        optionMap.put(option, classname);
+      }
+      for(String option : optionMap.keySet())
+        options += option + " | ";
+      options =
+        options.substring(0, options.length() - 3);
+      options = "cross | system | " + options;
+    }
+  }
   private static void usageError() {
     System.out.println(
-      "Usage:LookAndFeel [cross|system|motif]");
+      "Usage:LookAndFeel [ " + options + " ]");
     System.exit(1);
   }
   public static void main(String[] args) {
+    initOptions();
     if(args.length == 0) usageError();
-    switch(args[0]) {
-      case "cross":
-        try {
+    try {
+      switch(args[0]) {
+        case "cross":
           UIManager.setLookAndFeel(UIManager.
             getCrossPlatformLookAndFeelClassName());
-        } catch(ClassNotFoundException |
-                InstantiationException |
-                IllegalAccessException |
-                UnsupportedLookAndFeelException e) {
-          e.printStackTrace();
-        }
-        break;
+          break;
       case "system":
-        try {
           UIManager.setLookAndFeel(UIManager.
             getSystemLookAndFeelClassName());
-        } catch(ClassNotFoundException |
-                InstantiationException |
-                IllegalAccessException |
-                UnsupportedLookAndFeelException e) {
-          e.printStackTrace();
-        }
-        break;
+          break;
       case "motif":
-        try {
-          UIManager.setLookAndFeel("com.sun.java."+
-            "swing.plaf.motif.MotifLookAndFeel");
-        } catch(ClassNotFoundException |
-                InstantiationException |
-                IllegalAccessException |
-                UnsupportedLookAndFeelException e) {
-          e.printStackTrace();
-        }
+        UIManager.setLookAndFeel("com.sun.java."+
+          "swing.plaf.motif.MotifLookAndFeel");
         break;
       default:
-        usageError();
+        if(optionMap.containsKey(args[0]))
+          UIManager.setLookAndFeel(
+            optionMap.get(args[0]));
+        else
+          usageError();
+      }
+    } catch(ClassNotFoundException |
+            InstantiationException |
+            IllegalAccessException |
+            UnsupportedLookAndFeelException e) {
+      usageError();
     }
     // Note the look & feel must be set before
     // any components are created.
diff --git a/holding/ApplesAndOrangesWithoutGenerics.java b/holding/ApplesAndOrangesWithoutGenerics.java
@@ -1,6 +1,6 @@
 //: holding/ApplesAndOrangesWithoutGenerics.java
 // �2015 MindView LLC: see Copyright.txt
-// Simple container example (produces compiler warnings).
+// Simple container use (suppressing compiler warnings)
 // {ThrowsException}
 import java.util.*;
 
@@ -25,4 +25,4 @@ public static void main(String[] args) {
       // Orange is detected only at run time
     }
   }
-} /* (Execute to see output) *///:~
+} ///:~
diff --git a/io/BufferedInputFile.java b/io/BufferedInputFile.java
diff --git a/io/FileOutputShortcut.java b/io/FileOutputShortcut.java
diff --git a/network/ChatterClient.java b/network/ChatterClient.java
diff --git a/network/ChatterServer.java b/network/ChatterServer.java
diff --git a/patterns/ShapeFactory2.java b/patterns/ShapeFactory2.java
diff --git a/patterns/factory/ShapeFactory1.java b/patterns/factory/ShapeFactory1.java
diff --git a/patterns/trash/ParseTrash.java b/patterns/trash/ParseTrash.java
diff --git a/references/DeepCopy.java b/references/DeepCopy.java
diff --git a/typeinfo/PetCount2.java b/typeinfo/PetCount2.java

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ public static void main(String[] args) throws Exception {`
`25`	`25`	`print("All daemons started");`
`26`	`26`	`TimeUnit.MILLISECONDS.sleep(500); // Run for a while`
`27`	`27`	`}`
`28`		`-} /* (Execute to see output) *///:~`
	`28`	`+} ///:~`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// ©2015 MindView LLC: see Copyright.txt`
`3`	`3`	`// Demonstrates how deadlock can be hidden in a program.`
`4`	`4`	`// {Args: 0 5 timeout}`
	`5`	`+// {FirstAndLast: 10 Lines}`
`5`	`6`	`import java.util.concurrent.*;`
`6`	`7`
`7`	`8`	`public class DeadlockingDiningPhilosophers {`
`@@ -27,4 +28,4 @@ public static void main(String[] args) throws Exception {`
`27`	`28`	`}`
`28`	`29`	`exec.shutdownNow();`
`29`	`30`	`}`
`30`		`-} /* (Execute to see output) *///:~`
	`31`	`+} ///:~`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// ©2015 MindView LLC: see Copyright.txt`
`3`	`3`	`// Dining philosophers without deadlock.`
`4`	`4`	`// {Args: 5 5 timeout}`
	`5`	`+// {OutputFirstAndLast: 10 Lines}`
`5`	`6`	`import java.util.concurrent.*;`
`6`	`7`
`7`	`8`	`public class FixedDiningPhilosophers {`
`@@ -31,4 +32,4 @@ public static void main(String[] args) throws Exception {`
`31`	`32`	`}`
`32`	`33`	`exec.shutdownNow();`
`33`	`34`	`}`
`34`		`-} /* (Execute to see output) *///:~`
	`35`	`+} ///:~`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//: concurrency/HorseRace.java`
`2`	`2`	`// ©2015 MindView LLC: see Copyright.txt`
`3`	`3`	`// Using CyclicBarriers.`
`4`		`-// {ValidateByHand}`
	`4`	`+// {OutputFirstAndLast: 10 Lines}`
`5`	`5`	`import java.util.concurrent.*;`
`6`	`6`	`import java.util.*;`
`7`	`7`	`import static net.mindview.util.Print.*;`
`@@ -86,4 +86,4 @@ public static void main(String[] args) {`
`86`	`86`	`}`
`87`	`87`	`new HorseRace(nHorses, pause);`
`88`	`88`	`}`
`89`		`-} /* (Execute to see output) *///:~`
	`89`	`+} ///:~`