More switching to {java command line}

BruceEckel · BruceEckel · commit dc3172ce9024 · 2016-07-28T13:42:03.000-06:00
diff --git a/assertions/Assert1.java b/assertions/Assert1.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Non-informative style of assert
 // Must run with -ea:
-// {JVMArgs: -ea}
+// {java -ea Assert1}
 // {ThrowsException}
 
 public class Assert1 {
diff --git a/assertions/Assert2.java b/assertions/Assert2.java
@@ -3,7 +3,7 @@
 // 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 information-expression
-// {JVMArgs: -ea}
+// {java Assert2 -ea}
 // {ThrowsException}
 
 public class Assert2 {
diff --git a/build.gradle b/build.gradle
@@ -41,12 +41,6 @@ class Tags {
         errorOutputExpected = hasTag('ErrorOutputExpected')
         validateByHand = hasTag('ValidateByHand')
         ignoreOutput = hasTag('IgnoreOutput')
-        def argString = extract('Args:')
-        if(argString)
-            args = argString.split(' ')
-        def jvmArgString = extract('JVMArgs:')
-        if(jvmArgString)
-            jVMArgs = jvmArgString.split(' ')
         exec = extract('Exec:')
         runFirst = extract('RunFirst:')
         lines.each {
diff --git a/collectionsindepth/ListPerformance.java b/collectionsindepth/ListPerformance.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates performance differences in Lists
 // Small to keep build testing short:
-// {Args: 100 500}
+// {java ListPerformance 100 500}
 import java.util.*;
 import onjava.*;
 
diff --git a/collectionsindepth/MapPerformance.java b/collectionsindepth/MapPerformance.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates performance differences in Maps
 // Small to keep build testing short:
-// {Args: 100 5000}
+// {java MapPerformance 100 5000}
 import java.util.*;
 
 public class MapPerformance {
diff --git a/collectionsindepth/RandomBounds.java b/collectionsindepth/RandomBounds.java
@@ -3,7 +3,7 @@
 // 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?
-// {Args: lower}
+// {java RandomBounds lower}
 import onjava.*;
 
 public class RandomBounds {
diff --git a/collectionsindepth/SetPerformance.java b/collectionsindepth/SetPerformance.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates performance differences in Sets
 // Small to keep build testing short:
-// {Args: 100 5000}
+// {java SetPerformance 100 5000}
 import java.util.*;
 
 public class SetPerformance {
diff --git a/compression/GZIPcompress.java b/compression/GZIPcompress.java
@@ -2,7 +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.
-// {Args: GZIPcompress.java}
+// {java GZIPcompress GZIPcompress.java}
 // {ValidateByHand}
 import java.util.zip.*;
 import java.io.*;
diff --git a/compression/ZipCompress.java b/compression/ZipCompress.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Uses Zip compression to compress any
 // number of files given on the command line
-// {Args: ZipCompress.java}
+// {java ZipCompress ZipCompress.java}
 // {ValidateByHand}
 import java.util.zip.*;
 import java.io.*;
diff --git a/enums/VendingMachine.java b/enums/VendingMachine.java
@@ -2,7 +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.
-// {Args: VendingMachineInput.txt}
+// {java VendingMachine VendingMachineInput.txt}
 import java.util.*;
 import java.io.IOException;
 import java.util.function.*;
diff --git a/innerclasses/GreenhouseController.java b/innerclasses/GreenhouseController.java
@@ -3,7 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Configure and execute the greenhouse system
-// {Args: 5000}
+// {java GreenhouseController 5000}
 import innerclasses.controller.*;
 
 public class GreenhouseController {
diff --git a/logging/ConfigureLogging.java b/logging/ConfigureLogging.java
@@ -2,7 +2,8 @@
 // (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.
-// {JVMArgs: -Djava.util.logging.config.file=log.prop}
+// {java ConfigureLogging
+// -Djava.util.logging.config.file=log.prop}
 // {ErrorOutputExpected}
 import java.util.logging.*;
 
diff --git a/newio/ChannelCopy.java b/newio/ChannelCopy.java
@@ -3,7 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Copying a file using channels and buffers
-// {Args: ChannelCopy.java test.txt}
+// {java ChannelCopy ChannelCopy.java test.txt}
 import java.nio.*;
 import java.nio.channels.*;
 import java.io.*;
diff --git a/newio/TransferTo.java b/newio/TransferTo.java
@@ -3,7 +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 transferTo() between channels
-// {Args: TransferTo.java TransferTo.txt}
+// {java TransferTo TransferTo.java TransferTo.txt}
 import java.nio.channels.*;
 import java.io.*;
 
diff --git a/strings/JGrep.java b/strings/JGrep.java
@@ -3,7 +3,8 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // A very simple version of the "grep" program
-// {Args: WhitherStringBuilder.java 'return|for|String'}
+// {java JGrep
+// WhitherStringBuilder.java 'return|for|String'}
 import java.util.regex.*;
 import java.nio.file.*;
 import java.util.stream.*;
diff --git a/strings/TestRegularExpression.java b/strings/TestRegularExpression.java
@@ -3,7 +3,8 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Simple regular expression demonstration
-// {Args: abcabcabcdefabc "abc+" "(abc)+" }
+// {java TestRegularExpression
+// abcabcabcdefabc "abc+" "(abc)+" }
 import java.util.regex.*;
 
 public class TestRegularExpression {
diff --git a/threads/BankTellerSimulation.java b/threads/BankTellerSimulation.java
@@ -3,7 +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 queues and multithreading
-// {Args: 5}
+// {java BankTellerSimulation 5}
 import java.util.concurrent.*;
 import java.util.*;
 
diff --git a/threads/DeadlockingDiningPhilosophers.java b/threads/DeadlockingDiningPhilosophers.java
@@ -3,7 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstrates how deadlock can be hidden in a program
-// {Args: 0 5 timeout}
+// {java DeadlockingDiningPhilosophers 0 5 timeout}
 import java.util.concurrent.*;
 
 public class DeadlockingDiningPhilosophers {
diff --git a/threads/FixedDiningPhilosophers.java b/threads/FixedDiningPhilosophers.java
@@ -3,7 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Dining philosophers without deadlock
-// {Args: 5 5 timeout}
+// {java FixedDiningPhilosophers 5 5 timeout}
 import java.util.concurrent.*;
 
 public class FixedDiningPhilosophers {
diff --git a/threads/GreenhouseScheduler.java b/threads/GreenhouseScheduler.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Rewriting innerclasses/GreenhouseController.java
 // to use a ScheduledThreadPoolExecutor
-// {Args: 5000}
+// {java GreenhouseScheduler 5000}
 import java.util.concurrent.*;
 import java.util.*;
 
diff --git a/threads/SerialNumberChecker.java b/threads/SerialNumberChecker.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Operations that might seem safe are not,
 // when threads are present
-// {Args: 4}
+// {java SerialNumberChecker 4}
 import java.util.concurrent.*;
 
 // Reuses storage so we don't run out of memory:
diff --git a/typeinfo/ShowMethods.java b/typeinfo/ShowMethods.java
@@ -4,7 +4,7 @@
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Using reflection to show all the methods of a class,
 // even if the methods are defined in the base class
-// {Args: ShowMethods}
+// {java ShowMethods ShowMethods}
 import java.lang.reflect.*;
 import java.util.regex.*;
 
