[core] organize imports #2579

automated cleanup #2579
eclipse-jdt · Sep 30, 2024 · 1ced1b2 · 1ced1b2
1 parent 83cc196
commit 1ced1b2
Show file tree

Hide file tree

Showing 973 changed files with 2,350 additions and 5,027 deletions.
diff --git a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java
@@ -14,10 +14,14 @@
  *******************************************************************************/
 package org.eclipse.jdt.annotation;
 
-import java.lang.annotation.ElementType;
-import static org.eclipse.jdt.annotation.DefaultLocation.*;
+import static org.eclipse.jdt.annotation.DefaultLocation.FIELD;
+import static org.eclipse.jdt.annotation.DefaultLocation.PARAMETER;
+import static org.eclipse.jdt.annotation.DefaultLocation.RETURN_TYPE;
+import static org.eclipse.jdt.annotation.DefaultLocation.TYPE_ARGUMENT;
+import static org.eclipse.jdt.annotation.DefaultLocation.TYPE_BOUND;
 
 import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorEnvironment.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorEnvironment.java
@@ -32,12 +32,16 @@
 package com.sun.mirror.apt;
 
 
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.Declaration;
+import com.sun.mirror.declaration.PackageDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.util.DeclarationFilter;
+import com.sun.mirror.util.Declarations;
+import com.sun.mirror.util.Types;
 import java.util.Collection;
 import java.util.Map;
 
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-
 
 /**
  * The environment encapsulating the state needed by an annotation processor.

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorFactory.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorFactory.java
@@ -32,11 +32,10 @@
 package com.sun.mirror.apt;
 
 
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 import java.util.Collection;
 import java.util.Set;
 
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
 
 /**
  * A factory for creating annotation processors.

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessors.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessors.java
@@ -31,7 +31,10 @@
 
 package com.sun.mirror.apt;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Utilities to create specialized annotation processors.

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/Filer.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/Filer.java
@@ -32,7 +32,10 @@
 package com.sun.mirror.apt;
 
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationMirror.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationMirror.java
@@ -31,9 +31,9 @@
 
 package com.sun.mirror.declaration;
 
-import java.util.Map;
 import com.sun.mirror.type.AnnotationType;
 import com.sun.mirror.util.SourcePosition;
+import java.util.Map;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ClassDeclaration.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ClassDeclaration.java
@@ -32,9 +32,8 @@
 package com.sun.mirror.declaration;
 
 
-import java.util.Collection;
-
 import com.sun.mirror.type.ClassType;
+import java.util.Collection;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/Declaration.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/Declaration.java
@@ -32,12 +32,15 @@
 package com.sun.mirror.declaration;
 
 
+import com.sun.mirror.type.MirroredTypeException;
+import com.sun.mirror.type.MirroredTypesException;
+import com.sun.mirror.type.TypeMirror;
+import com.sun.mirror.util.DeclarationVisitor;
+import com.sun.mirror.util.Declarations;
+import com.sun.mirror.util.SourcePosition;
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
 
 /**
  * Represents the declaration of a program element such as a package,

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ExecutableDeclaration.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ExecutableDeclaration.java
@@ -32,9 +32,8 @@
 package com.sun.mirror.declaration;
 
 
-import java.util.Collection;
-
 import com.sun.mirror.type.ReferenceType;
+import java.util.Collection;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeDeclaration.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeDeclaration.java
@@ -32,10 +32,10 @@
 package com.sun.mirror.declaration;
 
 
+import com.sun.mirror.type.DeclaredType;
+import com.sun.mirror.type.InterfaceType;
 import java.util.Collection;
 
-import com.sun.mirror.type.*;
-
 
 /**
  * Represents the declaration of a class or interface.

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeParameterDeclaration.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeParameterDeclaration.java
@@ -32,10 +32,10 @@
 package com.sun.mirror.declaration;
 
 
+import com.sun.mirror.type.ReferenceType;
+import com.sun.mirror.type.TypeVariable;
 import java.util.Collection;
 
-import com.sun.mirror.type.*;
-
 
 /**
  * Represents a formal type parameter of a generic type, method,

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ClassType.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ClassType.java
@@ -32,7 +32,8 @@
 package com.sun.mirror.type;
 
 
-import com.sun.mirror.declaration.*;
+import com.sun.mirror.declaration.ClassDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/DeclaredType.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/DeclaredType.java
@@ -32,9 +32,8 @@
 package com.sun.mirror.type;
 
 
-import java.util.Collection;
-
 import com.sun.mirror.declaration.TypeDeclaration;
+import java.util.Collection;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/InterfaceType.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/InterfaceType.java
@@ -32,7 +32,8 @@
 package com.sun.mirror.type;
 
 
-import com.sun.mirror.declaration.*;
+import com.sun.mirror.declaration.InterfaceDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/MirroredTypesException.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/MirroredTypesException.java
@@ -32,12 +32,11 @@
 package com.sun.mirror.type;
 
 
+import com.sun.mirror.declaration.Declaration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import com.sun.mirror.declaration.Declaration;
-
 
 /**
  * Thrown when an application attempts to access a sequence of {@link Class}

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeMirror.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeMirror.java
@@ -33,8 +33,8 @@
 
 
 import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.util.Types;
 import com.sun.mirror.util.TypeVisitor;
+import com.sun.mirror.util.Types;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeVariable.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeVariable.java
@@ -32,7 +32,7 @@
 package com.sun.mirror.type;
 
 
-import com.sun.mirror.declaration.*;
+import com.sun.mirror.declaration.TypeParameterDeclaration;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationFilter.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationFilter.java
@@ -32,13 +32,14 @@
 package com.sun.mirror.util;
 
 
-import java.util.ArrayList;
-import java.util.Collection;
+import static com.sun.mirror.declaration.Modifier.PRIVATE;
+import static com.sun.mirror.declaration.Modifier.PROTECTED;
+import static com.sun.mirror.declaration.Modifier.PUBLIC;
 
 import com.sun.mirror.declaration.Declaration;
 import com.sun.mirror.declaration.Modifier;
-
-import static com.sun.mirror.declaration.Modifier.*;
+import java.util.ArrayList;
+import java.util.Collection;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Declarations.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Declarations.java
@@ -32,7 +32,8 @@
 package com.sun.mirror.util;
 
 
-import com.sun.mirror.declaration.*;
+import com.sun.mirror.declaration.MemberDeclaration;
+import com.sun.mirror.declaration.MethodDeclaration;
 
 
 /**

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SourceOrderDeclScanner.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SourceOrderDeclScanner.java
@@ -32,7 +32,6 @@
 package com.sun.mirror.util;
 
 import com.sun.mirror.declaration.*;
-
 import java.util.SortedSet;
 import java.util.TreeSet;
 

diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Types.java b/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Types.java
@@ -32,11 +32,18 @@
 package com.sun.mirror.util;
 
 
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.declaration.TypeParameterDeclaration;
+import com.sun.mirror.type.ArrayType;
+import com.sun.mirror.type.DeclaredType;
+import com.sun.mirror.type.PrimitiveType;
+import com.sun.mirror.type.ReferenceType;
+import com.sun.mirror.type.TypeMirror;
+import com.sun.mirror.type.TypeVariable;
+import com.sun.mirror.type.VoidType;
+import com.sun.mirror.type.WildcardType;
 import java.util.Collection;
 
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
 
 /**
  * Utility methods for operating on types.

diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/JdtApt.java b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/JdtApt.java
@@ -15,7 +15,6 @@
 package org.eclipse.jdt.apt.core.build;
 
 import java.io.File;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.types.Path;

diff --git a/....jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java b/....jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java
@@ -13,12 +13,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.apt.core.env;
 
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import org.eclipse.jdt.apt.core.util.EclipseMessager;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
 /**
  * Extended the APT {@link AnnotationProcessorEnvironment} to expose
  * extra API.

diff --git a/...ipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java b/...ipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jdt.apt.core.env;
 
-import java.util.Set;
-
 import com.sun.mirror.apt.AnnotationProcessor;
 import com.sun.mirror.apt.AnnotationProcessorFactory;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import java.util.Set;
 
 /**
  * Extend the APT annotation processor factory API to provide extra features.

diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java
@@ -15,15 +15,14 @@
 
 package org.eclipse.jdt.apt.core.env;
 
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jdt.apt.core.internal.env.BaseProcessorEnv;
 import org.eclipse.jdt.apt.core.internal.util.TestCodeUtil;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
 public class EnvironmentFactory {
 
 	/**

diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java
@@ -16,17 +16,12 @@
 
 package org.eclipse.jdt.apt.core.internal;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessorListener;
+import com.sun.mirror.apt.RoundCompleteListener;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import java.util.*;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
@@ -35,10 +30,10 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.apt.core.env.Phase;
 import org.eclipse.jdt.apt.core.internal.env.AbstractCompilationEnv;
+import org.eclipse.jdt.apt.core.internal.env.AbstractCompilationEnv.EnvCallback;
 import org.eclipse.jdt.apt.core.internal.env.BuildEnv;
 import org.eclipse.jdt.apt.core.internal.env.EclipseRoundCompleteEvent;
 import org.eclipse.jdt.apt.core.internal.env.ReconcileEnv;
-import org.eclipse.jdt.apt.core.internal.env.AbstractCompilationEnv.EnvCallback;
 import org.eclipse.jdt.apt.core.internal.generatedfile.GeneratedFileManager;
 import org.eclipse.jdt.apt.core.internal.util.FactoryPath;
 import org.eclipse.jdt.apt.core.util.AptConfig;
@@ -48,12 +43,6 @@
 import org.eclipse.jdt.core.compiler.CategorizedProblem;
 import org.eclipse.jdt.core.compiler.ReconcileContext;
 
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessorListener;
-import com.sun.mirror.apt.RoundCompleteListener;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
 public class APTDispatchRunnable implements IWorkspaceRunnable
 {
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ @@
     package com.sun.mirror.type;
-    import com.sun.mirror.declaration.*;
+    import com.sun.mirror.declaration.TypeParameterDeclaration;
     /**
@@ Expand Down @@