Various output fixes

BruceEckel · BruceEckel · commit 98fafd47ff08 · 2016-07-20T06:32:39.000-06:00
diff --git a/collections/EnvironmentVariables.java b/collections/EnvironmentVariables.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.
+// {ValidateByHand}
 import java.util.*;
 
 public class EnvironmentVariables {
@@ -12,4 +13,3 @@ public static void main(String[] args) {
     }
   }
 }
-/* Output: (Execute to see) */
diff --git a/collectionsindepth/Lists.java b/collectionsindepth/Lists.java
@@ -125,7 +125,7 @@ public static void main(String[] args) {
     testLinkedList();
   }
 }
-/* Output: (First and last 2 Lines)
+/* Output: (First and Last 2 Lines)
 [ALGERIA, ANGOLA, BENIN, BOTSWANA, BURKINA FASO, BURUNDI,
 CAMEROON, CAPE VERDE, CENTRAL AFRICAN REPUBLIC, CHAD,
 COMOROS, CONGO, DJIBOUTI, EGYPT, EQUATORIAL GUINEA,
diff --git a/collectionsindepth/References.java b/collectionsindepth/References.java
@@ -63,7 +63,7 @@ public static void main(String[] args) {
     }
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Just created: java.lang.ref.SoftReference@19e0bfd
 Just created: java.lang.ref.SoftReference@139a55
 Just created: java.lang.ref.SoftReference@1db9742
diff --git a/compression/GZIPcompress.java b/compression/GZIPcompress.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.
 // {Args: GZIPcompress.java}
+// {ValidateByHand}
 import java.util.zip.*;
 import java.io.*;
 
@@ -37,4 +38,3 @@ public class GZIPcompress {
     }
   }
 }
-/* Output: (Execute to see) */
diff --git a/compression/ZipCompress.java b/compression/ZipCompress.java
@@ -5,6 +5,7 @@
 // Uses Zip compression to compress any
 // number of files given on the command line
 // {Args: ZipCompress.java}
+// {ValidateByHand}
 import java.util.zip.*;
 import java.io.*;
 import java.util.*;
@@ -67,4 +68,3 @@ public class ZipCompress {
     }
   }
 }
-/* Output: (Execute to see) */
diff --git a/control/WhileTest.java b/control/WhileTest.java
@@ -16,7 +16,7 @@ public static void main(String[] args) {
     System.out.println("Exited 'while'");
   }
 }
-/* Output: (First and last 5 Lines)
+/* Output: (First and Last 5 Lines)
 true, Inside 'while'
 true, Inside 'while'
 true, Inside 'while'
diff --git a/go.bat b/go.bat
@@ -0,0 +1,3 @@
+gradlew --parallel --daemon run > output.txt 2> errors.txt
+START /min "C:\Program Files\Windows Media Player\wmplayer.exe" %windir%\media\Alarm07.wav
+rem find . -size 0 -type f
diff --git a/iostreams/BasicFileOutput.java b/iostreams/BasicFileOutput.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.
+// {ValidateByHand}
 import java.io.*;
 
 public class BasicFileOutput {
@@ -23,4 +24,3 @@ public class BasicFileOutput {
     System.out.println(BufferedInputFile.read(file));
   }
 }
-/* Output: (Execute to see) */
diff --git a/iostreams/BufferedInputFile.java b/iostreams/BufferedInputFile.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.
+// {ValidateByHand}
 import java.io.*;
 
 public class BufferedInputFile {
@@ -21,4 +22,3 @@ public class BufferedInputFile {
     System.out.print(read("BufferedInputFile.java"));
   }
 }
-/* Output: (Execute to see) */
diff --git a/iostreams/FileOutputShortcut.java b/iostreams/FileOutputShortcut.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.
+// {ValidateByHand}
 import java.io.*;
 
 public class FileOutputShortcut {
@@ -22,4 +23,3 @@ public class FileOutputShortcut {
     System.out.println(BufferedInputFile.read(file));
   }
 }
-/* Output: (Execute to see) */
diff --git a/iostreams/FormattedMemoryInput.java b/iostreams/FormattedMemoryInput.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.
+// {ValidateByHand}
 import java.io.*;
 
 public class FormattedMemoryInput {
@@ -19,4 +20,3 @@ public class FormattedMemoryInput {
     }
   }
 }
-/* Output: (Execute to see) */
diff --git a/iostreams/MemoryInput.java b/iostreams/MemoryInput.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.
+// {ValidateByHand}
 import java.io.*;
 
 public class MemoryInput {
@@ -14,4 +15,3 @@ public class MemoryInput {
       System.out.print((char)c);
   }
 }
-/* Output: (Execute to see) */
diff --git a/iostreams/TestEOF.java b/iostreams/TestEOF.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.
 // Testing for end of file
+// {ValidateByHand}
 import java.io.*;
 
 public class TestEOF {
@@ -16,4 +17,3 @@ public class TestEOF {
     }
   }
 }
-/* Output: (Execute to see) */
diff --git a/onjava/ProcessFiles.java b/onjava/ProcessFiles.java
@@ -53,4 +53,3 @@ public static void main(String[] args) {
       "java").start(args);
   }
 }
-/* Output: (Execute to see) */
diff --git a/patterns/doubledispatch/DoubleDispatch.java b/patterns/doubledispatch/DoubleDispatch.java
@@ -70,7 +70,7 @@ public static void main(String[] args) {
     Trash.sumValue(bin);
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Loading patterns.doubledispatch.DDGlass
 Loading patterns.doubledispatch.DDPaper
 Loading patterns.doubledispatch.DDAluminum
diff --git a/patterns/dynatrash/DynaTrash.java b/patterns/dynatrash/DynaTrash.java
@@ -49,7 +49,7 @@ public static void main(String[] args) {
     bin.values().forEach(Trash::sumValue);
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Loading patterns.trash.Glass
 Loading patterns.trash.Paper
 Loading patterns.trash.Aluminum
diff --git a/patterns/recyclea/RecycleA.java b/patterns/recyclea/RecycleA.java
@@ -99,7 +99,7 @@ public static void main(String[] args) {
     Trash.sumValue(bin);
   }
 }
-/* Output: (First and last 11 Lines)
+/* Output: (First and Last 11 Lines)
 weight of patterns.recyclea.Aluminum = 0.11435456649761422
 weight of patterns.recyclea.Aluminum = 0.5295954256745989
 weight of patterns.recyclea.Aluminum = 0.44032876173820623
diff --git a/patterns/recycleb/RecycleB.java b/patterns/recycleb/RecycleB.java
@@ -31,7 +31,7 @@ public static void main(String[] args) {
     Trash.sumValue(bin);
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Loading patterns.trash.Glass
 Loading patterns.trash.Paper
 Loading patterns.trash.Aluminum
diff --git a/patterns/recyclec/RecycleC.java b/patterns/recyclec/RecycleC.java
@@ -59,7 +59,7 @@ public static void main(String[] args) {
     Trash.sumValue(bin);
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Loading patterns.trash.Glass
 Loading patterns.trash.Paper
 Loading patterns.trash.Aluminum
diff --git a/patterns/trashvisitor/TrashVisitor.java b/patterns/trashvisitor/TrashVisitor.java
@@ -102,7 +102,7 @@ public static void main(String[] args) {
     visitors.forEach(Visitor::total);
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Loading patterns.trashvisitor.Glass
 Loading patterns.trashvisitor.Paper
 Loading patterns.trashvisitor.Aluminum
diff --git a/threads/DeadlockingDiningPhilosophers.java b/threads/DeadlockingDiningPhilosophers.java
@@ -31,7 +31,7 @@ public class DeadlockingDiningPhilosophers {
     es.shutdownNow();
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Philosopher 1 thinking
 Philosopher 1 grabbing right
 Philosopher 1 grabbing left
diff --git a/threads/ExplicitCriticalSection.java b/threads/ExplicitCriticalSection.java
@@ -4,6 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // {ThrowsException} on a multiprocessor machine
 // Using explicit Lock objects to create critical sections
+// {main: threads.ExplicitCriticalSection}
 package threads;
 import java.util.concurrent.locks.*;
 
diff --git a/threads/FixedDiningPhilosophers.java b/threads/FixedDiningPhilosophers.java
@@ -35,7 +35,7 @@ public class FixedDiningPhilosophers {
     es.shutdownNow();
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Philosopher 4 thinking
 Philosopher 3 thinking
 Philosopher 0 thinking
diff --git a/threads/GreenhouseScheduler.java b/threads/GreenhouseScheduler.java
@@ -168,7 +168,7 @@ public static void main(String[] args) {
     gh.repeat(gh.new CollectData(), 500, 500);
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 Bing!
 Thermostat to night setting
 Turning on lights
diff --git a/threads/HorseRace.java b/threads/HorseRace.java
@@ -88,7 +88,7 @@ public static void main(String[] args) {
     new HorseRace(nHorses, pause);
   }
 }
-/* Output: (First and last 18 Lines)
+/* Output: (First and Last 18 Lines)
 ===========================================================
 ================
 *0
diff --git a/threads/PriorityBlockingQueueDemo.java b/threads/PriorityBlockingQueueDemo.java
@@ -127,7 +127,7 @@ public class PriorityBlockingQueueDemo {
     es.execute(new PrioritizedTaskConsumer(queue));
   }
 }
-/* Output: (First and last 12 Lines)
+/* Output: (First and Last 12 Lines)
 [8  ] Task 0
 [9  ] Task 5
 [9  ] Task 13
diff --git a/threads/restaurant2/RestaurantWithQueues.java b/threads/restaurant2/RestaurantWithQueues.java
@@ -206,7 +206,7 @@ public class RestaurantWithQueues {
     es.shutdownNow();
   }
 }
-/* Output: (First and last 10 Lines)
+/* Output: (First and Last 10 Lines)
 WaitPerson 0 received SPRING_ROLLS delivering to Customer 1
 Customer 1 eating SPRING_ROLLS
 WaitPerson 3 received SPRING_ROLLS delivering to Customer 0

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
	`5`	`+// {ValidateByHand}`
`5`	`6`	`import java.util.*;`
`6`	`7`
`7`	`8`	`public class EnvironmentVariables {`
`@@ -12,4 +13,3 @@ public static void main(String[] args) {`
`12`	`13`	`}`
`13`	`14`	`}`
`14`	`15`	`}`
`15`		`-/* Output: (Execute to see) */`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static void main(String[] args) {`
`125`	`125`	`testLinkedList();`
`126`	`126`	`}`
`127`	`127`	`}`
`128`		`-/* Output: (First and last 2 Lines)`
	`128`	`+/* Output: (First and Last 2 Lines)`
`129`	`129`	`[ALGERIA, ANGOLA, BENIN, BOTSWANA, BURKINA FASO, BURUNDI,`
`130`	`130`	`CAMEROON, CAPE VERDE, CENTRAL AFRICAN REPUBLIC, CHAD,`
`131`	`131`	`COMOROS, CONGO, DJIBOUTI, EGYPT, EQUATORIAL GUINEA,`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static void main(String[] args) {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`-/* Output: (First and last 10 Lines)`
	`66`	`+/* Output: (First and Last 10 Lines)`
`67`	`67`	`Just created: java.lang.ref.SoftReference@19e0bfd`
`68`	`68`	`Just created: java.lang.ref.SoftReference@139a55`
`69`	`69`	`Just created: java.lang.ref.SoftReference@1db9742`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
`5`	`5`	`// {Args: GZIPcompress.java}`
	`6`	`+// {ValidateByHand}`
`6`	`7`	`import java.util.zip.*;`
`7`	`8`	`import java.io.*;`
`8`	`9`
`@@ -37,4 +38,3 @@ public class GZIPcompress {`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`	`}`
`40`		`-/* Output: (Execute to see) */`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`// Uses Zip compression to compress any`
`6`	`6`	`// number of files given on the command line`
`7`	`7`	`// {Args: ZipCompress.java}`
	`8`	`+// {ValidateByHand}`
`8`	`9`	`import java.util.zip.*;`
`9`	`10`	`import java.io.*;`
`10`	`11`	`import java.util.*;`
`@@ -67,4 +68,3 @@ public class ZipCompress {`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`	`}`
`70`		`-/* Output: (Execute to see) */`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static void main(String[] args) {`
`16`	`16`	`System.out.println("Exited 'while'");`
`17`	`17`	`}`
`18`	`18`	`}`
`19`		`-/* Output: (First and last 5 Lines)`
	`19`	`+/* Output: (First and Last 5 Lines)`
`20`	`20`	`true, Inside 'while'`
`21`	`21`	`true, Inside 'while'`
`22`	`22`	`true, Inside 'while'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+gradlew --parallel --daemon run > output.txt 2> errors.txt`
	`2`	`+START /min "C:\Program Files\Windows Media Player\wmplayer.exe" %windir%\media\Alarm07.wav`
	`3`	`+rem find . -size 0 -type f`