1.1 --- a/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java	Mon Nov 15 19:05:15 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java	Mon Nov 29 13:38:12 2010 -0800
     1.3 @@ -25,8 +25,10 @@
     1.4  
     1.5  package com.sun.java.util.jar.pack;
     1.6  
     1.7 -import java.util.*;
     1.8 -import java.io.*;
     1.9 +import java.io.ByteArrayOutputStream;
    1.10 +import java.io.IOException;
    1.11 +import java.io.InputStream;
    1.12 +import java.io.OutputStream;
    1.13  
    1.14  /**
    1.15   * Adaptive coding.

     2.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	Mon Nov 15 19:05:15 2010 -0800
     2.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	Mon Nov 29 13:38:12 2010 -0800
     2.3 @@ -25,9 +25,17 @@
     2.4  
     2.5  package com.sun.java.util.jar.pack;
     2.6  
     2.7 -import java.io.*;
     2.8 -import java.util.*;
     2.9 -import com.sun.java.util.jar.pack.ConstantPool.*;
    2.10 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
    2.11 +import com.sun.java.util.jar.pack.ConstantPool.Index;
    2.12 +import java.io.ByteArrayOutputStream;
    2.13 +import java.io.IOException;
    2.14 +import java.util.ArrayList;
    2.15 +import java.util.Arrays;
    2.16 +import java.util.Collection;
    2.17 +import java.util.Collections;
    2.18 +import java.util.HashMap;
    2.19 +import java.util.List;
    2.20 +import java.util.Map;
    2.21  
    2.22  /**
    2.23   * Represents an attribute in a class-file.

     3.1 --- a/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Mon Nov 15 19:05:15 2010 -0800
     3.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Mon Nov 29 13:38:12 2010 -0800
     3.3 @@ -25,12 +25,28 @@
     3.4  
     3.5  package com.sun.java.util.jar.pack;
     3.6  
     3.7 -import java.io.*;
     3.8 -import java.util.*;
     3.9 -import java.util.jar.*;
    3.10 -import com.sun.java.util.jar.pack.Package.Class;
    3.11 -import com.sun.java.util.jar.pack.Package.InnerClass;
    3.12 -import com.sun.java.util.jar.pack.ConstantPool.*;
    3.13 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
    3.14 +import com.sun.java.util.jar.pack.ConstantPool.Index;
    3.15 +import com.sun.java.util.jar.pack.Package.Class.Field;
    3.16 +import java.io.BufferedOutputStream;
    3.17 +import java.io.ByteArrayInputStream;
    3.18 +import java.io.ByteArrayOutputStream;
    3.19 +import java.io.EOFException;
    3.20 +import java.io.File;
    3.21 +import java.io.FileOutputStream;
    3.22 +import java.io.FilterInputStream;
    3.23 +import java.io.FilterOutputStream;
    3.24 +import java.io.IOException;
    3.25 +import java.io.InputStream;
    3.26 +import java.io.OutputStream;
    3.27 +import java.io.PrintStream;
    3.28 +import java.util.ArrayList;
    3.29 +import java.util.Arrays;
    3.30 +import java.util.Collections;
    3.31 +import java.util.HashMap;
    3.32 +import java.util.Iterator;
    3.33 +import java.util.List;
    3.34 +import java.util.jar.Pack200;
    3.35  
    3.36  /**
    3.37   * Define the structure and ordering of "bands" in a packed file.
    3.38 @@ -1629,7 +1645,7 @@
    3.39          }
    3.40      }
    3.41  
    3.42 -    protected void setConstantValueIndex(Class.Field f) {
    3.43 +    protected void setConstantValueIndex(com.sun.java.util.jar.pack.Package.Class.Field f) {
    3.44          Index ix = null;
    3.45          if (f != null) {
    3.46              byte tag = f.getLiteralTag();

     4.1 --- a/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	Mon Nov 15 19:05:15 2010 -0800
     4.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	Mon Nov 29 13:38:12 2010 -0800
     4.3 @@ -25,11 +25,19 @@
     4.4  
     4.5  package com.sun.java.util.jar.pack;
     4.6  
     4.7 -import java.io.*;
     4.8 -import java.util.*;
     4.9 +import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
    4.10 +import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
    4.11 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
    4.12 +import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
    4.13 +import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
    4.14  import com.sun.java.util.jar.pack.Package.Class;
    4.15  import com.sun.java.util.jar.pack.Package.InnerClass;
    4.16 -import com.sun.java.util.jar.pack.ConstantPool.*;
    4.17 +import java.io.DataInputStream;
    4.18 +import java.io.FilterInputStream;
    4.19 +import java.io.IOException;
    4.20 +import java.io.InputStream;
    4.21 +import java.util.ArrayList;
    4.22 +import java.util.Map;
    4.23  
    4.24  /**
    4.25   * Reader for a class file that is being incorporated into a package.

     5.1 --- a/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java	Mon Nov 15 19:05:15 2010 -0800
     5.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java	Mon Nov 29 13:38:12 2010 -0800
     5.3 @@ -25,11 +25,19 @@
     5.4  
     5.5  package com.sun.java.util.jar.pack;
     5.6  
     5.7 -import java.io.*;
     5.8 -import java.util.*;
     5.9 +
    5.10 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
    5.11 +import com.sun.java.util.jar.pack.ConstantPool.Index;
    5.12 +import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
    5.13  import com.sun.java.util.jar.pack.Package.Class;
    5.14  import com.sun.java.util.jar.pack.Package.InnerClass;
    5.15 -import com.sun.java.util.jar.pack.ConstantPool.*;
    5.16 +import java.io.BufferedOutputStream;
    5.17 +import java.io.ByteArrayOutputStream;
    5.18 +import java.io.DataOutputStream;
    5.19 +import java.io.IOException;
    5.20 +import java.io.OutputStream;
    5.21 +import java.util.Iterator;
    5.22 +import java.util.List;
    5.23  
    5.24  /**
    5.25   * Writer for a class file that is incorporated into a package.

     6.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Code.java	Mon Nov 15 19:05:15 2010 -0800
     6.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Code.java	Mon Nov 29 13:38:12 2010 -0800
     6.3 @@ -25,10 +25,10 @@
     6.4  
     6.5  package com.sun.java.util.jar.pack;
     6.6  
     6.7 -import java.io.*;
     6.8 -import java.util.*;
     6.9  import com.sun.java.util.jar.pack.Package.Class;
    6.10  import java.lang.reflect.Modifier;
    6.11 +import java.util.Arrays;
    6.12 +import java.util.Collection;
    6.13  
    6.14  /**
    6.15   * Represents a chunk of bytecodes.

     7.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Coding.java	Mon Nov 15 19:05:15 2010 -0800
     7.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Coding.java	Mon Nov 29 13:38:12 2010 -0800
     7.3 @@ -25,8 +25,10 @@
     7.4  
     7.5  package com.sun.java.util.jar.pack;
     7.6  
     7.7 -import java.io.*;
     7.8 -import java.util.*;
     7.9 +import java.io.IOException;
    7.10 +import java.io.InputStream;
    7.11 +import java.io.OutputStream;
    7.12 +import java.util.HashMap;
    7.13  
    7.14  /**
    7.15   * Define the conversions between sequences of small integers and raw bytes.

     8.1 --- a/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Mon Nov 15 19:05:15 2010 -0800
     8.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Mon Nov 29 13:38:12 2010 -0800
     8.3 @@ -25,9 +25,17 @@
     8.4  
     8.5  package com.sun.java.util.jar.pack;
     8.6  
     8.7 -import java.io.*;
     8.8 -import java.util.*;
     8.9 -import java.util.zip.*;
    8.10 +import java.io.ByteArrayOutputStream;
    8.11 +import java.io.IOException;
    8.12 +import java.io.OutputStream;
    8.13 +import java.util.ArrayList;
    8.14 +import java.util.Collections;
    8.15 +import java.util.HashSet;
    8.16 +import java.util.Iterator;
    8.17 +import java.util.List;
    8.18 +import java.util.Random;
    8.19 +import java.util.zip.Deflater;
    8.20 +import java.util.zip.DeflaterOutputStream;
    8.21  
    8.22  /**
    8.23   * Heuristic chooser of basic encodings.

     9.1 --- a/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java	Mon Nov 15 19:05:15 2010 -0800
     9.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java	Mon Nov 29 13:38:12 2010 -0800
     9.3 @@ -25,7 +25,9 @@
     9.4  
     9.5  package com.sun.java.util.jar.pack;
     9.6  
     9.7 -import java.io.*;
     9.8 +import java.io.IOException;
     9.9 +import java.io.InputStream;
    9.10 +import java.io.OutputStream;
    9.11  
    9.12  /**
    9.13   * Interface for encoding and decoding int arrays using bytewise codes.

    10.1 --- a/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Mon Nov 15 19:05:15 2010 -0800
    10.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Mon Nov 29 13:38:12 2010 -0800
    10.3 @@ -25,7 +25,14 @@
    10.4  
    10.5  package com.sun.java.util.jar.pack;
    10.6  
    10.7 -import java.util.*;
    10.8 +import java.util.AbstractList;
    10.9 +import java.util.ArrayList;
   10.10 +import java.util.Arrays;
   10.11 +import java.util.Collection;
   10.12 +import java.util.List;
   10.13 +import java.util.ListIterator;
   10.14 +import java.util.Map;
   10.15 +import java.util.Set;
   10.16  
   10.17  /**
   10.18   * Representation of constant pool entries and indexes.

    11.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Constants.java	Mon Nov 15 19:05:15 2010 -0800
    11.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Constants.java	Mon Nov 29 13:38:12 2010 -0800
    11.3 @@ -25,7 +25,8 @@
    11.4  
    11.5  package com.sun.java.util.jar.pack;
    11.6  
    11.7 -import java.util.*;
    11.8 +import java.util.Arrays;
    11.9 +import java.util.List;
   11.10  
   11.11  /**
   11.12   * Shared constants

    12.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Driver.java	Mon Nov 15 19:05:15 2010 -0800
    12.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Driver.java	Mon Nov 29 13:38:12 2010 -0800
    12.3 @@ -25,11 +25,32 @@
    12.4  
    12.5  package com.sun.java.util.jar.pack;
    12.6  
    12.7 -import java.io.*;
    12.8 +import java.io.BufferedInputStream;
    12.9 +import java.io.BufferedOutputStream;
   12.10 +import java.io.File;
   12.11 +import java.io.FileInputStream;
   12.12 +import java.io.FileOutputStream;
   12.13 +import java.io.IOException;
   12.14 +import java.io.InputStream;
   12.15 +import java.io.OutputStream;
   12.16 +import java.io.PrintStream;
   12.17  import java.text.MessageFormat;
   12.18 -import java.util.*;
   12.19 -import java.util.jar.*;
   12.20 -import java.util.zip.*;
   12.21 +import java.util.ArrayList;
   12.22 +import java.util.Arrays;
   12.23 +import java.util.HashMap;
   12.24 +import java.util.Iterator;
   12.25 +import java.util.List;
   12.26 +import java.util.ListIterator;
   12.27 +import java.util.Map;
   12.28 +import java.util.Properties;
   12.29 +import java.util.ResourceBundle;
   12.30 +import java.util.SortedMap;
   12.31 +import java.util.TreeMap;
   12.32 +import java.util.jar.JarFile;
   12.33 +import java.util.jar.JarOutputStream;
   12.34 +import java.util.jar.Pack200;
   12.35 +import java.util.zip.GZIPInputStream;
   12.36 +import java.util.zip.GZIPOutputStream;
   12.37  
   12.38  /** Command line interface for Pack200.
   12.39   */

    13.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Fixups.java	Mon Nov 15 19:05:15 2010 -0800
    13.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Fixups.java	Mon Nov 29 13:38:12 2010 -0800
    13.3 @@ -25,9 +25,11 @@
    13.4  
    13.5  package com.sun.java.util.jar.pack;
    13.6  
    13.7 -import java.io.*;
    13.8 -import java.util.*;
    13.9 -import com.sun.java.util.jar.pack.ConstantPool.*;
   13.10 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
   13.11 +import java.util.AbstractCollection;
   13.12 +import java.util.ArrayList;
   13.13 +import java.util.Collection;
   13.14 +import java.util.Iterator;
   13.15  
   13.16  /**
   13.17   * Collection of relocatable constant pool references.

    14.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Histogram.java	Mon Nov 15 19:05:15 2010 -0800
    14.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Histogram.java	Mon Nov 29 13:38:12 2010 -0800
    14.3 @@ -25,8 +25,10 @@
    14.4  
    14.5  package com.sun.java.util.jar.pack;
    14.6  
    14.7 -import java.util.*;
    14.8 -import java.io.*;
    14.9 +import java.io.IOException;
   14.10 +import java.io.InputStream;
   14.11 +import java.io.PrintStream;
   14.12 +import java.util.Arrays;
   14.13  
   14.14  /**
   14.15   * Histogram derived from an integer array of events (int[]).

    15.1 --- a/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Mon Nov 15 19:05:15 2010 -0800
    15.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Mon Nov 29 13:38:12 2010 -0800
    15.3 @@ -26,10 +26,18 @@
    15.4  
    15.5  package com.sun.java.util.jar.pack;
    15.6  
    15.7 -import java.nio.*;
    15.8 -import java.io.*;
    15.9 -import java.util.jar.*;
   15.10 -import java.util.zip.*;
   15.11 +import java.io.BufferedInputStream;
   15.12 +import java.io.File;
   15.13 +import java.io.FileInputStream;
   15.14 +import java.io.IOException;
   15.15 +import java.io.InputStream;
   15.16 +import java.nio.ByteBuffer;
   15.17 +import java.util.jar.JarOutputStream;
   15.18 +import java.util.jar.Pack200;
   15.19 +import java.util.zip.CRC32;
   15.20 +import java.util.zip.Deflater;
   15.21 +import java.util.zip.ZipEntry;
   15.22 +import java.util.zip.ZipOutputStream;
   15.23  
   15.24  class NativeUnpack {
   15.25      // Pointer to the native unpacker obj

    16.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Package.java	Mon Nov 15 19:05:15 2010 -0800
    16.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Package.java	Mon Nov 29 13:38:12 2010 -0800
    16.3 @@ -26,11 +26,32 @@
    16.4  package com.sun.java.util.jar.pack;
    16.5  
    16.6  import com.sun.java.util.jar.pack.Attribute.Layout;
    16.7 +import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
    16.8 +import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
    16.9 +import com.sun.java.util.jar.pack.ConstantPool.Index;
   16.10 +import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
   16.11 +import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
   16.12 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
   16.13 +import java.io.ByteArrayInputStream;
   16.14 +import java.io.ByteArrayOutputStream;
   16.15 +import java.io.IOException;
   16.16 +import java.io.InputStream;
   16.17 +import java.io.OutputStream;
   16.18 +import java.io.SequenceInputStream;
   16.19  import java.lang.reflect.Modifier;
   16.20 -import java.util.*;
   16.21 -import java.util.jar.*;
   16.22 -import java.io.*;
   16.23 -import com.sun.java.util.jar.pack.ConstantPool.*;
   16.24 +import java.util.ArrayList;
   16.25 +import java.util.Arrays;
   16.26 +import java.util.Collection;
   16.27 +import java.util.Collections;
   16.28 +import java.util.Comparator;
   16.29 +import java.util.HashMap;
   16.30 +import java.util.HashSet;
   16.31 +import java.util.Iterator;
   16.32 +import java.util.List;
   16.33 +import java.util.ListIterator;
   16.34 +import java.util.Map;
   16.35 +import java.util.Set;
   16.36 +import java.util.jar.JarFile;
   16.37  
   16.38  /**
   16.39   * Define the main data structure transmitted by pack/unpack.

    17.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Mon Nov 15 19:05:15 2010 -0800
    17.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Mon Nov 29 13:38:12 2010 -0800
    17.3 @@ -25,12 +25,18 @@
    17.4  
    17.5  package com.sun.java.util.jar.pack;
    17.6  
    17.7 +import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
    17.8 +import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
    17.9 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
   17.10 +import com.sun.java.util.jar.pack.ConstantPool.Index;
   17.11 +import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
   17.12 +import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
   17.13 +import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
   17.14  import java.io.*;
   17.15  import java.util.*;
   17.16  import com.sun.java.util.jar.pack.Package.Class;
   17.17  import com.sun.java.util.jar.pack.Package.File;
   17.18  import com.sun.java.util.jar.pack.Package.InnerClass;
   17.19 -import com.sun.java.util.jar.pack.ConstantPool.*;
   17.20  
   17.21  /**
   17.22   * Reader for a package file.

    18.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Mon Nov 15 19:05:15 2010 -0800
    18.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Mon Nov 29 13:38:12 2010 -0800
    18.3 @@ -25,12 +25,30 @@
    18.4  
    18.5  package com.sun.java.util.jar.pack;
    18.6  
    18.7 -import java.io.*;
    18.8 -import java.util.*;
    18.9 +import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
   18.10 +import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
   18.11 +import com.sun.java.util.jar.pack.ConstantPool.Entry;
   18.12 +import com.sun.java.util.jar.pack.ConstantPool.Index;
   18.13 +import com.sun.java.util.jar.pack.ConstantPool.IndexGroup;
   18.14 +import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
   18.15 +import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
   18.16 +import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
   18.17 +import com.sun.java.util.jar.pack.ConstantPool.StringEntry;
   18.18  import com.sun.java.util.jar.pack.Package.Class;
   18.19  import com.sun.java.util.jar.pack.Package.File;
   18.20  import com.sun.java.util.jar.pack.Package.InnerClass;
   18.21 -import com.sun.java.util.jar.pack.ConstantPool.*;
   18.22 +import java.io.IOException;
   18.23 +import java.io.OutputStream;
   18.24 +import java.io.PrintStream;
   18.25 +import java.util.ArrayList;
   18.26 +import java.util.Arrays;
   18.27 +import java.util.Comparator;
   18.28 +import java.util.HashMap;
   18.29 +import java.util.HashSet;
   18.30 +import java.util.Iterator;
   18.31 +import java.util.List;
   18.32 +import java.util.ListIterator;
   18.33 +import java.util.Map;
   18.34  
   18.35  /**
   18.36   * Writer for a package file.

    19.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	Mon Nov 15 19:05:15 2010 -0800
    19.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	Mon Nov 29 13:38:12 2010 -0800
    19.3 @@ -26,10 +26,27 @@
    19.4  package com.sun.java.util.jar.pack;
    19.5  
    19.6  import com.sun.java.util.jar.pack.Attribute.Layout;
    19.7 -import java.util.*;
    19.8 -import java.util.jar.*;
    19.9 -import java.io.*;
   19.10  import java.beans.PropertyChangeListener;
   19.11 +import java.io.BufferedInputStream;
   19.12 +import java.io.ByteArrayInputStream;
   19.13 +import java.io.ByteArrayOutputStream;
   19.14 +import java.io.File;
   19.15 +import java.io.FileInputStream;
   19.16 +import java.io.IOException;
   19.17 +import java.io.InputStream;
   19.18 +import java.io.OutputStream;
   19.19 +import java.util.ArrayList;
   19.20 +import java.util.Collections;
   19.21 +import java.util.HashMap;
   19.22 +import java.util.List;
   19.23 +import java.util.ListIterator;
   19.24 +import java.util.Map;
   19.25 +import java.util.SortedMap;
   19.26 +import java.util.TimeZone;
   19.27 +import java.util.jar.JarEntry;
   19.28 +import java.util.jar.JarFile;
   19.29 +import java.util.jar.JarInputStream;
   19.30 +import java.util.jar.Pack200;
   19.31  
   19.32  
   19.33  /*

    20.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	Mon Nov 15 19:05:15 2010 -0800
    20.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	Mon Nov 29 13:38:12 2010 -0800
    20.3 @@ -25,8 +25,12 @@
    20.4  
    20.5  package com.sun.java.util.jar.pack;
    20.6  
    20.7 -import java.util.*;
    20.8 -import java.io.*;
    20.9 +import java.io.ByteArrayOutputStream;
   20.10 +import java.io.IOException;
   20.11 +import java.io.InputStream;
   20.12 +import java.io.OutputStream;
   20.13 +import java.util.Arrays;
   20.14 +import java.util.HashSet;
   20.15  
   20.16  /**
   20.17   * Population-based coding.

    21.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	Mon Nov 15 19:05:15 2010 -0800
    21.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	Mon Nov 29 13:38:12 2010 -0800
    21.3 @@ -25,13 +25,24 @@
    21.4  
    21.5  package com.sun.java.util.jar.pack;
    21.6  
    21.7 -import java.util.*;
    21.8 -import java.util.jar.*;
    21.9 -import java.util.jar.Pack200;
   21.10 -import java.util.zip.*;
   21.11 -import java.io.*;
   21.12  import java.beans.PropertyChangeListener;
   21.13  import java.beans.PropertyChangeEvent;
   21.14 +import java.io.BufferedInputStream;
   21.15 +import java.io.IOException;
   21.16 +import java.io.InputStream;
   21.17 +import java.io.PrintStream;
   21.18 +import java.io.PrintWriter;
   21.19 +import java.util.ArrayList;
   21.20 +import java.util.Collection;
   21.21 +import java.util.HashMap;
   21.22 +import java.util.Iterator;
   21.23 +import java.util.List;
   21.24 +import java.util.Map;
   21.25 +import java.util.Properties;
   21.26 +import java.util.Set;
   21.27 +import java.util.SortedMap;
   21.28 +import java.util.TreeMap;
   21.29 +import java.util.jar.Pack200;
   21.30  /**
   21.31   * Control block for publishing Pack200 options to the other classes.
   21.32   */

    22.1 --- a/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Mon Nov 15 19:05:15 2010 -0800
    22.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Mon Nov 29 13:38:12 2010 -0800
    22.3 @@ -25,11 +25,25 @@
    22.4  
    22.5  package com.sun.java.util.jar.pack;
    22.6  
    22.7 -import java.util.*;
    22.8 -import java.util.jar.*;
    22.9 -import java.util.zip.*;
   22.10 -import java.io.*;
   22.11  import java.beans.PropertyChangeListener;
   22.12 +import java.io.BufferedInputStream;
   22.13 +import java.io.ByteArrayOutputStream;
   22.14 +import java.io.File;
   22.15 +import java.io.FileInputStream;
   22.16 +import java.io.IOException;
   22.17 +import java.io.InputStream;
   22.18 +import java.io.OutputStream;
   22.19 +import java.util.HashSet;
   22.20 +import java.util.Iterator;
   22.21 +import java.util.SortedMap;
   22.22 +import java.util.TimeZone;
   22.23 +import java.util.jar.JarEntry;
   22.24 +import java.util.jar.JarInputStream;
   22.25 +import java.util.jar.JarOutputStream;
   22.26 +import java.util.jar.Pack200;
   22.27 +import java.util.zip.CRC32;
   22.28 +import java.util.zip.CheckedOutputStream;
   22.29 +import java.util.zip.ZipEntry;
   22.30  
   22.31  /*
   22.32   * Implementation of the Pack provider.

    23.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Utils.java	Mon Nov 15 19:05:15 2010 -0800
    23.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Utils.java	Mon Nov 29 13:38:12 2010 -0800
    23.3 @@ -25,18 +25,27 @@
    23.4  
    23.5  package com.sun.java.util.jar.pack;
    23.6  
    23.7 -import com.sun.java.util.jar.pack.Attribute.Layout;
    23.8  import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
    23.9  import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
   23.10  import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
   23.11  import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
   23.12  import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
   23.13  import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
   23.14 -import java.util.*;
   23.15 -import java.util.jar.*;
   23.16 -import java.util.zip.*;
   23.17 -import java.io.*;
   23.18 -
   23.19 +import java.io.BufferedInputStream;
   23.20 +import java.io.BufferedOutputStream;
   23.21 +import java.io.File;
   23.22 +import java.io.FilterOutputStream;
   23.23 +import java.io.IOException;
   23.24 +import java.io.InputStream;
   23.25 +import java.io.OutputStream;
   23.26 +import java.util.Date;
   23.27 +import java.util.Enumeration;
   23.28 +import java.util.Map;
   23.29 +import java.util.jar.JarEntry;
   23.30 +import java.util.jar.JarFile;
   23.31 +import java.util.jar.JarInputStream;
   23.32 +import java.util.jar.JarOutputStream;
   23.33 +import java.util.zip.ZipEntry;
   23.34  import sun.util.logging.PlatformLogger;
   23.35  
   23.36  class Utils {