diff -r db36841709e4 -r 1a65d6565b45 src/share/classes/com/sun/tools/javac/code/Type.java --- a/src/share/classes/com/sun/tools/javac/code/Type.java Wed Sep 26 14:22:41 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java Fri Sep 28 16:56:53 2012 +0100 @@ -27,18 +27,19 @@ import java.util.Collections; +import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.util.*; -import com.sun.tools.javac.code.Symbol.*; import java.util.EnumMap; import java.util.EnumSet; import java.util.Map; import java.util.Set; + import javax.lang.model.type.*; +import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.code.TypeTags.*; /** This class represents Java types. The class itself defines the behavior of