From 50228968dbb499681828f557f7c18f810e264e49 Mon Sep 17 00:00:00 2001 From: Bruce Eckel Date: Sun, 4 Dec 2016 09:30:08 -0800 Subject: [PATCH] Changed as many duplicate file names as possible --- concurrent/{Prime.java => ParallelPrime.java} | 6 +++--- concurrent/Summing.java | 3 +-- enums/{Burrito.java => Burrito2.java} | 18 +++++++++--------- enums/{Spiciness.java => SpicinessEnum.java} | 4 ++-- interfaces/Machine.java | 16 ++++++++-------- .../{RandomWords.java => RandomStrings.java} | 8 ++++---- onjava/{Operation.java => Operations.java} | 8 ++++---- .../{SpaceShip.java => DerivedSpaceShip.java} | 8 ++++---- streams/Machine2.java | 14 +++++++------- typeinfo/Operation.java | 2 +- 10 files changed, 43 insertions(+), 44 deletions(-) rename concurrent/{Prime.java => ParallelPrime.java} (90%) rename enums/{Burrito.java => Burrito2.java} (56%) rename enums/{Spiciness.java => SpicinessEnum.java} (79%) rename interfaces/{RandomWords.java => RandomStrings.java} (85%) rename onjava/{Operation.java => Operations.java} (70%) rename reuse/{SpaceShip.java => DerivedSpaceShip.java} (58%) diff --git a/concurrent/Prime.java b/concurrent/ParallelPrime.java similarity index 90% rename from concurrent/Prime.java rename to concurrent/ParallelPrime.java index 906fbeb2..14c6a184 100644 --- a/concurrent/Prime.java +++ b/concurrent/ParallelPrime.java @@ -1,4 +1,4 @@ -// concurrent/Prime.java +// concurrent/ParallelPrime.java // (c)2016 MindView LLC: see Copyright.txt // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. @@ -9,7 +9,7 @@ import java.io.*; import java.nio.file.*; import java.nio.charset.*; -public class Prime { +public class ParallelPrime { static final int COUNT = 100_000; public static boolean isPrime(long n) { return rangeClosed(2, (long)Math.sqrt(n)) @@ -21,7 +21,7 @@ public class Prime { List primes = iterate(2, i -> i + 1) .parallel() // [1] - .filter(Prime::isPrime) + .filter(ParallelPrime::isPrime) .limit(COUNT) .mapToObj(Long::toString) .collect(Collectors.toList()); diff --git a/concurrent/Summing.java b/concurrent/Summing.java index a1be4bbf..99fc4eb3 100644 --- a/concurrent/Summing.java +++ b/concurrent/Summing.java @@ -23,9 +23,8 @@ public class Summing { public static final int SZ = 100_000_000; // This even works: // public static final int SZ = 1_000_000_000; - // Gauss's formula: public static final long CHECK = - (long)SZ * ((long)SZ + 1)/2; + (long)SZ * ((long)SZ + 1)/2; // Gauss's formula public static void main(String[] args) { System.out.println(CHECK); timeTest("Sum Stream", CHECK, () -> diff --git a/enums/Burrito.java b/enums/Burrito2.java similarity index 56% rename from enums/Burrito.java rename to enums/Burrito2.java index 25e1ac64..da01b95a 100644 --- a/enums/Burrito.java +++ b/enums/Burrito2.java @@ -1,14 +1,14 @@ -// enums/Burrito.java +// enums/Burrito2.java // (c)2016 MindView LLC: see Copyright.txt // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. -// {java enums.Burrito} +// {java enums.Burrito2} package enums; -import static enums.Spiciness.*; +import static enums.SpicinessEnum.*; -public class Burrito { - Spiciness degree; - public Burrito(Spiciness degree) { +public class Burrito2 { + SpicinessEnum degree; + public Burrito2(SpicinessEnum degree) { this.degree = degree; } @Override @@ -16,9 +16,9 @@ public class Burrito { return "Burrito is "+ degree; } public static void main(String[] args) { - System.out.println(new Burrito(NOT)); - System.out.println(new Burrito(MEDIUM)); - System.out.println(new Burrito(HOT)); + System.out.println(new Burrito2(NOT)); + System.out.println(new Burrito2(MEDIUM)); + System.out.println(new Burrito2(HOT)); } } /* Output: diff --git a/enums/Spiciness.java b/enums/SpicinessEnum.java similarity index 79% rename from enums/Spiciness.java rename to enums/SpicinessEnum.java index 43aefdf2..0260cbce 100644 --- a/enums/Spiciness.java +++ b/enums/SpicinessEnum.java @@ -1,9 +1,9 @@ -// enums/Spiciness.java +// enums/SpicinessEnum.java // (c)2016 MindView LLC: see Copyright.txt // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. package enums; -public enum Spiciness { +public enum SpicinessEnum { NOT, MILD, MEDIUM, HOT, FLAMING } diff --git a/interfaces/Machine.java b/interfaces/Machine.java index ea0ac9af..ae550745 100644 --- a/interfaces/Machine.java +++ b/interfaces/Machine.java @@ -3,29 +3,29 @@ // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. import java.util.*; -import onjava.Operation; +import onjava.Operations; -class Bing implements Operation { +class Bing implements Operations { public void execute() { - Operation.show("Bing"); + Operations.show("Bing"); } } -class Crack implements Operation { +class Crack implements Operations { public void execute() { - Operation.show("Crack"); + Operations.show("Crack"); } } -class Twist implements Operation { +class Twist implements Operations { public void execute() { - Operation.show("Twist"); + Operations.show("Twist"); } } public class Machine { public static void main(String[] args) { - Operation.runOps( + Operations.runOps( new Bing(), new Crack(), new Twist()); } } diff --git a/interfaces/RandomWords.java b/interfaces/RandomStrings.java similarity index 85% rename from interfaces/RandomWords.java rename to interfaces/RandomStrings.java index 95eefcd4..ac9add02 100644 --- a/interfaces/RandomWords.java +++ b/interfaces/RandomStrings.java @@ -1,4 +1,4 @@ -// interfaces/RandomWords.java +// interfaces/RandomStrings.java // (c)2016 MindView LLC: see Copyright.txt // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. @@ -6,7 +6,7 @@ import java.nio.*; import java.util.*; -public class RandomWords implements Readable { +public class RandomStrings implements Readable { private static Random rand = new Random(47); private static final char[] CAPITALS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray(); @@ -15,7 +15,7 @@ public class RandomWords implements Readable { private static final char[] VOWELS = "aeiou".toCharArray(); private int count; - public RandomWords(int count) { this.count = count; } + public RandomStrings(int count) { this.count = count; } @Override public int read(CharBuffer cb) { if(count-- == 0) @@ -29,7 +29,7 @@ public class RandomWords implements Readable { return 10; // Number of characters appended } public static void main(String[] args) { - Scanner s = new Scanner(new RandomWords(10)); + Scanner s = new Scanner(new RandomStrings(10)); while(s.hasNext()) System.out.println(s.next()); } diff --git a/onjava/Operation.java b/onjava/Operations.java similarity index 70% rename from onjava/Operation.java rename to onjava/Operations.java index 804500e6..e936ec51 100644 --- a/onjava/Operation.java +++ b/onjava/Operations.java @@ -1,14 +1,14 @@ -// onjava/Operation.java +// onjava/Operations.java // (c)2016 MindView LLC: see Copyright.txt // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. package onjava; import java.util.*; -public interface Operation { +public interface Operations { void execute(); - static void runOps(Operation... ops) { - for(Operation op : ops) + static void runOps(Operations... ops) { + for(Operations op : ops) op.execute(); } static void show(String msg) { diff --git a/reuse/SpaceShip.java b/reuse/DerivedSpaceShip.java similarity index 58% rename from reuse/SpaceShip.java rename to reuse/DerivedSpaceShip.java index bcf0aefd..54f17172 100644 --- a/reuse/SpaceShip.java +++ b/reuse/DerivedSpaceShip.java @@ -1,15 +1,15 @@ -// reuse/SpaceShip.java +// reuse/DerivedSpaceShip.java // (c)2016 MindView LLC: see Copyright.txt // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. -public class SpaceShip extends SpaceShipControls { +public class DerivedSpaceShip extends SpaceShipControls { private String name; - public SpaceShip(String name) { this.name = name; } + public DerivedSpaceShip(String name) { this.name = name; } @Override public String toString() { return name; } public static void main(String[] args) { - SpaceShip protector = new SpaceShip("NSEA Protector"); + DerivedSpaceShip protector = new DerivedSpaceShip("NSEA Protector"); protector.forward(100); } } diff --git a/streams/Machine2.java b/streams/Machine2.java index 356426c3..f7856bd7 100644 --- a/streams/Machine2.java +++ b/streams/Machine2.java @@ -3,16 +3,16 @@ // We make no guarantees that this code is fit for any purpose. // Visit http://OnJava8.com for more book information. import java.util.*; -import onjava.Operation; +import onjava.Operations; public class Machine2 { public static void main(String[] args) { - Arrays.stream(new Operation[] { - () -> Operation.show("Bing"), - () -> Operation.show("Crack"), - () -> Operation.show("Twist"), - () -> Operation.show("Pop") - }).forEach(Operation::execute); + Arrays.stream(new Operations[] { + () -> Operations.show("Bing"), + () -> Operations.show("Crack"), + () -> Operations.show("Twist"), + () -> Operations.show("Pop") + }).forEach(Operations::execute); } } /* Output: diff --git a/typeinfo/Operation.java b/typeinfo/Operation.java index a3889cd1..011f2b86 100644 --- a/typeinfo/Operation.java +++ b/typeinfo/Operation.java @@ -8,7 +8,7 @@ public class Operation { public final Supplier description; public final Runnable command; public - Operation (Supplier descr, Runnable cmd) { + Operation(Supplier descr, Runnable cmd) { description = descr; command = cmd; }