More Netbeans mods

SvaloR · May 5, 2015 · f5a2dd0 · f5a2dd0
1 parent 7175059
commit f5a2dd0
Show file tree

Hide file tree

Showing 108 changed files with 474 additions and 685 deletions.
diff --git a/access/build.xml b/access/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="Cake" />
     <jrun cls="ChocolateChip" />
     <jrun cls="ChocolateChip2" />
@@ -18,7 +17,6 @@
     <jrun cls="PrintTest" />
     <jrun cls="QualifiedMyClass" />
     <jrun cls="SingleImport" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/annotations/InterfaceExtractorProcessor.java b/annotations/InterfaceExtractorProcessor.java
@@ -30,28 +30,27 @@ public void process() {
           interfaceMethods.add(m);
       if(interfaceMethods.size() > 0) {
         try {
-          PrintWriter writer =
-            env.getFiler().createSourceFile(annot.value());
-          writer.println("package " +
-            typeDecl.getPackage().getQualifiedName() +";");
-          writer.println("public interface " +
-            annot.value() + " {");
-          for(MethodDeclaration m : interfaceMethods) {
-            writer.print("  public ");
-            writer.print(m.getReturnType() + " ");
-            writer.print(m.getSimpleName() + " (");
-            int i = 0;
-            for(ParameterDeclaration parm :
-              m.getParameters()) {
-              writer.print(parm.getType() + " " +
-                parm.getSimpleName());
-              if(++i < m.getParameters().size())
-                writer.print(", ");
+          try (PrintWriter writer = env.getFiler().createSourceFile(annot.value())) {
+            writer.println("package " +
+                    typeDecl.getPackage().getQualifiedName() +";");
+            writer.println("public interface " +
+                    annot.value() + " {");
+            for(MethodDeclaration m : interfaceMethods) {
+              writer.print("  public ");
+              writer.print(m.getReturnType() + " ");
+              writer.print(m.getSimpleName() + " (");
+              int i = 0;
+              for(ParameterDeclaration parm :
+                      m.getParameters()) {
+                writer.print(parm.getType() + " " +
+                        parm.getSimpleName());
+                if(++i < m.getParameters().size())
+                  writer.print(", ");
+              }
+              writer.println(");");
             }
-            writer.println(");");
+            writer.println("}");
           }
-          writer.println("}");
-          writer.close();
         } catch(IOException ioe) {
           throw new RuntimeException(ioe);
         }

diff --git a/annotations/build.xml b/annotations/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="annotations.AtUnitComposition" dirpath="../annotations" />
     <jrun cls="annotations.AtUnitExample1" dirpath="../annotations" />
     <jrun cls="annotations.AtUnitExample2" dirpath="../annotations" />
@@ -19,7 +18,6 @@
     <jrun cls="annotations.StackLStringTest" dirpath="../annotations" />
     <jrun cls="UseCaseTracker" />
     <jrun cls="annotations.database.TableCreator" dirpath="../annotations/database" arguments='annotations.database.Member' />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/arrays/CompType.java b/arrays/CompType.java
@@ -25,12 +25,7 @@ public int compareTo(CompType rv) {
   }
   private static Random r = new Random(47);
   public static Generator<CompType> generator() {
-    return new Generator<CompType>() {
-      @Override
-      public CompType next() {
-        return new CompType(r.nextInt(100),r.nextInt(100));
-      }
-    };
+    return () -> new CompType(r.nextInt(100),r.nextInt(100));
   }
   public static void main(String[] args) {
     CompType[] a =

diff --git a/arrays/CopyingArrays.java b/arrays/CopyingArrays.java
@@ -23,8 +23,8 @@ public static void main(String[] args) {
     // Objects:
     Integer[] u = new Integer[10];
     Integer[] v = new Integer[5];
-    Arrays.fill(u, new Integer(47));
-    Arrays.fill(v, new Integer(99));
+    Arrays.fill(u, 47);
+    Arrays.fill(v, 99);
     print("u = " + Arrays.toString(u));
     print("v = " + Arrays.toString(v));
     System.arraycopy(v, 0, u, u.length/2, v.length);

diff --git a/arrays/build.xml b/arrays/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="AlphabeticSearch" />
     <jrun cls="ArrayOfGenerics" />
     <jrun cls="ArrayOptions" />
@@ -33,7 +32,6 @@
     <jrun cls="TestArrayGeneration" />
     <jrun cls="TestGenerated" />
     <jrun cls="ThreeDWithNew" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/assertions/build.xml b/assertions/build.xml
@@ -6,12 +6,10 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="Assert1" failOnError='false' msg='* Exception was Expected *' />
     <jrun cls="Assert2" failOnError='false' msg='* Exception was Expected *' />
     <jrun cls="LoaderAssertions" failOnError='false' msg='* Exception was Expected *' />
     <jrun cls="Queue" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/concurrency/ActiveObjectDemo.java b/concurrency/ActiveObjectDemo.java
@@ -22,24 +22,18 @@ private void pause(int factor) {
   }
   public Future<Integer>
   calculateInt(final int x, final int y) {
-    return ex.submit(new Callable<Integer>() {
-      @Override
-      public Integer call() {
-        print("starting " + x + " + " + y);
-        pause(500);
-        return x + y;
-      }
+    return ex.submit(() -> {
+      print("starting " + x + " + " + y);
+      pause(500);
+      return x + y;
     });
   }
   public Future<Float>
   calculateFloat(final float x, final float y) {
-    return ex.submit(new Callable<Float>() {
-      @Override
-      public Float call() {
-        print("starting " + x + " + " + y);
-        pause(2000);
-        return x + y;
-      }
+    return ex.submit(() -> {
+      print("starting " + x + " + " + y);
+      pause(2000);
+      return x + y;
     });
   }
   public void shutdown() { ex.shutdown(); }

diff --git a/concurrency/CloseResource.java b/concurrency/CloseResource.java
@@ -11,16 +11,16 @@ public class CloseResource {
   public static void main(String[] args) throws Exception {
     ExecutorService exec = Executors.newCachedThreadPool();
     ServerSocket server = new ServerSocket(8080);
-    InputStream socketInput =
-      new Socket("localhost", 8080).getInputStream();
-    exec.execute(new IOBlocked(socketInput));
-    exec.execute(new IOBlocked(System.in));
-    TimeUnit.MILLISECONDS.sleep(100);
-    print("Shutting down all threads");
-    exec.shutdownNow();
-    TimeUnit.SECONDS.sleep(1);
-    print("Closing " + socketInput.getClass().getName());
-    socketInput.close(); // Releases blocked thread
+    try (InputStream socketInput = new Socket("localhost", 8080).getInputStream()) {
+      exec.execute(new IOBlocked(socketInput));
+      exec.execute(new IOBlocked(System.in));
+      TimeUnit.MILLISECONDS.sleep(100);
+      print("Shutting down all threads");
+      exec.shutdownNow();
+      TimeUnit.SECONDS.sleep(1);
+      print("Closing " + socketInput.getClass().getName());
+      socketInput.close(); // Releases blocked thread
+    }
     TimeUnit.SECONDS.sleep(1);
     print("Closing " + System.in.getClass().getName());
     System.in.close(); // Releases blocked thread

diff --git a/concurrency/HorseRace.java b/concurrency/HorseRace.java
@@ -46,26 +46,23 @@ public class HorseRace {
     Executors.newCachedThreadPool();
   private CyclicBarrier barrier;
   public HorseRace(int nHorses, final int pause) {
-    barrier = new CyclicBarrier(nHorses, new Runnable() {
-      @Override
-      public void run() {
-        StringBuilder s = new StringBuilder();
-        for(int i = 0; i < FINISH_LINE; i++)
-          s.append("="); // The fence on the racetrack
-        print(s);
-        for(Horse horse : horses)
-          print(horse.tracks());
-        for(Horse horse : horses)
-          if(horse.getStrides() >= FINISH_LINE) {
-            print(horse + "won!");
-            exec.shutdownNow();
-            return;
-          }
-        try {
-          TimeUnit.MILLISECONDS.sleep(pause);
-        } catch(InterruptedException e) {
-          print("barrier-action sleep interrupted");
+    barrier = new CyclicBarrier(nHorses, () -> {
+      StringBuilder s = new StringBuilder();
+      for(int i = 0; i < FINISH_LINE; i++)
+        s.append("="); // The fence on the racetrack
+      print(s);
+      for(Horse horse : horses)
+        print(horse.tracks());
+      for(Horse horse : horses)
+        if(horse.getStrides() >= FINISH_LINE) {
+          print(horse + "won!");
+          exec.shutdownNow();
+          return;
         }
+      try {
+        TimeUnit.MILLISECONDS.sleep(pause);
+      } catch(InterruptedException e) {
+        print("barrier-action sleep interrupted");
       }
     });
     for(int i = 0; i < nHorses; i++) {

diff --git a/concurrency/NIOInterruption.java b/concurrency/NIOInterruption.java
@@ -33,16 +33,16 @@ public static void main(String[] args) throws Exception {
     InetSocketAddress isa =
       new InetSocketAddress("localhost", 8080);
     SocketChannel sc1 = SocketChannel.open(isa);
-    SocketChannel sc2 = SocketChannel.open(isa);
-    Future<?> f = exec.submit(new NIOBlocked(sc1));
-    exec.execute(new NIOBlocked(sc2));
-    exec.shutdown();
-    TimeUnit.SECONDS.sleep(1);
-    // Produce an interrupt via cancel:
-    f.cancel(true);
-    TimeUnit.SECONDS.sleep(1);
-    // Release the block by closing the channel:
-    sc2.close();
+    try (SocketChannel sc2 = SocketChannel.open(isa)) {
+      Future<?> f = exec.submit(new NIOBlocked(sc1));
+      exec.execute(new NIOBlocked(sc2));
+      exec.shutdown();
+      TimeUnit.SECONDS.sleep(1);
+      // Produce an interrupt via cancel:
+      f.cancel(true);
+      TimeUnit.SECONDS.sleep(1);
+      // Release the block by closing the channel:
+    }
   }
 } /* Output: (Sample)
 Waiting for read() in NIOBlocked@7a84e4

diff --git a/concurrency/SemaphoreDemo.java b/concurrency/SemaphoreDemo.java
@@ -45,16 +45,13 @@ public static void main(String[] args) throws Exception {
       f.operation();
       list.add(f);
     }
-    Future<?> blocked = exec.submit(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          // Semaphore prevents additional checkout,
-          // so call is blocked:
-          pool.checkOut();
-        } catch(InterruptedException e) {
-          print("checkOut() Interrupted");
-        }
+    Future<?> blocked = exec.submit(() -> {
+      try {
+        // Semaphore prevents additional checkout,
+        // so call is blocked:
+        pool.checkOut();
+      } catch(InterruptedException e) {
+        print("checkOut() Interrupted");
       }
     });
     TimeUnit.SECONDS.sleep(2);

diff --git a/concurrency/build.xml b/concurrency/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="ActiveObjectDemo" />
     <jrun cls="AtomicEvenGenerator" failOnError='false' timeOut='4000' msg='* Timeout for Testing *' />
     <jrun cls="AtomicIntegerTest" />
@@ -74,7 +73,6 @@
     <jrun cls="concurrency.restaurant2.RestaurantWithQueues" dirpath="../concurrency/restaurant2" arguments='5' />
     <jrun cls="concurrency.waxomatic.WaxOMatic" dirpath="../concurrency/waxomatic" />
     <jrun cls="concurrency.waxomatic2.WaxOMatic2" dirpath="../concurrency/waxomatic2" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/containers/build.xml b/containers/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="AssociativeArray" />
     <jrun cls="Bits" />
     <jrun cls="CanonicalMapping" />
@@ -44,7 +43,6 @@
     <jrun cls="TypesForSets" />
     <jrun cls="Unsupported" />
     <jrun cls="Utilities" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/control/build.xml b/control/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="BreakAndContinue" />
     <jrun cls="CommaOperator" />
     <jrun cls="ForEachFloat" />
@@ -20,7 +19,6 @@
     <jrun cls="StringSwitch" />
     <jrun cls="VowelsAndConsonants" />
     <jrun cls="WhileTest" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/debugging/build.xml b/debugging/build.xml
@@ -6,9 +6,7 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="SimpleDebugging" failOnError='false' msg='* Exception was Expected *' />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/enumerated/EnumMaps.java b/enumerated/EnumMaps.java
@@ -11,13 +11,11 @@ public class EnumMaps {
   public static void main(String[] args) {
     EnumMap<AlarmPoints,Command> em =
       new EnumMap<>(AlarmPoints.class);
-    em.put(KITCHEN, new Command() {
-      @Override
-      public void action() { print("Kitchen fire!"); }
+    em.put(KITCHEN, (Command) () -> {
+      print("Kitchen fire!");
     });
-    em.put(BATHROOM, new Command() {
-      @Override
-      public void action() { print("Bathroom alert!"); }
+    em.put(BATHROOM, (Command) () -> {
+      print("Bathroom alert!");
     });
     for(Map.Entry<AlarmPoints,Command> e : em.entrySet()) {
       printnb(e.getKey() + ": ");

diff --git a/enumerated/build.xml b/enumerated/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="BigEnumSet" />
     <jrun cls="enumerated.Burrito" dirpath="../enumerated" />
     <jrun cls="CarWash" />
@@ -34,7 +33,6 @@
     <jrun cls="enumerated.menu.Meal" dirpath="../enumerated/menu" />
     <jrun cls="enumerated.menu.Meal2" dirpath="../enumerated/menu" />
     <jrun cls="enumerated.menu.TypeOfFood" dirpath="../enumerated/menu" />
-    <delete file="failures"/>
   </target>
 
 </project>
diff --git a/exceptions/build.xml b/exceptions/build.xml
@@ -6,7 +6,6 @@
   <import file="../Ant-Common.xml"/>
 
   <target name="run" description="Compile and run" depends="build">
-    <touch file="failures"/>
     <jrun cls="AlwaysFinally" />
     <jrun cls="Cleanup" />
     <jrun cls="CleanupIdiom" />
@@ -31,7 +30,6 @@
     <jrun cls="TurnOffChecking" />
     <jrun cls="WhoCalled" />
     <jrun cls="WithFinally" />
-    <delete file="failures"/>
   </target>
 
 </project>