diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar index 7e37a6120..7ad1a8369 100644 Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ diff --git a/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt b/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt index f9cb8d9cf..5a7789290 100644 --- a/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt +++ b/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt @@ -64,7 +64,7 @@ import java.io.File import java.util.Objects import java.util.regex.Pattern.compile import java.util.regex.Pattern.quote -import javax.lang.model.SourceVersion +import jdkx.lang.model.SourceVersion /** * Handles events related to files in filetree. diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java b/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java index 3ba2f289c..152d5bc06 100644 --- a/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java +++ b/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java @@ -294,7 +294,9 @@ class SubscriberMethodFinder { if (clazzName.startsWith("java.") || clazzName.startsWith("javax.") || clazzName.startsWith("android.") - || clazzName.startsWith("androidx.")) { + || clazzName.startsWith("androidx.") + || clazzName.startsWith("jdkx.") + || clazzName.startsWith("openjdk.")) { clazz = null; } } diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt index a2b5bfb53..58cd11c2f 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt @@ -37,7 +37,7 @@ import io.github.rosemoe.sora.widget.CodeEditor import java.nio.file.Path import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletionException -import javax.lang.model.element.Modifier.STATIC +import jdkx.lang.model.element.Modifier.STATIC /** * Any action that has to work with fields in the current class can inherit this action. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt index 855bf4677..cd21bbc0c 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt @@ -36,8 +36,8 @@ import com.itsaky.androidide.lsp.models.DiagnosticItem import com.itsaky.androidide.projects.ProjectManager import com.itsaky.androidide.resources.R import com.itsaky.androidide.utils.ILogger -import javax.tools.Diagnostic -import javax.tools.JavaFileObject +import jdkx.tools.Diagnostic +import jdkx.tools.JavaFileObject /** @author Akash Yadav */ class AddImportAction : BaseJavaCodeAction() { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt index ccdb9f0f7..71741f12b 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt @@ -25,8 +25,8 @@ import com.itsaky.androidide.lsp.java.actions.BaseJavaCodeAction import com.itsaky.androidide.lsp.java.models.DiagnosticCode import com.itsaky.androidide.lsp.java.rewrite.ImplementAbstractMethods import com.itsaky.androidide.utils.ILogger -import javax.tools.Diagnostic -import javax.tools.JavaFileObject +import jdkx.tools.Diagnostic +import jdkx.tools.JavaFileObject /** @author Akash Yadav */ class ImplementAbstractMethodsAction : BaseJavaCodeAction() { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt index 014a0e0b4..33a711419 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt @@ -43,8 +43,8 @@ import openjdk.source.util.TreePath import openjdk.source.util.Trees import io.github.rosemoe.sora.widget.CodeEditor import java.util.concurrent.CompletableFuture -import javax.lang.model.element.Modifier.FINAL -import javax.lang.model.element.VariableElement +import jdkx.lang.model.element.Modifier.FINAL +import jdkx.lang.model.element.VariableElement /** * Allows the user to select fields from the current class, then generates setters and getters for diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt index 8322feaaa..66f41ac40 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt @@ -45,7 +45,7 @@ import openjdk.tools.javac.tree.TreeInfo import openjdk.tools.javac.util.Names import io.github.rosemoe.sora.widget.CodeEditor import java.util.concurrent.CompletableFuture -import javax.lang.model.element.VariableElement +import jdkx.lang.model.element.VariableElement /** * Generates the `toString()` method for the current class. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt index c6f91d9e0..76aaa53eb 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt @@ -45,13 +45,13 @@ import io.github.rosemoe.sora.widget.CodeEditor import java.util.Arrays import java.util.Optional import java.util.concurrent.CompletableFuture -import javax.lang.model.element.ElementKind -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier -import javax.lang.model.element.TypeElement -import javax.lang.model.type.DeclaredType -import javax.lang.model.type.ExecutableType -import javax.tools.JavaFileObject +import jdkx.lang.model.element.ElementKind +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.type.DeclaredType +import jdkx.lang.model.type.ExecutableType +import jdkx.tools.JavaFileObject /** * Allows the user to override multiple methods from superclass at once. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java index fe9087ae2..2caba1c41 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java @@ -59,9 +59,9 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import javax.lang.model.SourceVersion; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; public class CompileBatch implements AutoCloseable { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java index a1c861710..b99914b6c 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java @@ -26,8 +26,8 @@ import openjdk.tools.javac.api.JavacTaskImpl; import java.nio.file.Path; import java.util.List; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; public class CompileTask implements AutoCloseable { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java index 6f080446b..a5251f1b8 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.TreeSet; import java.util.stream.Collectors; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; public interface CompilerProvider { Path NOT_FOUND = Paths.get(""); diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java index 2a29943b1..bc2776242 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java @@ -69,9 +69,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardLocation; public class JavaCompilerService implements CompilerProvider { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java index ef62301ea..d273b92a3 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java @@ -51,10 +51,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardLocation; @SuppressWarnings("Since15") public class SourceFileManager extends ForwardingJavaFileManager { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java index 930ff34fc..4f07d2f8f 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java @@ -31,9 +31,9 @@ import java.net.URI; import java.nio.file.Path; import java.time.Instant; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.JavaFileObject; public class SourceFileObject implements JavaFileObject { /** path is the absolute path to this file on disk */ diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt index a66721c01..469e59759 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt @@ -19,7 +19,7 @@ package com.itsaky.androidide.lsp.java.models import com.itsaky.androidide.lsp.java.compiler.CompilationTaskProcessor import com.itsaky.androidide.lsp.java.compiler.DefaultCompilationTaskProcessor -import javax.tools.JavaFileObject +import jdkx.tools.JavaFileObject /** * Data sent to compiler to request a compilation. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java index 87a7e9523..806cff7c9 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java @@ -43,8 +43,8 @@ import java.util.Collections; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; public class Parser { @@ -92,7 +92,7 @@ public class Parser { Collections.singletonList(file)); } - private static void ignoreError(javax.tools.Diagnostic __) { + private static void ignoreError(jdkx.tools.Diagnostic __) { // Too noisy, this only comes up in parse tasks which tend to be less important // LOG.warning(err.getMessage(Locale.getDefault())); } diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java index f2931d8cb..2a46ad16e 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java @@ -42,10 +42,10 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.TypeKind; +import jdkx.tools.JavaFileObject; public class DefinitionProvider { public static final List NOT_SUPPORTED = Collections.emptyList(); diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt index ac7083085..2f02eb86c 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt @@ -40,9 +40,9 @@ import java.nio.file.Path import java.nio.file.Paths import java.util.Locale import java.util.regex.Pattern -import javax.lang.model.element.Element -import javax.tools.Diagnostic -import javax.tools.JavaFileObject +import jdkx.lang.model.element.Element +import jdkx.tools.Diagnostic +import jdkx.tools.JavaFileObject /** * Finds errors and warnings from a compilation task. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java index e764510f3..037562678 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java @@ -36,8 +36,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; public class ReferenceProvider { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java index ddafe346e..75ef902d5 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java @@ -55,19 +55,19 @@ import java.util.Optional; import java.util.StringJoiner; import java.util.function.Predicate; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ErrorType; -import javax.lang.model.type.PrimitiveType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.TypeVariable; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.ArrayType; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ErrorType; +import jdkx.lang.model.type.PrimitiveType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.type.TypeVariable; +import jdkx.tools.JavaFileObject; public class SignatureProvider { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt index 6ebe88809..e023fa929 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt @@ -46,27 +46,27 @@ import com.itsaky.androidide.utils.ILogger import openjdk.source.tree.Tree import openjdk.source.util.TreePath import java.nio.file.Path -import javax.lang.model.element.Element -import javax.lang.model.element.ElementKind.ANNOTATION_TYPE -import javax.lang.model.element.ElementKind.CLASS -import javax.lang.model.element.ElementKind.CONSTRUCTOR -import javax.lang.model.element.ElementKind.ENUM -import javax.lang.model.element.ElementKind.ENUM_CONSTANT -import javax.lang.model.element.ElementKind.EXCEPTION_PARAMETER -import javax.lang.model.element.ElementKind.FIELD -import javax.lang.model.element.ElementKind.INSTANCE_INIT -import javax.lang.model.element.ElementKind.INTERFACE -import javax.lang.model.element.ElementKind.LOCAL_VARIABLE -import javax.lang.model.element.ElementKind.METHOD -import javax.lang.model.element.ElementKind.OTHER -import javax.lang.model.element.ElementKind.PACKAGE -import javax.lang.model.element.ElementKind.PARAMETER -import javax.lang.model.element.ElementKind.RESOURCE_VARIABLE -import javax.lang.model.element.ElementKind.STATIC_INIT -import javax.lang.model.element.ElementKind.TYPE_PARAMETER -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.TypeElement -import javax.lang.model.element.VariableElement +import jdkx.lang.model.element.Element +import jdkx.lang.model.element.ElementKind.ANNOTATION_TYPE +import jdkx.lang.model.element.ElementKind.CLASS +import jdkx.lang.model.element.ElementKind.CONSTRUCTOR +import jdkx.lang.model.element.ElementKind.ENUM +import jdkx.lang.model.element.ElementKind.ENUM_CONSTANT +import jdkx.lang.model.element.ElementKind.EXCEPTION_PARAMETER +import jdkx.lang.model.element.ElementKind.FIELD +import jdkx.lang.model.element.ElementKind.INSTANCE_INIT +import jdkx.lang.model.element.ElementKind.INTERFACE +import jdkx.lang.model.element.ElementKind.LOCAL_VARIABLE +import jdkx.lang.model.element.ElementKind.METHOD +import jdkx.lang.model.element.ElementKind.OTHER +import jdkx.lang.model.element.ElementKind.PACKAGE +import jdkx.lang.model.element.ElementKind.PARAMETER +import jdkx.lang.model.element.ElementKind.RESOURCE_VARIABLE +import jdkx.lang.model.element.ElementKind.STATIC_INIT +import jdkx.lang.model.element.ElementKind.TYPE_PARAMETER +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.element.VariableElement /** * Completion provider for Java source code. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt index 6eef024b1..f49658d60 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt @@ -36,20 +36,20 @@ import openjdk.tools.javac.code.Symbol.MethodSymbol import openjdk.tools.javac.model.JavacTypes import openjdk.tools.javac.tree.JCTree.JCImport import java.nio.file.Path -import javax.lang.model.element.Element -import javax.lang.model.element.ElementKind -import javax.lang.model.element.ElementKind.ANNOTATION_TYPE -import javax.lang.model.element.ElementKind.CLASS -import javax.lang.model.element.ElementKind.CONSTRUCTOR -import javax.lang.model.element.ElementKind.ENUM -import javax.lang.model.element.ElementKind.ENUM_CONSTANT -import javax.lang.model.element.ElementKind.FIELD -import javax.lang.model.element.ElementKind.INSTANCE_INIT -import javax.lang.model.element.ElementKind.INTERFACE -import javax.lang.model.element.ElementKind.METHOD -import javax.lang.model.element.ElementKind.STATIC_INIT -import javax.lang.model.element.Modifier.STATIC -import javax.lang.model.element.TypeElement +import jdkx.lang.model.element.Element +import jdkx.lang.model.element.ElementKind +import jdkx.lang.model.element.ElementKind.ANNOTATION_TYPE +import jdkx.lang.model.element.ElementKind.CLASS +import jdkx.lang.model.element.ElementKind.CONSTRUCTOR +import jdkx.lang.model.element.ElementKind.ENUM +import jdkx.lang.model.element.ElementKind.ENUM_CONSTANT +import jdkx.lang.model.element.ElementKind.FIELD +import jdkx.lang.model.element.ElementKind.INSTANCE_INIT +import jdkx.lang.model.element.ElementKind.INTERFACE +import jdkx.lang.model.element.ElementKind.METHOD +import jdkx.lang.model.element.ElementKind.STATIC_INIT +import jdkx.lang.model.element.Modifier.STATIC +import jdkx.lang.model.element.TypeElement /** * Provides completions for imports. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt index 766a7c427..1cad804f9 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt @@ -30,13 +30,13 @@ import openjdk.source.tree.Scope import openjdk.source.util.TreePath import openjdk.source.util.Trees import java.nio.file.Path -import javax.lang.model.element.ElementKind.METHOD -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier.STATIC -import javax.lang.model.element.TypeElement -import javax.lang.model.type.ArrayType -import javax.lang.model.type.DeclaredType -import javax.lang.model.type.TypeVariable +import jdkx.lang.model.element.ElementKind.METHOD +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier.STATIC +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.type.ArrayType +import jdkx.lang.model.type.DeclaredType +import jdkx.lang.model.type.TypeVariable /** * Completions for member reference. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt index bf1e80e90..f49b66322 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt @@ -32,14 +32,14 @@ import openjdk.source.util.TreePath import openjdk.source.util.Trees import openjdk.tools.javac.code.Symbol import java.nio.file.Path -import javax.lang.model.element.ElementKind.CONSTRUCTOR -import javax.lang.model.element.ElementKind.METHOD -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier.STATIC -import javax.lang.model.element.TypeElement -import javax.lang.model.type.ArrayType -import javax.lang.model.type.DeclaredType -import javax.lang.model.type.TypeVariable +import jdkx.lang.model.element.ElementKind.CONSTRUCTOR +import jdkx.lang.model.element.ElementKind.METHOD +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier.STATIC +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.type.ArrayType +import jdkx.lang.model.type.DeclaredType +import jdkx.lang.model.type.TypeVariable /** * Completions for member select. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt index a85a9cf07..4b9bd6437 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt @@ -46,14 +46,14 @@ import openjdk.source.util.Trees import java.nio.file.Path import java.util.* import java.util.function.* -import javax.lang.model.element.ElementKind.METHOD -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier.FINAL -import javax.lang.model.element.Modifier.PRIVATE -import javax.lang.model.element.Modifier.STATIC -import javax.lang.model.element.TypeElement -import javax.lang.model.type.DeclaredType -import javax.tools.JavaFileObject +import jdkx.lang.model.element.ElementKind.METHOD +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier.FINAL +import jdkx.lang.model.element.Modifier.PRIVATE +import jdkx.lang.model.element.Modifier.STATIC +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.type.DeclaredType +import jdkx.tools.JavaFileObject /** * Provides completions using [openjdk.source.tree.Scope]. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt index d26a3d6ea..8e7efebaa 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt @@ -31,12 +31,12 @@ import openjdk.source.tree.MemberSelectTree import openjdk.source.util.TreePath import openjdk.source.util.Trees import java.nio.file.Path -import javax.lang.model.element.Element -import javax.lang.model.element.ElementKind.METHOD -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier.STATIC -import javax.lang.model.element.Name -import javax.lang.model.element.TypeElement +import jdkx.lang.model.element.Element +import jdkx.lang.model.element.ElementKind.METHOD +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier.STATIC +import jdkx.lang.model.element.Name +import jdkx.lang.model.element.TypeElement /** * Completes static imports. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt index 21714b001..ed4ccf2d8 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt @@ -27,10 +27,10 @@ import openjdk.source.tree.SwitchTree import openjdk.source.util.TreePath import openjdk.source.util.Trees import java.nio.file.Path -import javax.lang.model.element.ElementKind.ENUM -import javax.lang.model.element.ElementKind.ENUM_CONSTANT -import javax.lang.model.element.TypeElement -import javax.lang.model.type.DeclaredType +import jdkx.lang.model.element.ElementKind.ENUM +import jdkx.lang.model.element.ElementKind.ENUM_CONSTANT +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.type.DeclaredType /** * Provides completions for switch constants. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt index 317930adb..1533cd52a 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt @@ -28,9 +28,9 @@ import com.itsaky.androidide.utils.DocumentUtils.isSameFile import openjdk.source.util.Trees import java.nio.file.Path import java.nio.file.Paths -import javax.lang.model.element.Element -import javax.lang.model.element.TypeElement -import javax.tools.JavaFileObject +import jdkx.lang.model.element.Element +import jdkx.lang.model.element.TypeElement +import jdkx.tools.JavaFileObject /** * Finds definition for erroneous elements. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt index 15e9bebfe..3617f6c9f 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt @@ -25,7 +25,7 @@ import com.itsaky.androidide.models.Location import com.itsaky.androidide.models.Position import com.itsaky.androidide.utils.ILogger import java.nio.file.Path -import javax.lang.model.element.Element +import jdkx.lang.model.element.Element /** * Provides definition for a specific symbol in Java source code. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt index 5f9d83d6d..361660471 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt @@ -24,7 +24,7 @@ import com.itsaky.androidide.models.Location import com.itsaky.androidide.models.Position import openjdk.source.util.Trees import java.nio.file.Path -import javax.lang.model.element.Element +import jdkx.lang.model.element.Element /** * Provides definition for local elements. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt index 6d446c85f..bf2e17429 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt @@ -24,8 +24,8 @@ import com.itsaky.androidide.lsp.java.utils.NavigationHelper import com.itsaky.androidide.models.Location import com.itsaky.androidide.models.Position import java.nio.file.Path -import javax.lang.model.element.Element -import javax.tools.JavaFileObject +import jdkx.lang.model.element.Element +import jdkx.tools.JavaFileObject /** * Finds definition of an element in other source locations. diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java index e3185f221..a91e6b288 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java @@ -34,7 +34,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.Map; -import javax.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.ExecutableElement; public class AddException extends Rewrite { final String className, methodName; diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java index ad21991e6..4a10be898 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java @@ -35,7 +35,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.Map; -import javax.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.ExecutableElement; public class AddSuppressWarningAnnotation extends Rewrite { final String className, methodName; diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java index 9808fc194..e4d8bfd49 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java @@ -37,7 +37,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.Map; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; public class ConvertFieldToBlock extends Rewrite { final Path file; diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java index 2eb73ce88..7336c818f 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java @@ -46,10 +46,10 @@ import java.util.Collections; import java.util.Map; import java.util.StringJoiner; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeMirror; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.Name; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.TypeMirror; public class CreateMissingMethod extends Rewrite { private static final ILogger LOG = ILogger.newInstance("main"); diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java index 3cf1291a2..eb5a05dd1 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java @@ -43,8 +43,8 @@ import java.util.Map; import java.util.Set; import java.util.StringJoiner; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeElement; public class GenerateRecordConstructor extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java index e94138f92..b7b40cca3 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java @@ -50,12 +50,12 @@ import java.util.StringJoiner; import java.util.TreeSet; import java.util.stream.Collectors; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.Elements; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.Elements; public class ImplementAbstractMethods extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java index 4aa19b7e9..1803a4bcd 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java @@ -40,9 +40,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.DeclaredType; public class RemoveException extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java index bf54a1b53..20d29d632 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java @@ -27,7 +27,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.Map; -import javax.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.ExecutableElement; public class RemoveMethod extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java index d3619ed95..5f9969483 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java @@ -47,10 +47,10 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; /** * @author Akash Yadav diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java index 0f394911e..c8ed5fda6 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java @@ -41,14 +41,14 @@ import java.util.Objects; import java.util.Set; import java.util.StringJoiner; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ExecutableType; -import javax.lang.model.type.TypeMirror; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.Name; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.ArrayType; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ExecutableType; +import jdkx.lang.model.type.TypeMirror; public class EditHelper { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java index 5a0cce8c8..cced72aee 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java @@ -44,12 +44,12 @@ import java.nio.file.Paths; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Types; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Types; public class FindHelper { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt index 051b6ebf7..5d8c130df 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt @@ -101,14 +101,14 @@ import openjdk.source.tree.VariableTree import java.util.* import java.util.function.* import java.util.stream.* -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier -import javax.lang.model.element.TypeParameterElement -import javax.lang.model.element.VariableElement -import javax.lang.model.type.ExecutableType -import javax.lang.model.type.TypeKind -import javax.lang.model.type.TypeMirror -import javax.lang.model.type.TypeVariable +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier +import jdkx.lang.model.element.TypeParameterElement +import jdkx.lang.model.element.VariableElement +import jdkx.lang.model.type.ExecutableType +import jdkx.lang.model.type.TypeKind +import jdkx.lang.model.type.TypeMirror +import jdkx.lang.model.type.TypeVariable import kotlin.jvm.optionals.getOrNull import org.jetbrains.annotations.Contract diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt index 23f2b7cfc..087ad6fc2 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt @@ -20,13 +20,13 @@ package com.itsaky.androidide.lsp.java.utils import com.squareup.javapoet.AnnotationSpec import com.squareup.javapoet.ImportCollectingCodeWriter import com.squareup.javapoet.MethodSpec -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier -import javax.lang.model.type.DeclaredType -import javax.lang.model.type.NoType -import javax.lang.model.type.NullType -import javax.lang.model.type.TypeKind -import javax.lang.model.util.Types +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier +import jdkx.lang.model.type.DeclaredType +import jdkx.lang.model.type.NoType +import jdkx.lang.model.type.NullType +import jdkx.lang.model.type.TypeKind +import jdkx.lang.model.util.Types /** @author Akash Yadav */ class JavaPoetUtils { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java index 097f1ef6a..bf7e5580d 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java @@ -27,12 +27,12 @@ import java.io.IOException; import java.util.Arrays; import java.util.Objects; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Types; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Types; /** * @author Akash Yadav diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java index 7eaa55745..564798147 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java @@ -42,8 +42,8 @@ import openjdk.source.util.Trees; import java.nio.file.Path; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.Modifier; public class NavigationHelper { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java index 30c489dc0..97613e6aa 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java @@ -25,11 +25,11 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.util.Elements; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.util.Elements; public class ScopeHelper { public static List scopeMembers( diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java index e88076714..5d9ee3a31 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java @@ -2,19 +2,19 @@ package com.itsaky.androidide.lsp.java.utils; import java.util.stream.Collectors; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ErrorType; -import javax.lang.model.type.ExecutableType; -import javax.lang.model.type.IntersectionType; -import javax.lang.model.type.NoType; -import javax.lang.model.type.NullType; -import javax.lang.model.type.PrimitiveType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.TypeVariable; -import javax.lang.model.type.UnionType; -import javax.lang.model.type.WildcardType; -import javax.lang.model.util.AbstractTypeVisitor8; +import jdkx.lang.model.type.ArrayType; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ErrorType; +import jdkx.lang.model.type.ExecutableType; +import jdkx.lang.model.type.IntersectionType; +import jdkx.lang.model.type.NoType; +import jdkx.lang.model.type.NullType; +import jdkx.lang.model.type.PrimitiveType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.type.TypeVariable; +import jdkx.lang.model.type.UnionType; +import jdkx.lang.model.type.WildcardType; +import jdkx.lang.model.util.AbstractTypeVisitor8; public class ShortTypePrinter extends AbstractTypeVisitor8 { public static final ShortTypePrinter NO_PACKAGE = new ShortTypePrinter("*"); diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java index 6c373b2e4..b08a17aec 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java @@ -49,12 +49,12 @@ import java.nio.file.Path; import java.util.Objects; import java.util.function.Predicate; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.NoType; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.TypeVariable; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.NoType; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.type.TypeVariable; public class TypeUtils { @@ -151,21 +151,21 @@ public class TypeUtils { public static Type toType(TypeMirror typeMirror) { if (typeMirror.getKind() == TypeKind.ARRAY) { - return toArrayType((javax.lang.model.type.ArrayType) typeMirror); + return toArrayType((jdkx.lang.model.type.ArrayType) typeMirror); } if (typeMirror.getKind().isPrimitive()) { - return toPrimitiveType((javax.lang.model.type.PrimitiveType) typeMirror); + return toPrimitiveType((jdkx.lang.model.type.PrimitiveType) typeMirror); } - if (typeMirror instanceof javax.lang.model.type.IntersectionType) { - return toIntersectionType((javax.lang.model.type.IntersectionType) typeMirror); + if (typeMirror instanceof jdkx.lang.model.type.IntersectionType) { + return toIntersectionType((jdkx.lang.model.type.IntersectionType) typeMirror); } - if (typeMirror instanceof javax.lang.model.type.WildcardType) { - return toWildcardType((javax.lang.model.type.WildcardType) typeMirror); + if (typeMirror instanceof jdkx.lang.model.type.WildcardType) { + return toWildcardType((jdkx.lang.model.type.WildcardType) typeMirror); } - if (typeMirror instanceof javax.lang.model.type.DeclaredType) { + if (typeMirror instanceof jdkx.lang.model.type.DeclaredType) { return toClassOrInterfaceType((DeclaredType) typeMirror); } - if (typeMirror instanceof javax.lang.model.type.TypeVariable) { + if (typeMirror instanceof jdkx.lang.model.type.TypeVariable) { return toType(((TypeVariable) typeMirror)); } if (typeMirror instanceof NoType) { @@ -176,7 +176,7 @@ public class TypeUtils { // type mirrors - public static IntersectionType toIntersectionType(javax.lang.model.type.IntersectionType type) { + public static IntersectionType toIntersectionType(jdkx.lang.model.type.IntersectionType type) { NodeList collect = type.getBounds().stream() .map(TypeUtils::toType) @@ -207,7 +207,7 @@ public class TypeUtils { return typeParameter; } - public static WildcardType toWildcardType(javax.lang.model.type.WildcardType type) { + public static WildcardType toWildcardType(jdkx.lang.model.type.WildcardType type) { WildcardType wildcardType = new WildcardType(); if (type.getSuperBound() != null) { Type result = toType(type.getSuperBound()); @@ -224,12 +224,12 @@ public class TypeUtils { return wildcardType; } - public static PrimitiveType toPrimitiveType(javax.lang.model.type.PrimitiveType type) { + public static PrimitiveType toPrimitiveType(jdkx.lang.model.type.PrimitiveType type) { PrimitiveType.Primitive primitive = PrimitiveType.Primitive.valueOf(type.getKind().name()); return new PrimitiveType(primitive); } - public static ArrayType toArrayType(javax.lang.model.type.ArrayType type) { + public static ArrayType toArrayType(jdkx.lang.model.type.ArrayType type) { Type componentType = toType(type.getComponentType()); return new ArrayType(componentType); } diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt index c8440766a..7165df7c9 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt @@ -39,13 +39,13 @@ import openjdk.source.util.TreeScanner import openjdk.source.util.Trees import openjdk.tools.javac.api.JavacTaskImpl import java.util.* -import javax.lang.model.element.Element -import javax.lang.model.element.ExecutableElement -import javax.lang.model.element.Modifier -import javax.lang.model.element.TypeElement -import javax.lang.model.type.DeclaredType -import javax.lang.model.type.TypeKind -import javax.lang.model.type.TypeMirror +import jdkx.lang.model.element.Element +import jdkx.lang.model.element.ExecutableElement +import jdkx.lang.model.element.Modifier +import jdkx.lang.model.element.TypeElement +import jdkx.lang.model.type.DeclaredType +import jdkx.lang.model.type.TypeKind +import jdkx.lang.model.type.TypeMirror class DiagnosticVisitor(task: JavacTaskImpl?) : TreeScanner>() { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java index 807c2cc1b..8129ce3f3 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java @@ -30,11 +30,11 @@ import openjdk.source.util.TreePath; import openjdk.source.util.TreePathScanner; import openjdk.source.util.Trees; -import javax.lang.model.element.Element; -import javax.lang.model.element.NestingKind; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.NestingKind; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; public class FindMethodCallAt extends TreePathScanner { private static final ILogger LOG = ILogger.newInstance("main"); diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java index c810eeb38..917d3ad58 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java @@ -34,7 +34,7 @@ import openjdk.source.util.TreePath; import openjdk.source.util.TreePathScanner; import openjdk.source.util.Trees; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; public class FindNameAt extends TreePathScanner { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java index 05f66c655..b2a1d5dd3 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java @@ -28,7 +28,7 @@ import openjdk.source.util.Trees; import java.util.List; -import javax.lang.model.element.Element; +import jdkx.lang.model.element.Element; public class FindReferences extends TreePathScanner> { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/SemanticHighlighter.java b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/SemanticHighlighter.java index 04dee2fb0..7346f59a4 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/SemanticHighlighter.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/SemanticHighlighter.java @@ -47,10 +47,10 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.Name; public class SemanticHighlighter extends TreePathScanner> { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt b/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt index de727f769..2fb3a0266 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt @@ -6,8 +6,8 @@ import com.itsaky.androidide.preferences.internal.tabSize import com.squareup.javapoet.JavaFile import com.squareup.javapoet.MethodSpec import com.squareup.javapoet.TypeSpec -import javax.lang.model.element.Modifier.PROTECTED -import javax.lang.model.element.Modifier.PUBLIC +import jdkx.lang.model.element.Modifier.PROTECTED +import jdkx.lang.model.element.Modifier.PUBLIC object ClassBuilder { @JvmStatic diff --git a/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java index 1a10e5ebc..3bc73f602 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java @@ -32,14 +32,14 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleAnnotationValueVisitor8; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.AnnotationMirror; +import jdkx.lang.model.element.AnnotationValue; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.SimpleAnnotationValueVisitor8; /** A generated annotation on a declaration. */ public final class AnnotationSpec { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java b/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java index faa4856cd..852c4f7ae 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java @@ -25,8 +25,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.type.ArrayType; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.type.ArrayType; public final class ArrayTypeName extends TypeName { public final TypeName componentType; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java b/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java index 4ce5cda64..ba0f37b6c 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.lang.model.element.Element; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.SimpleElementVisitor8; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.PackageElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.SimpleElementVisitor8; /** A fully-qualified class name for top-level and member classes. */ public final class ClassName extends TypeName implements Comparable { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java b/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java index cef5d314b..720934178 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; import java.util.stream.Collector; import java.util.stream.StreamSupport; -import javax.lang.model.element.Element; -import javax.lang.model.type.TypeMirror; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.type.TypeMirror; /** * A fragment of a .java file, potentially containing declarations, statements, and documentation. @@ -50,8 +50,8 @@ import javax.lang.model.type.TypeMirror; *
  • {@code $S} escapes the value as a string, wraps it with double quotes, and emits * that. For example, {@code 6" sandwich} is emitted {@code "6\" sandwich"}. *
  • {@code $T} emits a type reference. Types will be imported if possible. Arguments - * for types may be {@linkplain Class classes}, {@linkplain javax.lang.model.type.TypeMirror - * ,* type mirrors}, and {@linkplain javax.lang.model.element.Element elements}. + * for types may be {@linkplain Class classes}, {@linkplain jdkx.lang.model.type.TypeMirror + * ,* type mirrors}, and {@linkplain jdkx.lang.model.element.Element elements}. *
  • {@code $$} emits a dollar sign. *
  • {@code $W} emits a space or a newline, depending on its position on the line. This prefers * to wrap lines before 100 columns. diff --git a/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java b/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java index d1f15246b..94ed193c0 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java @@ -35,8 +35,8 @@ import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Modifier; /** * Converts a {@link JavaFile} to a string suitable to both human- and javac-consumption. This diff --git a/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java index 57bf50eb4..64eab2b73 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Modifier; /** A generated field declaration. */ public final class FieldSpec { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java b/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java index 1e47223e5..889a10669 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java @@ -36,9 +36,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; /** A Java file containing a single top level class. */ public final class JavaFile { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java index 527b5728b..84226c31d 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java @@ -29,16 +29,16 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ExecutableType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.TypeVariable; -import javax.lang.model.util.Types; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ExecutableType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.type.TypeVariable; +import jdkx.lang.model.util.Types; /** A generated constructor or method declaration. */ public final class MethodSpec { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java b/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java index 0e75085b6..4408aa412 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.SourceVersion; /** * Assigns Java identifier names to avoid collisions, keywords, and invalid characters. To use, diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java index 5a7b5dd87..b9aeb5e99 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java @@ -25,11 +25,11 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.VariableElement; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.VariableElement; /** A generated parameter declaration. */ public final class ParameterSpec { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java b/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java index 37aaef945..da6a86a2a 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java @@ -27,17 +27,17 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ErrorType; -import javax.lang.model.type.NoType; -import javax.lang.model.type.PrimitiveType; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleTypeVisitor8; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.type.ArrayType; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ErrorType; +import jdkx.lang.model.type.NoType; +import jdkx.lang.model.type.PrimitiveType; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.SimpleTypeVisitor8; /** * Any type in Java's type system, plus {@code void}. This class is an identifier for primitive @@ -184,12 +184,12 @@ public class TypeName { } @Override - public TypeName visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) { + public TypeName visitTypeVariable(jdkx.lang.model.type.TypeVariable t, Void p) { return TypeVariableName.get(t, typeVariables); } @Override - public TypeName visitWildcard(javax.lang.model.type.WildcardType t, Void p) { + public TypeName visitWildcard(jdkx.lang.model.type.WildcardType t, Void p) { return WildcardTypeName.get(t, typeVariables); } diff --git a/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java index 4b854cae0..a0c0f2925 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java @@ -36,14 +36,14 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.NoType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.NoType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.ElementFilter; /** A generated class, interface, or enum declaration. */ public final class TypeSpec { diff --git a/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java b/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java index 51c6f5649..13684db22 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java @@ -27,9 +27,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.TypeVariable; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.type.TypeVariable; public final class TypeVariableName extends TypeName { public final String name; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/Util.java b/lsp/java/src/main/java/com/squareup/javapoet/Util.java index 428add613..2ea738b2a 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/Util.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/Util.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; /** * Like Guava, but worse and standalone. This makes it easier to mix JavaPoet with libraries that diff --git a/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java b/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java index 0c7b21c96..4fe2e69a5 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java @@ -26,8 +26,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.type.TypeMirror; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.type.TypeMirror; public final class WildcardTypeName extends TypeName { public final List upperBounds; @@ -67,12 +67,12 @@ public final class WildcardTypeName extends TypeName { Collections.singletonList(OBJECT), Collections.singletonList(lowerBound)); } - public static TypeName get(javax.lang.model.type.WildcardType mirror) { + public static TypeName get(jdkx.lang.model.type.WildcardType mirror) { return get(mirror, new LinkedHashMap<>()); } static TypeName get( - javax.lang.model.type.WildcardType mirror, + jdkx.lang.model.type.WildcardType mirror, Map typeVariables) { TypeMirror extendsBound = mirror.getExtendsBound(); if (extendsBound == null) { diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt index 5452ea5f3..8d682a06f 100644 --- a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt +++ b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt @@ -40,7 +40,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -import javax.lang.model.type.ArrayType +import jdkx.lang.model.type.ArrayType /** @author Akash Yadav */ @RunWith(RobolectricTestRunner::class) diff --git a/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java b/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java index 1d153b8b3..81a1eee71 100644 --- a/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java +++ b/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java @@ -64,7 +64,7 @@ import java.util.Objects; * is typically used in situations where an existing API only accepts an {@link InputStream}, but * where the most natural way to produce the data is as a character stream, i.e. by providing a * {@link Reader} instance. An example of a situation where this problem may appear is when - * implementing the {@code javax.activation.DataSource} interface from the Java Activation + * implementing the {@code jdkx.activation.DataSource} interface from the Java Activation * Framework. * *

    Given the fact that the {@link Reader} class doesn't provide any way to predict whether the diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java index 63892fbbe..1d1aa3ab9 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java @@ -3,7 +3,7 @@ package com.google.googlejavaformat.java; import com.google.googlejavaformat.Input; import openjdk.source.tree.AnnotationTree; -import javax.annotation.processing.Generated; +import jdkx.annotation.processing.Generated; @Generated("com.google.auto.value.processor.AutoOneOfProcessor") final class AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier { diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java index 5d1a6901f..3d25c7867 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java @@ -3,7 +3,7 @@ package com.google.googlejavaformat.java; import com.google.common.collect.ImmutableList; import openjdk.source.tree.AnnotationTree; -import javax.annotation.processing.Generated; +import jdkx.annotation.processing.Generated; @Generated("com.google.auto.value.processor.AutoValueProcessor") final class AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java index 1ee94692a..5ba613089 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java @@ -49,12 +49,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardLocation; /** * This is google-java-format, a new Java formatter that follows the Google Java Style Guide quite diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java index 595ec9d76..2ebc4c0fe 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java @@ -22,8 +22,8 @@ import com.google.googlejavaformat.FormatterDiagnostic; import java.util.List; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; /** Checked exception class for formatter errors. */ public final class FormatterException extends Exception { diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java index 1876a4826..bcf8f837f 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java @@ -48,12 +48,12 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; /** {@code JavaInput} extends {@link Input} to represent a Java input document. */ public final class JavaInput extends Input { diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java index 8ee1c73cd..cc90a6cf0 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java @@ -161,7 +161,7 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * An AST visitor that builds a stream of {@link Op}s to format from the given {@link diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java index 98c243e36..386b88c47 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; /** Fixes sequences of modifiers to be in JLS order. */ final class ModifierOrderer { @@ -112,7 +112,7 @@ final class ModifierOrderer { } /** - * Returns the given token as a {@link javax.lang.model.element.Modifier}, or {@code null} if it + * Returns the given token as a {@link jdkx.lang.model.element.Modifier}, or {@code null} if it * is not a modifier. */ private static Modifier asModifier(Token token) { diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java index e2aca9617..f01903de4 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java @@ -64,12 +64,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardLocation; /** * Removes unused imports from a source file. Imports that are only used in javadoc are also diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java index 57ca83dec..61a960ea9 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java @@ -54,12 +54,12 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Stream; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardLocation; /** Wraps string literals that exceed the column limit. */ public final class StringWrapper { diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java index a4e85f130..8feecaa11 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java @@ -30,7 +30,7 @@ import openjdk.tools.javac.tree.TreeInfo; import java.io.IOError; import java.io.IOException; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** Utilities for working with {@link Tree}s. */ class Trees { diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java index eaaf349c7..6add6a547 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java @@ -22,12 +22,12 @@ import org.checkerframework.checker.nullness.qual.Nullable; import java.io.IOException; -import javax.annotation.processing.Filer; -import javax.annotation.processing.Messager; -import javax.lang.model.element.Element; -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; +import jdkx.annotation.processing.Filer; +import jdkx.annotation.processing.Messager; +import jdkx.lang.model.element.Element; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; /** * A decorating {@link Filer} implementation which formats Java source files with a {@link diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java index ebd8410cb..4050c746b 100644 --- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java +++ b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java @@ -26,10 +26,10 @@ import org.checkerframework.checker.nullness.qual.Nullable; import java.io.IOException; import java.io.Writer; -import javax.annotation.processing.Messager; -import javax.tools.Diagnostic; -import javax.tools.ForwardingJavaFileObject; -import javax.tools.JavaFileObject; +import jdkx.annotation.processing.Messager; +import jdkx.tools.Diagnostic; +import jdkx.tools.ForwardingJavaFileObject; +import jdkx.tools.JavaFileObject; /** A {@link JavaFileObject} decorator which {@linkplain Formatter formats} source code. */ final class FormattingJavaFileObject extends ForwardingJavaFileObject { diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java index be27b2194..dfad771f7 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java @@ -56,7 +56,7 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * @author lahvac diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java index d5d7fc7d2..901ebd68e 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java @@ -59,8 +59,8 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.tools.ForwardingJavaFileObject; -import javax.tools.JavaFileObject; +import jdkx.tools.ForwardingJavaFileObject; +import jdkx.tools.JavaFileObject; /** * @author lahvac diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java index 3e4bdd91a..20510052d 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java @@ -49,7 +49,7 @@ import openjdk.tools.javac.util.Context; import java.util.HashMap; import java.util.Map; -import javax.lang.model.element.Element; +import jdkx.lang.model.element.Element; /** * @author lahvac diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java index dbeaa18d6..686c75ee5 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java @@ -49,8 +49,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; /** * @author Tomas Zezula diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java index 65330ccc2..18b170f0b 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import openjdk.tools.javac.util.Context; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * @author Akash Yadav diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt index d57a4d1ff..1fd79f5fa 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt @@ -20,9 +20,9 @@ package com.itsaky.androidide.javac.services.compiler import com.itsaky.androidide.javac.services.CancelService import openjdk.tools.javac.api.JavacTaskImpl import openjdk.tools.javac.api.JavacTool -import javax.tools.DiagnosticListener -import javax.tools.JavaFileManager -import javax.tools.JavaFileObject +import jdkx.tools.DiagnosticListener +import jdkx.tools.JavaFileManager +import jdkx.tools.JavaFileObject /** * A pool of reusable JavacTasks. When a task is no valid anymore, it is returned to the pool, and @@ -56,7 +56,7 @@ class ReusableCompiler { internal var checkedOut = false /** - * Creates a new task as if by [javax.tools.JavaCompiler.getTask] and runs the provided worker + * Creates a new task as if by [jdkx.tools.JavaCompiler.getTask] and runs the provided worker * with it. The task is only valid while the worker is running. The internal structures may be * reused from some previous compilation. * diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt index b1df2af84..6be568e41 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt @@ -55,9 +55,9 @@ import openjdk.tools.javac.util.DefinedBy.Api.COMPILER_TREE import openjdk.tools.javac.util.Log import java.io.PrintWriter import java.net.URI -import javax.tools.DiagnosticListener -import javax.tools.JavaFileManager -import javax.tools.JavaFileObject +import jdkx.tools.DiagnosticListener +import jdkx.tools.JavaFileManager +import jdkx.tools.JavaFileObject /** * Reusable [Context] for [ReusableCompiler]. diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt index 2b070c6ac..7b102f632 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt @@ -22,9 +22,9 @@ import openjdk.tools.javac.util.DefinedBy import openjdk.tools.javac.util.DefinedBy.Api.COMPILER import openjdk.tools.javac.util.Log import java.io.PrintWriter -import javax.tools.Diagnostic -import javax.tools.DiagnosticListener -import javax.tools.JavaFileObject +import jdkx.tools.Diagnostic +import jdkx.tools.DiagnosticListener +import jdkx.tools.JavaFileObject /** * Reusable Log; exposes a method to clean up the component from leftovers associated with diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt index 68d4ca8e6..be24bda86 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt @@ -22,7 +22,7 @@ import com.itsaky.androidide.zipfs2.ZipFileSystemProvider import openjdk.tools.javac.file.RelativePath.RelativeDirectory import java.io.IOException import java.nio.file.Path -import javax.lang.model.SourceVersion +import jdkx.lang.model.SourceVersion /** * A cached file system for JAR files. diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt index b9f7ea23b..cf109a6f1 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt @@ -20,8 +20,8 @@ package com.itsaky.androidide.javac.services.partial import openjdk.source.tree.CompilationUnitTree import openjdk.tools.javac.api.JavacTaskImpl import openjdk.tools.javac.api.JavacTrees -import javax.tools.DiagnosticListener -import javax.tools.JavaFileObject +import jdkx.tools.DiagnosticListener +import jdkx.tools.JavaFileObject /** * Information about a compilation. diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java index 1e11abe31..f781c0c05 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java @@ -34,9 +34,9 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; /** * @author Akash Yadav diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java index bfc99b5f1..061c24676 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java @@ -22,7 +22,7 @@ import openjdk.tools.javac.util.JCDiagnostic; import java.util.Locale; -import javax.tools.Diagnostic; +import jdkx.tools.Diagnostic; /** * @author Akash Yadav diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt index 43fa54911..cfe66a06f 100644 --- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt +++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt @@ -19,8 +19,8 @@ package com.itsaky.androidide.javac.services.util import openjdk.tools.javac.api.ClientCodeWrapper import openjdk.tools.javac.util.JCDiagnostic -import javax.tools.Diagnostic -import javax.tools.JavaFileObject +import jdkx.tools.Diagnostic +import jdkx.tools.JavaFileObject /** @author Akash Yadav */ class JavaDiagnosticUtils { diff --git a/subprojects/javac/libs/nb-javac-17.0.0.4-android.jar b/subprojects/javac/libs/nb-javac-17.0.0.4-android.jar index 491928928..687fbbb96 100644 Binary files a/subprojects/javac/libs/nb-javac-17.0.0.4-android.jar and b/subprojects/javac/libs/nb-javac-17.0.0.4-android.jar differ