[update] 更改onjava包路径

Author: zhouj

onjava/ArrayShow.java renamed to onjava/onjava/ArrayShow.java

@@ -4,8 +4,9 @@
 // Visit http://OnJava8.com for more book information.
 // Supplier from a class with a zero-argument constructor
 package onjava;
-import java.util.function.*;
+
 import java.lang.reflect.InvocationTargetException;
+import java.util.function.Supplier;
 
 public class BasicSupplier<T> implements Supplier<T> {
   private Class<T> type;

onjava/BasicSupplier.java renamed to onjava/onjava/BasicSupplier.java

@@ -4,16 +4,18 @@
 // Visit http://OnJava8.com for more book information.
 // {java onjava.CollectionMethodDifferences}
 package onjava;
-import java.lang.reflect.*;
+
+import java.lang.reflect.Method;
 import java.util.*;
-import java.util.stream.*;
+import java.util.stream.Collectors;
 
 public class CollectionMethodDifferences {
   static Set<String> methodSet(Class<?> type) {
     return Arrays.stream(type.getMethods())
-      .map(Method::getName)
-      .collect(Collectors.toCollection(TreeSet::new));
+            .map(Method::getName)
+            .collect(Collectors.toCollection(TreeSet::new));
   }
+
   static void interfaces(Class<?> type) {
     System.out.print("Interfaces in " +
       type.getSimpleName() + ": ");

onjava/CollectionMethodDifferences.java renamed to onjava/onjava/CollectionMethodDifferences.java

@@ -4,18 +4,26 @@
 // Visit http://OnJava8.com for more book information.
 // Generate incremental values of different types
 package onjava;
-import java.util.*;
-import java.util.function.*;
-import static onjava.ConvertTo.*;
+
+import java.util.Arrays;
+import java.util.function.DoubleSupplier;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+
+import static onjava.ConvertTo.primitive;
 
 public interface Count {
   class Boolean
-  implements Supplier<java.lang.Boolean> {
+          implements Supplier<java.lang.Boolean> {
     private boolean b = true;
-    @Override public java.lang.Boolean get() {
+
+    @Override
+    public java.lang.Boolean get() {
       b = !b;
       return java.lang.Boolean.valueOf(b);
     }
+
     public java.lang.Boolean get(int n) {
       return get();
     }

onjava/ConvertTo.java renamed to onjava/onjava/ConvertTo.java

@@ -5,8 +5,10 @@
 // Unlimited-length Map containing sample data
 // {java onjava.CountMap}
 package onjava;
+
 import java.util.*;
-import java.util.stream.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class CountMap
 extends AbstractMap<Integer,String> {

onjava/Count.java renamed to onjava/onjava/Count.java

@@ -5,16 +5,24 @@
 // List of any length, containing sample data
 // {java onjava.CountingIntegerList}
 package onjava;
-import java.util.*;
+
+import java.util.AbstractList;
+import java.util.List;
 
 public class CountingIntegerList
-extends AbstractList<Integer> {
+        extends AbstractList<Integer> {
   private int size;
-  public CountingIntegerList() { size = 0; }
+
+  public CountingIntegerList() {
+    size = 0;
+  }
+
   public CountingIntegerList(int size) {
     this.size = size < 0 ? 0 : size;
   }
-  @Override public Integer get(int index) {
+
+  @Override
+  public Integer get(int index) {
     return index;
   }
   @Override public int size() { return size; }

onjava/CountMap.java renamed to onjava/onjava/CountMap.java

@@ -3,19 +3,22 @@
 // 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.*;
-import java.util.function.*;
-import java.util.stream.*;
+
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class FillMap {
-  public static <K, V> Map<K,V>
-  basic(Supplier<Pair<K,V>> pairGen, int size) {
+  public static <K, V> Map<K, V>
+  basic(Supplier<Pair<K, V>> pairGen, int size) {
     return Stream.generate(pairGen)
-      .limit(size)
-      .collect(Collectors
-        .toMap(Pair::key, Pair::value));
+            .limit(size)
+            .collect(Collectors
+                    .toMap(Pair::key, Pair::value));
   }
-  public static <K, V> Map<K,V>
+
+  public static <K, V> Map<K, V>
   basic(Supplier<K> keyGen,
         Supplier<V> valueGen, int size) {
     return Stream.generate(