opprop · xingweitian · Mar 24, 2020 · Mar 24, 2020 · Mar 27, 2020 · Apr 24, 2020
diff --git a/checker/jtreg/multipleexecutions/Main.java b/checker/jtreg/multipleexecutions/Main.java
@@ -11,14 +11,12 @@
  * https://groups.google.com/d/msg/checker-framework-dev/FvWmCxB8OpE/Cgp1DsPwnWwJ
  */
 
-import org.checkerframework.checker.regex.RegexChecker;
-
 import java.io.File;
 import java.util.Arrays;
-
 import javax.tools.JavaCompiler;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
+import org.checkerframework.checker.regex.RegexChecker;
 
 public class Main {
 

diff --git a/checker/jtreg/nullness/PersistUtil.java b/checker/jtreg/nullness/PersistUtil.java
@@ -7,7 +7,6 @@
  * defaultPersists/Driver and inheritDeclAnnoPersist/Driver.
  */
 import com.sun.tools.classfile.ClassFile;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;

diff --git a/checker/jtreg/nullness/defaultsPersist/Driver.java b/checker/jtreg/nullness/defaultsPersist/Driver.java
@@ -8,9 +8,6 @@
 import com.sun.tools.classfile.ClassFile;
 import com.sun.tools.classfile.TypeAnnotation;
 import com.sun.tools.classfile.TypeAnnotation.TargetType;
-
-import org.checkerframework.javacutil.Pair;
-
 import java.io.PrintStream;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -19,6 +16,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import org.checkerframework.javacutil.Pair;
 
 public class Driver {
 

diff --git a/checker/jtreg/nullness/defaultsPersist/ReferenceInfoUtil.java b/checker/jtreg/nullness/defaultsPersist/ReferenceInfoUtil.java
@@ -11,13 +11,11 @@
 import com.sun.tools.classfile.Method;
 import com.sun.tools.classfile.RuntimeTypeAnnotations_attribute;
 import com.sun.tools.classfile.TypeAnnotation;
-
-import org.checkerframework.javacutil.Pair;
-import org.checkerframework.javacutil.PluginUtil;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.checkerframework.javacutil.Pair;
+import org.checkerframework.javacutil.PluginUtil;
 
 public class ReferenceInfoUtil {
 

diff --git a/checker/jtreg/nullness/inheritDeclAnnoPersist/Driver.java b/checker/jtreg/nullness/inheritDeclAnnoPersist/Driver.java
@@ -3,7 +3,6 @@
 
 import com.sun.tools.classfile.Annotation;
 import com.sun.tools.classfile.ClassFile;
-
 import java.io.PrintStream;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/checker/jtreg/nullness/inheritDeclAnnoPersist/ReferenceInfoUtil.java b/checker/jtreg/nullness/inheritDeclAnnoPersist/ReferenceInfoUtil.java
@@ -9,12 +9,10 @@
 import com.sun.tools.classfile.ConstantPool.UnexpectedEntry;
 import com.sun.tools.classfile.Method;
 import com.sun.tools.classfile.RuntimeAnnotations_attribute;
-
-import org.checkerframework.javacutil.PluginUtil;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringJoiner;
+import org.checkerframework.javacutil.PluginUtil;
 
 public class ReferenceInfoUtil {
 

diff --git a/checker/jtreg/nullness/issue1929/Issue1929.java b/checker/jtreg/nullness/issue1929/Issue1929.java
@@ -6,9 +6,8 @@
  * @compile/fail/ref=Issue1929-trust.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker -Alint=trustArrayLenZero Issue1929.java
  */
 
-import org.checkerframework.common.value.qual.ArrayLen;
-
 import java.util.Collection;
+import org.checkerframework.common.value.qual.ArrayLen;
 
 public class Issue1929 {
 

diff --git a/checker/jtreg/nullness/issue1958/SupplierDefs.java b/checker/jtreg/nullness/issue1958/SupplierDefs.java
@@ -6,9 +6,8 @@
  * @compile/fail/ref=NPE2Test.out -XDrawDiagnostics -processor org.checkerframework.checker.nullness.NullnessChecker NPE2Test.java -Anomsgtext
  */
 
-import org.checkerframework.checker.nullness.qual.*;
-
 import java.util.function.Supplier;
+import org.checkerframework.checker.nullness.qual.*;
 
 public class SupplierDefs {
     public abstract static class Supplier<R> {

diff --git a/checker/jtreg/nullness/stub-warnings/Binary.java b/checker/jtreg/nullness/stub-warnings/Binary.java
@@ -1,9 +1,8 @@
 // This class is not compiled with the Nullness Checker,
 // so that only explicit annotations are stored in bytecode.
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import javax.annotation.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 class Binary {
     @Nullable Object foo() {

diff --git a/checker/jtreg/stubs/issue1456/Main.java b/checker/jtreg/stubs/issue1456/Main.java
@@ -8,7 +8,6 @@
 package issue1456;
 
 import issue1456lib.Lib;
-
 import org.checkerframework.checker.tainting.qual.Untainted;
 
 public class Main {

diff --git a/checker/jtreg/tainting/classes/Issue919.java b/checker/jtreg/tainting/classes/Issue919.java
@@ -1,7 +1,6 @@
 package classes;
 
 import classes.Issue919B.InnerClass;
-
 import java.util.Set;
 
 public class Issue919 {

diff --git a/checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java b/checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.compilermsgs.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * A string that is definitely a compiler message key.

diff --git a/...rc/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKeyBottom.java b/...rc/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKeyBottom.java
@@ -1,15 +1,14 @@
 package org.checkerframework.checker.compilermsgs.qual;
 
-import org.checkerframework.framework.qual.DefaultFor;
-import org.checkerframework.framework.qual.SubtypeOf;
-import org.checkerframework.framework.qual.TargetLocations;
-import org.checkerframework.framework.qual.TypeUseLocation;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.DefaultFor;
+import org.checkerframework.framework.qual.SubtypeOf;
+import org.checkerframework.framework.qual.TargetLocations;
+import org.checkerframework.framework.qual.TypeUseLocation;
 
 /**
  * The bottom type in the Compiler Message Key type system. Programmers should rarely write this

diff --git a/...c/main/java/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java b/...c/main/java/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java
@@ -1,14 +1,13 @@
 package org.checkerframework.checker.compilermsgs.qual;
 
-import org.checkerframework.framework.qual.DefaultQualifierInHierarchy;
-import org.checkerframework.framework.qual.InvisibleQualifier;
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.DefaultQualifierInHierarchy;
+import org.checkerframework.framework.qual.InvisibleQualifier;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * A {@code String} that might or might not be a compiler message key.

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java
@@ -1,5 +1,8 @@
 package org.checkerframework.checker.fenum;
 
+import java.lang.annotation.Annotation;
+import java.util.Set;
+import javax.lang.model.element.AnnotationMirror;
 import org.checkerframework.checker.fenum.qual.Fenum;
 import org.checkerframework.checker.fenum.qual.FenumBottom;
 import org.checkerframework.checker.fenum.qual.FenumTop;
@@ -15,11 +18,6 @@
 import org.checkerframework.javacutil.UserError;
 import org.plumelib.reflection.Signatures;
 
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import javax.lang.model.element.AnnotationMirror;
-
 /** The type factory for the Fenum Checker. */
 public class FenumAnnotatedTypeFactory extends BaseAnnotatedTypeFactory {
 

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/FenumChecker.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumChecker.java
@@ -1,13 +1,11 @@
 package org.checkerframework.checker.fenum;
 
+import java.util.SortedSet;
+import javax.annotation.processing.SupportedOptions;
 import org.checkerframework.common.basetype.BaseTypeChecker;
 import org.checkerframework.common.subtyping.SubtypingChecker;
 import org.checkerframework.framework.qual.StubFiles;
 
-import java.util.SortedSet;
-
-import javax.annotation.processing.SupportedOptions;
-
 /**
  * The main checker class for the Fake Enum Checker.
  *

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/FenumVisitor.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumVisitor.java
@@ -6,7 +6,10 @@
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.SwitchTree;
 import com.sun.source.tree.Tree;
-
+import java.util.Collections;
+import java.util.Set;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.ExecutableElement;
 import org.checkerframework.common.basetype.BaseTypeChecker;
 import org.checkerframework.common.basetype.BaseTypeVisitor;
 import org.checkerframework.framework.type.AnnotatedTypeMirror;
@@ -15,12 +18,6 @@
 import org.checkerframework.framework.type.QualifierHierarchy;
 import org.checkerframework.javacutil.TreeUtils;
 
-import java.util.Collections;
-import java.util.Set;
-
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.ExecutableElement;
-
 public class FenumVisitor extends BaseTypeVisitor<FenumAnnotatedTypeFactory> {
     public FenumVisitor(BaseTypeChecker checker) {
         super(checker);

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtAlphaCompositingRule.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtAlphaCompositingRule.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * Basic alpha compositing rules for combining source and destination colors to achieve blending and

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtColorSpace.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtColorSpace.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * Color space tags to identify the specific color space of a Color object or, via a ColorModel

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtCursorType.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtCursorType.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * AwtCursorType.

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtFlowLayout.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtFlowLayout.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * Line alignments in a flow layout (see {@link java.awt.FlowLayout} for more details).

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/Fenum.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/Fenum.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * A generic fake enumeration qualifier that is parameterized by a name. It is written in source

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumBottom.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumBottom.java
@@ -1,15 +1,14 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.DefaultFor;
-import org.checkerframework.framework.qual.SubtypeOf;
-import org.checkerframework.framework.qual.TargetLocations;
-import org.checkerframework.framework.qual.TypeUseLocation;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.DefaultFor;
+import org.checkerframework.framework.qual.SubtypeOf;
+import org.checkerframework.framework.qual.TargetLocations;
+import org.checkerframework.framework.qual.TypeUseLocation;
 
 /**
  * The bottom type in the Fenum type system. Programmers should rarely write this type.

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumTop.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumTop.java
@@ -1,15 +1,14 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.DefaultFor;
-import org.checkerframework.framework.qual.SubtypeOf;
-import org.checkerframework.framework.qual.TargetLocations;
-import org.checkerframework.framework.qual.TypeUseLocation;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.DefaultFor;
+import org.checkerframework.framework.qual.SubtypeOf;
+import org.checkerframework.framework.qual.TargetLocations;
+import org.checkerframework.framework.qual.TypeUseLocation;
 
 /**
  * The top of the fake enumeration type hierarchy.

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumUnqualified.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumUnqualified.java
@@ -1,14 +1,13 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.DefaultFor;
-import org.checkerframework.framework.qual.DefaultQualifierInHierarchy;
-import org.checkerframework.framework.qual.SubtypeOf;
-import org.checkerframework.framework.qual.TypeUseLocation;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.DefaultFor;
+import org.checkerframework.framework.qual.DefaultQualifierInHierarchy;
+import org.checkerframework.framework.qual.SubtypeOf;
+import org.checkerframework.framework.qual.TypeUseLocation;
 
 /**
  * An unqualified type. Such a type is incomparable to (that is, neither a subtype nor a supertype

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/PolyFenum.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/PolyFenum.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.PolymorphicQualifier;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.PolymorphicQualifier;
 
 /**
  * A polymorphic qualifier for the fake enum type system.

diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java
@@ -1,12 +1,11 @@
 package org.checkerframework.checker.fenum.qual;
 
-import org.checkerframework.framework.qual.SubtypeOf;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
  * SwingBoxOrientation.