Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 15:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(javac): update nb-javac-android

Browse Source 
This replaces the usage of 'com.sun' package from javac to 'openjdk'.
This commit is contained in:
Akash Yadav
2023-01-28 19:42:31 +05:30
parent f8e370a9e4
commit 755043b050
126 changed files with 870 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.google.googlejavaformat.java;
import com.google.googlejavaformat.Input;
import com.sun.source.tree.AnnotationTree;
import openjdk.source.tree.AnnotationTree;
import javax.annotation.processing.Generated;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.google.googlejavaformat.java;
import com.google.common.collect.ImmutableList;
import com.sun.source.tree.AnnotationTree;
import openjdk.source.tree.AnnotationTree;
import javax.annotation.processing.Generated;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java
+5 -5
View File
@@ -15,11 +15,11 @@
package com.google.googlejavaformat.java;
import com.google.common.collect.ImmutableList;
import com.sun.source.tree.AnnotatedTypeTree;
import com.sun.source.tree.AnnotationTree;
import com.sun.source.tree.ArrayTypeTree;
import com.sun.source.tree.Tree;
import com.sun.tools.javac.tree.JCTree;
import openjdk.source.tree.AnnotatedTypeTree;
import openjdk.source.tree.AnnotationTree;
import openjdk.source.tree.ArrayTypeTree;
import openjdk.source.tree.Tree;
import openjdk.tools.javac.tree.JCTree;
import java.util.ArrayDeque;
import java.util.ArrayList;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java
+7 -7
View File
@@ -33,13 +33,13 @@ import com.google.googlejavaformat.FormattingError;
import com.google.googlejavaformat.Newlines;
import com.google.googlejavaformat.Op;
import com.google.googlejavaformat.OpsBuilder;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.parser.JavacParser;
import com.sun.tools.javac.parser.ParserFactory;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
import openjdk.tools.javac.file.JavacFileManager;
import openjdk.tools.javac.parser.JavacParser;
import openjdk.tools.javac.parser.ParserFactory;
import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
import openjdk.tools.javac.util.Context;
import openjdk.tools.javac.util.Log;
import openjdk.tools.javac.util.Options;
import java.io.IOError;
import java.io.IOException;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableSortedSet;
import com.google.googlejavaformat.Newlines;
import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
import com.google.googlejavaformat.java.JavaInput.Tok;
import com.sun.tools.javac.parser.Tokens.TokenKind;
import openjdk.tools.javac.parser.Tokens.TokenKind;
import java.util.ArrayList;
import java.util.Comparator;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java
+7 -7
View File
@@ -33,13 +33,13 @@ import com.google.common.collect.TreeRangeSet;
import com.google.googlejavaformat.Input;
import com.google.googlejavaformat.Newlines;
import com.google.googlejavaformat.java.JavacTokens.RawTok;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.parser.Tokens.TokenKind;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Log.DeferredDiagnosticHandler;
import com.sun.tools.javac.util.Options;
import openjdk.tools.javac.file.JavacFileManager;
import openjdk.tools.javac.parser.Tokens.TokenKind;
import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
import openjdk.tools.javac.util.Context;
import openjdk.tools.javac.util.Log;
import openjdk.tools.javac.util.Log.DeferredDiagnosticHandler;
import openjdk.tools.javac.util.Options;
import java.io.IOException;
import java.net.URI;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+79 -79
View File
@@ -29,18 +29,18 @@ import static com.google.googlejavaformat.java.Trees.getStartPosition;
import static com.google.googlejavaformat.java.Trees.operatorName;
import static com.google.googlejavaformat.java.Trees.precedence;
import static com.google.googlejavaformat.java.Trees.skipParen;
import static com.sun.source.tree.Tree.Kind.ANNOTATION;
import static com.sun.source.tree.Tree.Kind.ARRAY_ACCESS;
import static com.sun.source.tree.Tree.Kind.ASSIGNMENT;
import static com.sun.source.tree.Tree.Kind.BLOCK;
import static com.sun.source.tree.Tree.Kind.EXTENDS_WILDCARD;
import static com.sun.source.tree.Tree.Kind.IF;
import static com.sun.source.tree.Tree.Kind.METHOD_INVOCATION;
import static com.sun.source.tree.Tree.Kind.NEW_ARRAY;
import static com.sun.source.tree.Tree.Kind.NEW_CLASS;
import static com.sun.source.tree.Tree.Kind.STRING_LITERAL;
import static com.sun.source.tree.Tree.Kind.UNION_TYPE;
import static com.sun.source.tree.Tree.Kind.VARIABLE;
import static openjdk.source.tree.Tree.Kind.ANNOTATION;
import static openjdk.source.tree.Tree.Kind.ARRAY_ACCESS;
import static openjdk.source.tree.Tree.Kind.ASSIGNMENT;
import static openjdk.source.tree.Tree.Kind.BLOCK;
import static openjdk.source.tree.Tree.Kind.EXTENDS_WILDCARD;
import static openjdk.source.tree.Tree.Kind.IF;
import static openjdk.source.tree.Tree.Kind.METHOD_INVOCATION;
import static openjdk.source.tree.Tree.Kind.NEW_ARRAY;
import static openjdk.source.tree.Tree.Kind.NEW_CLASS;
import static openjdk.source.tree.Tree.Kind.STRING_LITERAL;
import static openjdk.source.tree.Tree.Kind.UNION_TYPE;
import static openjdk.source.tree.Tree.Kind.VARIABLE;
import static java.util.stream.Collectors.toList;
import com.google.auto.value.AutoOneOf;
@@ -77,73 +77,73 @@ import com.google.googlejavaformat.OpsBuilder.BlankLineWanted;
import com.google.googlejavaformat.Output.BreakTag;
import com.google.googlejavaformat.java.DimensionHelpers.SortedDims;
import com.google.googlejavaformat.java.DimensionHelpers.TypeWithDims;
import com.sun.source.tree.AnnotatedTypeTree;
import com.sun.source.tree.AnnotationTree;
import com.sun.source.tree.ArrayAccessTree;
import com.sun.source.tree.ArrayTypeTree;
import com.sun.source.tree.AssertTree;
import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.BinaryTree;
import com.sun.source.tree.BlockTree;
import com.sun.source.tree.BreakTree;
import com.sun.source.tree.CaseTree;
import com.sun.source.tree.CatchTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.CompoundAssignmentTree;
import com.sun.source.tree.ConditionalExpressionTree;
import com.sun.source.tree.ContinueTree;
import com.sun.source.tree.DirectiveTree;
import com.sun.source.tree.DoWhileLoopTree;
import com.sun.source.tree.EmptyStatementTree;
import com.sun.source.tree.EnhancedForLoopTree;
import com.sun.source.tree.ExportsTree;
import com.sun.source.tree.ExpressionStatementTree;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.ForLoopTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.IfTree;
import com.sun.source.tree.ImportTree;
import com.sun.source.tree.InstanceOfTree;
import com.sun.source.tree.IntersectionTypeTree;
import com.sun.source.tree.LabeledStatementTree;
import com.sun.source.tree.LambdaExpressionTree;
import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MemberReferenceTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.tree.ModifiersTree;
import com.sun.source.tree.ModuleTree;
import com.sun.source.tree.NewArrayTree;
import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.OpensTree;
import com.sun.source.tree.ParameterizedTypeTree;
import com.sun.source.tree.ParenthesizedTree;
import com.sun.source.tree.PrimitiveTypeTree;
import com.sun.source.tree.ProvidesTree;
import com.sun.source.tree.RequiresTree;
import com.sun.source.tree.ReturnTree;
import com.sun.source.tree.StatementTree;
import com.sun.source.tree.SwitchTree;
import com.sun.source.tree.SynchronizedTree;
import com.sun.source.tree.ThrowTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.TryTree;
import com.sun.source.tree.TypeCastTree;
import com.sun.source.tree.TypeParameterTree;
import com.sun.source.tree.UnaryTree;
import com.sun.source.tree.UnionTypeTree;
import com.sun.source.tree.UsesTree;
import com.sun.source.tree.VariableTree;
import com.sun.source.tree.WhileLoopTree;
import com.sun.source.tree.WildcardTree;
import com.sun.source.util.TreePath;
import com.sun.source.util.TreePathScanner;
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.TreeScanner;
import openjdk.source.tree.AnnotatedTypeTree;
import openjdk.source.tree.AnnotationTree;
import openjdk.source.tree.ArrayAccessTree;
import openjdk.source.tree.ArrayTypeTree;
import openjdk.source.tree.AssertTree;
import openjdk.source.tree.AssignmentTree;
import openjdk.source.tree.BinaryTree;
import openjdk.source.tree.BlockTree;
import openjdk.source.tree.BreakTree;
import openjdk.source.tree.CaseTree;
import openjdk.source.tree.CatchTree;
import openjdk.source.tree.ClassTree;
import openjdk.source.tree.CompilationUnitTree;
import openjdk.source.tree.CompoundAssignmentTree;
import openjdk.source.tree.ConditionalExpressionTree;
import openjdk.source.tree.ContinueTree;
import openjdk.source.tree.DirectiveTree;
import openjdk.source.tree.DoWhileLoopTree;
import openjdk.source.tree.EmptyStatementTree;
import openjdk.source.tree.EnhancedForLoopTree;
import openjdk.source.tree.ExportsTree;
import openjdk.source.tree.ExpressionStatementTree;
import openjdk.source.tree.ExpressionTree;
import openjdk.source.tree.ForLoopTree;
import openjdk.source.tree.IdentifierTree;
import openjdk.source.tree.IfTree;
import openjdk.source.tree.ImportTree;
import openjdk.source.tree.InstanceOfTree;
import openjdk.source.tree.IntersectionTypeTree;
import openjdk.source.tree.LabeledStatementTree;
import openjdk.source.tree.LambdaExpressionTree;
import openjdk.source.tree.LiteralTree;
import openjdk.source.tree.MemberReferenceTree;
import openjdk.source.tree.MemberSelectTree;
import openjdk.source.tree.MethodInvocationTree;
import openjdk.source.tree.MethodTree;
import openjdk.source.tree.ModifiersTree;
import openjdk.source.tree.ModuleTree;
import openjdk.source.tree.NewArrayTree;
import openjdk.source.tree.NewClassTree;
import openjdk.source.tree.OpensTree;
import openjdk.source.tree.ParameterizedTypeTree;
import openjdk.source.tree.ParenthesizedTree;
import openjdk.source.tree.PrimitiveTypeTree;
import openjdk.source.tree.ProvidesTree;
import openjdk.source.tree.RequiresTree;
import openjdk.source.tree.ReturnTree;
import openjdk.source.tree.StatementTree;
import openjdk.source.tree.SwitchTree;
import openjdk.source.tree.SynchronizedTree;
import openjdk.source.tree.ThrowTree;
import openjdk.source.tree.Tree;
import openjdk.source.tree.TryTree;
import openjdk.source.tree.TypeCastTree;
import openjdk.source.tree.TypeParameterTree;
import openjdk.source.tree.UnaryTree;
import openjdk.source.tree.UnionTypeTree;
import openjdk.source.tree.UsesTree;
import openjdk.source.tree.VariableTree;
import openjdk.source.tree.WhileLoopTree;
import openjdk.source.tree.WildcardTree;
import openjdk.source.util.TreePath;
import openjdk.source.util.TreePathScanner;
import openjdk.tools.javac.code.Flags;
import openjdk.tools.javac.tree.JCTree;
import openjdk.tools.javac.tree.JCTree.JCMethodDecl;
import openjdk.tools.javac.tree.TreeScanner;
import org.checkerframework.checker.nullness.qual.Nullable;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavacTokens.java
+9 -9
View File
@@ -18,15 +18,15 @@ import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.sun.tools.javac.parser.JavaTokenizer;
import com.sun.tools.javac.parser.Scanner;
import com.sun.tools.javac.parser.ScannerFactory;
import com.sun.tools.javac.parser.Tokens.Comment;
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
import com.sun.tools.javac.parser.Tokens.Token;
import com.sun.tools.javac.parser.Tokens.TokenKind;
import com.sun.tools.javac.parser.UnicodeReader;
import com.sun.tools.javac.util.Context;
import openjdk.tools.javac.parser.JavaTokenizer;
import openjdk.tools.javac.parser.Scanner;
import openjdk.tools.javac.parser.ScannerFactory;
import openjdk.tools.javac.parser.Tokens.Comment;
import openjdk.tools.javac.parser.Tokens.Comment.CommentStyle;
import openjdk.tools.javac.parser.Tokens.Token;
import openjdk.tools.javac.parser.Tokens.TokenKind;
import openjdk.tools.javac.parser.UnicodeReader;
import openjdk.tools.javac.util.Context;
import java.util.Set;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.google.common.collect.RangeSet;
import com.google.common.collect.TreeRangeMap;
import com.google.googlejavaformat.Input.Tok;
import com.google.googlejavaformat.Input.Token;
import com.sun.tools.javac.parser.Tokens.TokenKind;
import openjdk.tools.javac.parser.Tokens.TokenKind;
import java.util.ArrayList;
import java.util.Collection;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java
+25 -25
View File
@@ -30,30 +30,30 @@ import com.google.common.collect.RangeSet;
import com.google.common.collect.TreeRangeMap;
import com.google.common.collect.TreeRangeSet;
import com.google.googlejavaformat.Newlines;
import com.sun.source.doctree.DocCommentTree;
import com.sun.source.doctree.ReferenceTree;
import com.sun.source.tree.CaseTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.ImportTree;
import com.sun.source.tree.Tree;
import com.sun.source.util.DocTreePath;
import com.sun.source.util.DocTreePathScanner;
import com.sun.source.util.TreePathScanner;
import com.sun.source.util.TreeScanner;
import com.sun.tools.javac.api.JavacTrees;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.parser.JavacParser;
import com.sun.tools.javac.parser.ParserFactory;
import com.sun.tools.javac.tree.DCTree;
import com.sun.tools.javac.tree.DCTree.DCReference;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
import com.sun.tools.javac.tree.JCTree.JCIdent;
import com.sun.tools.javac.tree.JCTree.JCImport;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
import openjdk.source.doctree.DocCommentTree;
import openjdk.source.doctree.ReferenceTree;
import openjdk.source.tree.CaseTree;
import openjdk.source.tree.IdentifierTree;
import openjdk.source.tree.ImportTree;
import openjdk.source.tree.Tree;
import openjdk.source.util.DocTreePath;
import openjdk.source.util.DocTreePathScanner;
import openjdk.source.util.TreePathScanner;
import openjdk.source.util.TreeScanner;
import openjdk.tools.javac.api.JavacTrees;
import openjdk.tools.javac.file.JavacFileManager;
import openjdk.tools.javac.parser.JavacParser;
import openjdk.tools.javac.parser.ParserFactory;
import openjdk.tools.javac.tree.DCTree;
import openjdk.tools.javac.tree.DCTree.DCReference;
import openjdk.tools.javac.tree.JCTree;
import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
import openjdk.tools.javac.tree.JCTree.JCFieldAccess;
import openjdk.tools.javac.tree.JCTree.JCIdent;
import openjdk.tools.javac.tree.JCTree.JCImport;
import openjdk.tools.javac.util.Context;
import openjdk.tools.javac.util.Log;
import openjdk.tools.javac.util.Options;
import java.io.IOError;
import java.io.IOException;
@@ -303,7 +303,7 @@ public class RemoveUnusedImports {
// scan javadoc comments, checking for references to imported types
class DocTreeScanner extends DocTreePathScanner<Void, Void> {
@Override
public Void visitIdentifier(com.sun.source.doctree.IdentifierTree node, Void aVoid) {
public Void visitIdentifier(openjdk.source.doctree.IdentifierTree node, Void aVoid) {
return null;
}
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
+15 -15
View File
@@ -26,21 +26,21 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Range;
import com.google.common.collect.TreeRangeMap;
import com.google.googlejavaformat.Newlines;
import com.sun.source.tree.BinaryTree;
import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.Tree.Kind;
import com.sun.source.util.TreePath;
import com.sun.source.util.TreePathScanner;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.parser.JavacParser;
import com.sun.tools.javac.parser.ParserFactory;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
import com.sun.tools.javac.util.Position;
import openjdk.source.tree.BinaryTree;
import openjdk.source.tree.LiteralTree;
import openjdk.source.tree.MemberSelectTree;
import openjdk.source.tree.Tree;
import openjdk.source.tree.Tree.Kind;
import openjdk.source.util.TreePath;
import openjdk.source.util.TreePathScanner;
import openjdk.tools.javac.file.JavacFileManager;
import openjdk.tools.javac.parser.JavacParser;
import openjdk.tools.javac.parser.ParserFactory;
import openjdk.tools.javac.tree.JCTree;
import openjdk.tools.javac.util.Context;
import openjdk.tools.javac.util.Log;
import openjdk.tools.javac.util.Options;
import openjdk.tools.javac.util.Position;
import java.io.IOException;
import java.io.UncheckedIOException;
subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java
+12 -12
View File
@@ -14,18 +14,18 @@
package com.google.googlejavaformat.java;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompoundAssignmentTree;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.ParenthesizedTree;
import com.sun.source.tree.Tree;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.Pretty;
import com.sun.tools.javac.tree.TreeInfo;
import openjdk.source.tree.ClassTree;
import openjdk.source.tree.CompoundAssignmentTree;
import openjdk.source.tree.ExpressionTree;
import openjdk.source.tree.IdentifierTree;
import openjdk.source.tree.MemberSelectTree;
import openjdk.source.tree.MethodInvocationTree;
import openjdk.source.tree.ParenthesizedTree;
import openjdk.source.tree.Tree;
import openjdk.source.util.TreePath;
import openjdk.tools.javac.tree.JCTree;
import openjdk.tools.javac.tree.Pretty;
import openjdk.tools.javac.tree.TreeInfo;
import java.io.IOError;
import java.io.IOException;