# HG changeset patch
# User ksrini
# Date 1291066692 28800
# Node ID 445c518364c49b474c5bf16f93d3a8cf1c6fed1e
# Parent  f8de4b5aae478f748c0e7348a310e3b39583451e
7003227: (pack200) intermittent failures compiling pack200
Reviewed-by: jjg

diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,8 +25,10 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * Adaptive coding.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,9 +25,17 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import com.sun.java.util.jar.pack.ConstantPool.Index;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Represents an attribute in a class-file.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,12 +25,28 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import com.sun.java.util.jar.pack.Package.Class;
-import com.sun.java.util.jar.pack.Package.InnerClass;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import com.sun.java.util.jar.pack.ConstantPool.Index;
+import com.sun.java.util.jar.pack.Package.Class.Field;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.jar.Pack200;
 
 /**
  * Define the structure and ordering of "bands" in a packed file.
@@ -1629,7 +1645,7 @@
         }
     }
 
-    protected void setConstantValueIndex(Class.Field f) {
+    protected void setConstantValueIndex(com.sun.java.util.jar.pack.Package.Class.Field f) {
         Index ix = null;
         if (f != null) {
             byte tag = f.getLiteralTag();
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,11 +25,19 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
+import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
+import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.InnerClass;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import java.io.DataInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * Reader for a class file that is being incorporated into a package.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,11 +25,19 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
+
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import com.sun.java.util.jar.pack.ConstantPool.Index;
+import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.InnerClass;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Writer for a class file that is incorporated into a package.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,10 +25,10 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
 import com.sun.java.util.jar.pack.Package.Class;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
 
 /**
  * Represents a chunk of bytecodes.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,8 +25,10 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
 
 /**
  * Define the conversions between sequences of small integers and raw bytes.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,9 +25,17 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
-import java.util.zip.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
 
 /**
  * Heuristic chooser of basic encodings.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,7 +25,9 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * Interface for encoding and decoding int arrays using bytewise codes.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,7 +25,14 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Representation of constant pool entries and indexes.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,7 +25,8 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Shared constants
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,11 +25,32 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.text.MessageFormat;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Pack200;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 /** Command line interface for Pack200.
  */
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,9 +25,11 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
 
 /**
  * Collection of relocatable constant pool references.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,8 +25,10 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.Arrays;
 
 /**
  * Histogram derived from an integer array of events (int[]).
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Mon Nov 29 13:38:12 2010 -0800
@@ -26,10 +26,18 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.nio.*;
-import java.io.*;
-import java.util.jar.*;
-import java.util.zip.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Pack200;
+import java.util.zip.CRC32;
+import java.util.zip.Deflater;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 class NativeUnpack {
     // Pointer to the native unpacker obj
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	Mon Nov 29 13:38:12 2010 -0800
@@ -26,11 +26,32 @@
 package com.sun.java.util.jar.pack;
 
 import com.sun.java.util.jar.pack.Attribute.Layout;
+import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
+import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Index;
+import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.SequenceInputStream;
 import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.jar.*;
-import java.io.*;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarFile;
 
 /**
  * Define the main data structure transmitted by pack/unpack.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,12 +25,18 @@
 
 package com.sun.java.util.jar.pack;
 
+import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
+import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import com.sun.java.util.jar.pack.ConstantPool.Index;
+import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
+import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
 import java.io.*;
 import java.util.*;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.File;
 import com.sun.java.util.jar.pack.Package.InnerClass;
-import com.sun.java.util.jar.pack.ConstantPool.*;
 
 /**
  * Reader for a package file.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,12 +25,30 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.io.*;
-import java.util.*;
+import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
+import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
+import com.sun.java.util.jar.pack.ConstantPool.Entry;
+import com.sun.java.util.jar.pack.ConstantPool.Index;
+import com.sun.java.util.jar.pack.ConstantPool.IndexGroup;
+import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
+import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
+import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
+import com.sun.java.util.jar.pack.ConstantPool.StringEntry;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.File;
 import com.sun.java.util.jar.pack.Package.InnerClass;
-import com.sun.java.util.jar.pack.ConstantPool.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
 
 /**
  * Writer for a package file.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	Mon Nov 29 13:38:12 2010 -0800
@@ -26,10 +26,27 @@
 package com.sun.java.util.jar.pack;
 
 import com.sun.java.util.jar.pack.Attribute.Layout;
-import java.util.*;
-import java.util.jar.*;
-import java.io.*;
 import java.beans.PropertyChangeListener;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TimeZone;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.jar.Pack200;
 
 
 /*
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,8 +25,12 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.HashSet;
 
 /**
  * Population-based coding.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,13 +25,24 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
-import java.util.jar.*;
-import java.util.jar.Pack200;
-import java.util.zip.*;
-import java.io.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.jar.Pack200;
 /**
  * Control block for publishing Pack200 options to the other classes.
  */
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,11 +25,25 @@
 
 package com.sun.java.util.jar.pack;
 
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-import java.io.*;
 import java.beans.PropertyChangeListener;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.SortedMap;
+import java.util.TimeZone;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Pack200;
+import java.util.zip.CRC32;
+import java.util.zip.CheckedOutputStream;
+import java.util.zip.ZipEntry;
 
 /*
  * Implementation of the Pack provider.
diff -r f8de4b5aae47 -r 445c518364c4 jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	Mon Nov 15 19:05:15 2010 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	Mon Nov 29 13:38:12 2010 -0800
@@ -25,18 +25,27 @@
 
 package com.sun.java.util.jar.pack;
 
-import com.sun.java.util.jar.pack.Attribute.Layout;
 import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
 import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
 import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
 import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
 import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
 import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-import java.io.*;
-
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
 import sun.util.logging.PlatformLogger;
 
 class Utils {