Fix import ordering in Espresso code base.

Author: rakachan

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClassfileStream.java

@@ -22,13 +22,13 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
-
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
+
 /**
  * Operations for sequentially scanning data items in a class file. Any IO exceptions that occur
  * during scanning are converted to {@link ParserException.ClassFormatError}s.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClasspathEntry.java

@@ -22,10 +22,10 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
-import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
-
 import java.io.File;
 
+import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
+
 /**
  * An entry in a classpath is a file system path that denotes an existing directory, an existing
  * zip/jar file or a file.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClasspathFile.java

@@ -22,10 +22,10 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
-import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
-
 import java.io.File;
 
+import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
+
 /**
  * Encapsulates the contents of a file loaded from an {@linkplain ClasspathEntry entry} on a
  * classpath.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ConstantPool.java

@@ -22,9 +22,23 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.CLASS;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.DOUBLE;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FIELD_REF;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FLOAT;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTEGER;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTERFACE_METHOD_REF;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INVOKEDYNAMIC;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.LONG;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.METHOD_REF;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.NAME_AND_TYPE;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.STRING;
+import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.UTF8;
+
+import java.util.Arrays;
+import java.util.Formatter;
+
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol.ModifiedUTF8;
 import com.oracle.truffle.espresso.classfile.constantpool.ClassConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.ClassMethodRefConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.DoubleConstant;
@@ -40,22 +54,8 @@
 import com.oracle.truffle.espresso.classfile.constantpool.PoolConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.StringConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
-
-import java.util.Arrays;
-import java.util.Formatter;
-
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.CLASS;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.DOUBLE;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FIELD_REF;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FLOAT;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTEGER;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTERFACE_METHOD_REF;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INVOKEDYNAMIC;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.LONG;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.METHOD_REF;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.NAME_AND_TYPE;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.STRING;
-import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.UTF8;
+import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
+import com.oracle.truffle.espresso.classfile.descriptors.Symbol.ModifiedUTF8;
 
 /**
  * Immutable, shareable constant-pool representation.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ImmutableConstantPool.java

@@ -22,16 +22,16 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Objects;
+
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.constantpool.ClassConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.PoolConstant;
 import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Objects;
+import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 
 /**
  * Immutable constant pool implementation backed by an array of constants.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserField.java

@@ -22,16 +22,16 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
+import static com.oracle.truffle.espresso.classfile.Constants.ACC_HIDDEN;
+
 import java.lang.reflect.Modifier;
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.espresso.classfile.attributes.Attribute;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
 import com.oracle.truffle.espresso.classfile.descriptors.Types;
-import com.oracle.truffle.espresso.classfile.attributes.Attribute;
-
-import static com.oracle.truffle.espresso.classfile.Constants.ACC_HIDDEN;
 
 public final class ParserField {
     public static final ParserField[] EMPTY_ARRAY = new ParserField[0];

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserKlass.java

@@ -23,10 +23,10 @@
 package com.oracle.truffle.espresso.classfile;
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.espresso.classfile.attributes.Attribute;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
-import com.oracle.truffle.espresso.classfile.attributes.Attribute;
 
 /**
  * Immutable raw representation of classes in Espresso, this is the output of the parser, super

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserMethod.java

@@ -23,10 +23,10 @@
 package com.oracle.truffle.espresso.classfile;
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.espresso.classfile.attributes.Attribute;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Signature;
-import com.oracle.truffle.espresso.classfile.attributes.Attribute;
 
 /**
  * Immutable raw representation of methods in Espresso, this is the output of the parser.

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParsingContext.java

@@ -22,15 +22,15 @@
  */
 package com.oracle.truffle.espresso.classfile;
 
+import java.util.function.Supplier;
+
+import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
 import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
 import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
-import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
 import com.oracle.truffle.espresso.classfile.perf.TimerCollection;
 
-import java.util.function.Supplier;
-
 public interface ParsingContext {
 
     JavaVersion getJavaVersion();

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/CodeAttribute.java

@@ -23,20 +23,20 @@
 
 package com.oracle.truffle.espresso.classfile.attributes;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.espresso.classfile.bytecode.BytecodeStream;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
-import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
-import com.oracle.truffle.espresso.classfile.ClassfileParser;
-import com.oracle.truffle.espresso.classfile.ExceptionHandler;
-
 import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.JSR;
 import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.JSR_W;
 import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.MONITORENTER;
 import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.MONITOREXIT;
 import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.RET;
 
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.espresso.classfile.ClassfileParser;
+import com.oracle.truffle.espresso.classfile.ExceptionHandler;
+import com.oracle.truffle.espresso.classfile.bytecode.BytecodeStream;
+import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
+import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
+
 public final class CodeAttribute extends Attribute {
 
     public static final Symbol<Name> NAME = Name.Code;