Skip to content

Commit 4f29b0b

Browse files
cushoncushon
committed
Depend on repackaged javac classes
To avoid conflicts with platform classes, which are especially hard to resolve for libraries. MOE_MIGRATED_REVID=144387684
1 parent 8198d90 commit 4f29b0b

File tree

10 files changed

+138
-139
lines changed

10 files changed

+138
-139
lines changed

‎core/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
package com.google.googlejavaformat.java;
1616

1717
import com.google.common.collect.ImmutableList;
18-
import com.sun.source.tree.AnnotatedTypeTree;
19-
import com.sun.source.tree.AnnotationTree;
20-
import com.sun.source.tree.ArrayTypeTree;
21-
import com.sun.source.tree.Tree;
22-
import com.sun.tools.javac.tree.JCTree;
2318
import java.util.ArrayDeque;
2419
import java.util.ArrayList;
2520
import java.util.Collections;
2621
import java.util.Deque;
2722
import java.util.List;
23+
import org.openjdk.source.tree.AnnotatedTypeTree;
24+
import org.openjdk.source.tree.AnnotationTree;
25+
import org.openjdk.source.tree.ArrayTypeTree;
26+
import org.openjdk.source.tree.Tree;
27+
import org.openjdk.tools.javac.tree.JCTree;
2828

2929
/**
3030
* Utilities for working with array dimensions.

‎core/src/main/java/com/google/googlejavaformat/java/Formatter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@
3232
import com.google.googlejavaformat.Newlines;
3333
import com.google.googlejavaformat.Op;
3434
import com.google.googlejavaformat.OpsBuilder;
35-
import com.sun.tools.javac.file.JavacFileManager;
36-
import com.sun.tools.javac.parser.JavacParser;
37-
import com.sun.tools.javac.parser.ParserFactory;
38-
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
39-
import com.sun.tools.javac.util.Context;
40-
import com.sun.tools.javac.util.Log;
41-
import com.sun.tools.javac.util.Options;
4235
import java.io.File;
4336
import java.io.IOError;
4437
import java.io.IOException;
@@ -53,6 +46,13 @@
5346
import javax.tools.JavaFileObject;
5447
import javax.tools.SimpleJavaFileObject;
5548
import javax.tools.StandardLocation;
49+
import org.openjdk.tools.javac.file.JavacFileManager;
50+
import org.openjdk.tools.javac.parser.JavacParser;
51+
import org.openjdk.tools.javac.parser.ParserFactory;
52+
import org.openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
53+
import org.openjdk.tools.javac.util.Context;
54+
import org.openjdk.tools.javac.util.Log;
55+
import org.openjdk.tools.javac.util.Options;
5656

5757
/**
5858
* This is google-java-format, a new Java formatter that follows the Google Java Style Guide quite

‎core/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.collect.ImmutableSortedSet;
2222
import com.google.googlejavaformat.Newlines;
2323
import com.google.googlejavaformat.java.JavaInput.Tok;
24-
import com.sun.tools.javac.parser.Tokens.TokenKind;
24+
import org.openjdk.tools.javac.parser.Tokens.TokenKind;
2525

2626
/** Orders imports in Java source code. */
2727
public class ImportOrderer {

‎core/src/main/java/com/google/googlejavaformat/java/JavaInput.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
import com.google.googlejavaformat.Input;
3434
import com.google.googlejavaformat.Newlines;
3535
import com.google.googlejavaformat.java.JavacTokens.RawTok;
36-
import com.sun.tools.javac.file.JavacFileManager;
37-
import com.sun.tools.javac.parser.Tokens.TokenKind;
38-
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
39-
import com.sun.tools.javac.util.Context;
40-
import com.sun.tools.javac.util.Log;
41-
import com.sun.tools.javac.util.Log.DeferredDiagnosticHandler;
4236
import java.io.IOException;
4337
import java.net.URI;
4438
import java.util.ArrayList;
@@ -51,6 +45,12 @@
5145
import javax.tools.JavaFileObject;
5246
import javax.tools.JavaFileObject.Kind;
5347
import javax.tools.SimpleJavaFileObject;
48+
import org.openjdk.tools.javac.file.JavacFileManager;
49+
import org.openjdk.tools.javac.parser.Tokens.TokenKind;
50+
import org.openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
51+
import org.openjdk.tools.javac.util.Context;
52+
import org.openjdk.tools.javac.util.Log;
53+
import org.openjdk.tools.javac.util.Log.DeferredDiagnosticHandler;
5454

5555
/** {@code JavaInput} extends {@link Input} to represent a Java input document. */
5656
public final class JavaInput extends Input {

‎core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
import static com.google.googlejavaformat.java.Trees.operatorName;
3030
import static com.google.googlejavaformat.java.Trees.precedence;
3131
import static com.google.googlejavaformat.java.Trees.skipParen;
32-
import static com.sun.source.tree.Tree.Kind.ANNOTATION;
33-
import static com.sun.source.tree.Tree.Kind.ARRAY_ACCESS;
34-
import static com.sun.source.tree.Tree.Kind.ASSIGNMENT;
35-
import static com.sun.source.tree.Tree.Kind.BLOCK;
36-
import static com.sun.source.tree.Tree.Kind.EXTENDS_WILDCARD;
37-
import static com.sun.source.tree.Tree.Kind.IF;
38-
import static com.sun.source.tree.Tree.Kind.METHOD_INVOCATION;
39-
import static com.sun.source.tree.Tree.Kind.NEW_ARRAY;
40-
import static com.sun.source.tree.Tree.Kind.NEW_CLASS;
41-
import static com.sun.source.tree.Tree.Kind.STRING_LITERAL;
42-
import static com.sun.source.tree.Tree.Kind.UNION_TYPE;
43-
import static com.sun.source.tree.Tree.Kind.VARIABLE;
32+
import static org.openjdk.source.tree.Tree.Kind.ANNOTATION;
33+
import static org.openjdk.source.tree.Tree.Kind.ARRAY_ACCESS;
34+
import static org.openjdk.source.tree.Tree.Kind.ASSIGNMENT;
35+
import static org.openjdk.source.tree.Tree.Kind.BLOCK;
36+
import static org.openjdk.source.tree.Tree.Kind.EXTENDS_WILDCARD;
37+
import static org.openjdk.source.tree.Tree.Kind.IF;
38+
import static org.openjdk.source.tree.Tree.Kind.METHOD_INVOCATION;
39+
import static org.openjdk.source.tree.Tree.Kind.NEW_ARRAY;
40+
import static org.openjdk.source.tree.Tree.Kind.NEW_CLASS;
41+
import static org.openjdk.source.tree.Tree.Kind.STRING_LITERAL;
42+
import static org.openjdk.source.tree.Tree.Kind.UNION_TYPE;
43+
import static org.openjdk.source.tree.Tree.Kind.VARIABLE;
4444

4545
import com.google.common.base.MoreObjects;
4646
import com.google.common.base.Optional;
@@ -66,65 +66,6 @@
6666
import com.google.googlejavaformat.Output.BreakTag;
6767
import com.google.googlejavaformat.java.DimensionHelpers.SortedDims;
6868
import com.google.googlejavaformat.java.DimensionHelpers.TypeWithDims;
69-
import com.sun.source.tree.AnnotatedTypeTree;
70-
import com.sun.source.tree.AnnotationTree;
71-
import com.sun.source.tree.ArrayAccessTree;
72-
import com.sun.source.tree.ArrayTypeTree;
73-
import com.sun.source.tree.AssertTree;
74-
import com.sun.source.tree.AssignmentTree;
75-
import com.sun.source.tree.BinaryTree;
76-
import com.sun.source.tree.BlockTree;
77-
import com.sun.source.tree.BreakTree;
78-
import com.sun.source.tree.CaseTree;
79-
import com.sun.source.tree.CatchTree;
80-
import com.sun.source.tree.ClassTree;
81-
import com.sun.source.tree.CompilationUnitTree;
82-
import com.sun.source.tree.CompoundAssignmentTree;
83-
import com.sun.source.tree.ConditionalExpressionTree;
84-
import com.sun.source.tree.ContinueTree;
85-
import com.sun.source.tree.DoWhileLoopTree;
86-
import com.sun.source.tree.EmptyStatementTree;
87-
import com.sun.source.tree.EnhancedForLoopTree;
88-
import com.sun.source.tree.ExpressionStatementTree;
89-
import com.sun.source.tree.ExpressionTree;
90-
import com.sun.source.tree.ForLoopTree;
91-
import com.sun.source.tree.IdentifierTree;
92-
import com.sun.source.tree.IfTree;
93-
import com.sun.source.tree.ImportTree;
94-
import com.sun.source.tree.InstanceOfTree;
95-
import com.sun.source.tree.IntersectionTypeTree;
96-
import com.sun.source.tree.LabeledStatementTree;
97-
import com.sun.source.tree.LambdaExpressionTree;
98-
import com.sun.source.tree.LiteralTree;
99-
import com.sun.source.tree.MemberReferenceTree;
100-
import com.sun.source.tree.MemberSelectTree;
101-
import com.sun.source.tree.MethodInvocationTree;
102-
import com.sun.source.tree.MethodTree;
103-
import com.sun.source.tree.ModifiersTree;
104-
import com.sun.source.tree.NewArrayTree;
105-
import com.sun.source.tree.NewClassTree;
106-
import com.sun.source.tree.ParameterizedTypeTree;
107-
import com.sun.source.tree.ParenthesizedTree;
108-
import com.sun.source.tree.PrimitiveTypeTree;
109-
import com.sun.source.tree.ReturnTree;
110-
import com.sun.source.tree.StatementTree;
111-
import com.sun.source.tree.SwitchTree;
112-
import com.sun.source.tree.SynchronizedTree;
113-
import com.sun.source.tree.ThrowTree;
114-
import com.sun.source.tree.Tree;
115-
import com.sun.source.tree.TryTree;
116-
import com.sun.source.tree.TypeCastTree;
117-
import com.sun.source.tree.TypeParameterTree;
118-
import com.sun.source.tree.UnaryTree;
119-
import com.sun.source.tree.UnionTypeTree;
120-
import com.sun.source.tree.VariableTree;
121-
import com.sun.source.tree.WhileLoopTree;
122-
import com.sun.source.tree.WildcardTree;
123-
import com.sun.source.util.TreePath;
124-
import com.sun.source.util.TreePathScanner;
125-
import com.sun.tools.javac.code.Flags;
126-
import com.sun.tools.javac.tree.JCTree;
127-
import com.sun.tools.javac.tree.TreeScanner;
12869
import java.util.ArrayDeque;
12970
import java.util.ArrayList;
13071
import java.util.Arrays;
@@ -134,6 +75,65 @@
13475
import java.util.Map;
13576
import java.util.regex.Pattern;
13677
import javax.lang.model.element.Name;
78+
import org.openjdk.source.tree.AnnotatedTypeTree;
79+
import org.openjdk.source.tree.AnnotationTree;
80+
import org.openjdk.source.tree.ArrayAccessTree;
81+
import org.openjdk.source.tree.ArrayTypeTree;
82+
import org.openjdk.source.tree.AssertTree;
83+
import org.openjdk.source.tree.AssignmentTree;
84+
import org.openjdk.source.tree.BinaryTree;
85+
import org.openjdk.source.tree.BlockTree;
86+
import org.openjdk.source.tree.BreakTree;
87+
import org.openjdk.source.tree.CaseTree;
88+
import org.openjdk.source.tree.CatchTree;
89+
import org.openjdk.source.tree.ClassTree;
90+
import org.openjdk.source.tree.CompilationUnitTree;
91+
import org.openjdk.source.tree.CompoundAssignmentTree;
92+
import org.openjdk.source.tree.ConditionalExpressionTree;
93+
import org.openjdk.source.tree.ContinueTree;
94+
import org.openjdk.source.tree.DoWhileLoopTree;
95+
import org.openjdk.source.tree.EmptyStatementTree;
96+
import org.openjdk.source.tree.EnhancedForLoopTree;
97+
import org.openjdk.source.tree.ExpressionStatementTree;
98+
import org.openjdk.source.tree.ExpressionTree;
99+
import org.openjdk.source.tree.ForLoopTree;
100+
import org.openjdk.source.tree.IdentifierTree;
101+
import org.openjdk.source.tree.IfTree;
102+
import org.openjdk.source.tree.ImportTree;
103+
import org.openjdk.source.tree.InstanceOfTree;
104+
import org.openjdk.source.tree.IntersectionTypeTree;
105+
import org.openjdk.source.tree.LabeledStatementTree;
106+
import org.openjdk.source.tree.LambdaExpressionTree;
107+
import org.openjdk.source.tree.LiteralTree;
108+
import org.openjdk.source.tree.MemberReferenceTree;
109+
import org.openjdk.source.tree.MemberSelectTree;
110+
import org.openjdk.source.tree.MethodInvocationTree;
111+
import org.openjdk.source.tree.MethodTree;
112+
import org.openjdk.source.tree.ModifiersTree;
113+
import org.openjdk.source.tree.NewArrayTree;
114+
import org.openjdk.source.tree.NewClassTree;
115+
import org.openjdk.source.tree.ParameterizedTypeTree;
116+
import org.openjdk.source.tree.ParenthesizedTree;
117+
import org.openjdk.source.tree.PrimitiveTypeTree;
118+
import org.openjdk.source.tree.ReturnTree;
119+
import org.openjdk.source.tree.StatementTree;
120+
import org.openjdk.source.tree.SwitchTree;
121+
import org.openjdk.source.tree.SynchronizedTree;
122+
import org.openjdk.source.tree.ThrowTree;
123+
import org.openjdk.source.tree.Tree;
124+
import org.openjdk.source.tree.TryTree;
125+
import org.openjdk.source.tree.TypeCastTree;
126+
import org.openjdk.source.tree.TypeParameterTree;
127+
import org.openjdk.source.tree.UnaryTree;
128+
import org.openjdk.source.tree.UnionTypeTree;
129+
import org.openjdk.source.tree.VariableTree;
130+
import org.openjdk.source.tree.WhileLoopTree;
131+
import org.openjdk.source.tree.WildcardTree;
132+
import org.openjdk.source.util.TreePath;
133+
import org.openjdk.source.util.TreePathScanner;
134+
import org.openjdk.tools.javac.code.Flags;
135+
import org.openjdk.tools.javac.tree.JCTree;
136+
import org.openjdk.tools.javac.tree.TreeScanner;
137137

138138
/**
139139
* An AST visitor that builds a stream of {@link Op}s to format from the given {@link

‎core/src/main/java/com/google/googlejavaformat/java/JavacTokens.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818

1919
import com.google.common.collect.ImmutableList;
2020
import com.google.common.collect.Lists;
21-
import com.sun.tools.javac.parser.JavaTokenizer;
22-
import com.sun.tools.javac.parser.Scanner;
23-
import com.sun.tools.javac.parser.ScannerFactory;
24-
import com.sun.tools.javac.parser.Tokens.Comment;
25-
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
26-
import com.sun.tools.javac.parser.Tokens.Token;
27-
import com.sun.tools.javac.parser.Tokens.TokenKind;
28-
import com.sun.tools.javac.parser.UnicodeReader;
29-
import com.sun.tools.javac.util.Context;
3021
import java.util.Set;
22+
import org.openjdk.tools.javac.parser.JavaTokenizer;
23+
import org.openjdk.tools.javac.parser.Scanner;
24+
import org.openjdk.tools.javac.parser.ScannerFactory;
25+
import org.openjdk.tools.javac.parser.Tokens.Comment;
26+
import org.openjdk.tools.javac.parser.Tokens.Comment.CommentStyle;
27+
import org.openjdk.tools.javac.parser.Tokens.Token;
28+
import org.openjdk.tools.javac.parser.Tokens.TokenKind;
29+
import org.openjdk.tools.javac.parser.UnicodeReader;
30+
import org.openjdk.tools.javac.util.Context;
3131

3232
/** A wrapper around javac's lexer. */
3333
public class JavacTokens {

‎core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.google.common.collect.TreeRangeMap;
2424
import com.google.googlejavaformat.Input.Tok;
2525
import com.google.googlejavaformat.Input.Token;
26-
import com.sun.tools.javac.parser.Tokens.TokenKind;
2726
import java.util.ArrayList;
2827
import java.util.Collection;
2928
import java.util.Collections;
@@ -32,6 +31,7 @@
3231
import java.util.Map;
3332
import java.util.Map.Entry;
3433
import javax.lang.model.element.Modifier;
34+
import org.openjdk.tools.javac.parser.Tokens.TokenKind;
3535

3636
/** Fixes sequences of modifiers to be in JLS order. */
3737
final class ModifierOrderer {

‎core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,6 @@
3030
import com.google.common.collect.TreeRangeSet;
3131
import com.google.googlejavaformat.FormattingError;
3232
import com.google.googlejavaformat.Newlines;
33-
import com.sun.source.doctree.DocCommentTree;
34-
import com.sun.source.doctree.ReferenceTree;
35-
import com.sun.source.tree.IdentifierTree;
36-
import com.sun.source.tree.ImportTree;
37-
import com.sun.source.tree.Tree;
38-
import com.sun.source.util.DocTreePath;
39-
import com.sun.source.util.DocTreePathScanner;
40-
import com.sun.source.util.TreePathScanner;
41-
import com.sun.source.util.TreeScanner;
42-
import com.sun.tools.javac.api.JavacTrees;
43-
import com.sun.tools.javac.file.JavacFileManager;
44-
import com.sun.tools.javac.parser.JavacParser;
45-
import com.sun.tools.javac.parser.ParserFactory;
46-
import com.sun.tools.javac.tree.DCTree;
47-
import com.sun.tools.javac.tree.DCTree.DCReference;
48-
import com.sun.tools.javac.tree.JCTree;
49-
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
50-
import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
51-
import com.sun.tools.javac.tree.JCTree.JCIdent;
52-
import com.sun.tools.javac.tree.JCTree.JCImport;
53-
import com.sun.tools.javac.util.Context;
54-
import com.sun.tools.javac.util.Log;
55-
import com.sun.tools.javac.util.Options;
5633
import java.io.IOError;
5734
import java.io.IOException;
5835
import java.net.URI;
@@ -65,6 +42,29 @@
6542
import javax.tools.JavaFileObject;
6643
import javax.tools.SimpleJavaFileObject;
6744
import javax.tools.StandardLocation;
45+
import org.openjdk.source.doctree.DocCommentTree;
46+
import org.openjdk.source.doctree.ReferenceTree;
47+
import org.openjdk.source.tree.IdentifierTree;
48+
import org.openjdk.source.tree.ImportTree;
49+
import org.openjdk.source.tree.Tree;
50+
import org.openjdk.source.util.DocTreePath;
51+
import org.openjdk.source.util.DocTreePathScanner;
52+
import org.openjdk.source.util.TreePathScanner;
53+
import org.openjdk.source.util.TreeScanner;
54+
import org.openjdk.tools.javac.api.JavacTrees;
55+
import org.openjdk.tools.javac.file.JavacFileManager;
56+
import org.openjdk.tools.javac.parser.JavacParser;
57+
import org.openjdk.tools.javac.parser.ParserFactory;
58+
import org.openjdk.tools.javac.tree.DCTree;
59+
import org.openjdk.tools.javac.tree.DCTree.DCReference;
60+
import org.openjdk.tools.javac.tree.JCTree;
61+
import org.openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
62+
import org.openjdk.tools.javac.tree.JCTree.JCFieldAccess;
63+
import org.openjdk.tools.javac.tree.JCTree.JCIdent;
64+
import org.openjdk.tools.javac.tree.JCTree.JCImport;
65+
import org.openjdk.tools.javac.util.Context;
66+
import org.openjdk.tools.javac.util.Log;
67+
import org.openjdk.tools.javac.util.Options;
6868

6969
/**
7070
* Removes unused imports from a source file. Imports that are only used in javadoc are also
@@ -146,7 +146,7 @@ private void scanJavadoc() {
146146
// scan javadoc comments, checking for references to imported types
147147
class DocTreeScanner extends DocTreePathScanner<Void, Void> {
148148
@Override
149-
public Void visitIdentifier(com.sun.source.doctree.IdentifierTree node, Void aVoid) {
149+
public Void visitIdentifier(org.openjdk.source.doctree.IdentifierTree node, Void aVoid) {
150150
return null;
151151
}
152152

‎core/src/main/java/com/google/googlejavaformat/java/Trees.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414

1515
package com.google.googlejavaformat.java;
1616

17-
import com.sun.source.tree.ClassTree;
18-
import com.sun.source.tree.CompoundAssignmentTree;
19-
import com.sun.source.tree.ExpressionTree;
20-
import com.sun.source.tree.IdentifierTree;
21-
import com.sun.source.tree.MemberSelectTree;
22-
import com.sun.source.tree.MethodInvocationTree;
23-
import com.sun.source.tree.ParenthesizedTree;
24-
import com.sun.source.tree.Tree;
25-
import com.sun.source.util.TreePath;
26-
import com.sun.tools.javac.tree.JCTree;
27-
import com.sun.tools.javac.tree.Pretty;
28-
import com.sun.tools.javac.tree.TreeInfo;
2917
import java.io.IOError;
3018
import java.io.IOException;
3119
import javax.lang.model.element.Name;
20+
import org.openjdk.source.tree.ClassTree;
21+
import org.openjdk.source.tree.CompoundAssignmentTree;
22+
import org.openjdk.source.tree.ExpressionTree;
23+
import org.openjdk.source.tree.IdentifierTree;
24+
import org.openjdk.source.tree.MemberSelectTree;
25+
import org.openjdk.source.tree.MethodInvocationTree;
26+
import org.openjdk.source.tree.ParenthesizedTree;
27+
import org.openjdk.source.tree.Tree;
28+
import org.openjdk.source.util.TreePath;
29+
import org.openjdk.tools.javac.tree.JCTree;
30+
import org.openjdk.tools.javac.tree.Pretty;
31+
import org.openjdk.tools.javac.tree.TreeInfo;
3232

3333
/** Utilities for working with {@link Tree}s. */
3434
public class Trees {

0 commit comments

Comments
 (0)