Skip to content

Commit c1f7c59

Browse files
committed
Automated g4 rollback of changelist 60108979.
*** Reason for rollback *** Compile testing is open source and needs to run under jdk6. *** Original change description *** Use the Charset constants in the JDK's StandardCharsets class instead of c.g.c.base.Charsets. The c.g.common.base.Charsets is scheduled for deletion. More information: []ATTENTION REVIEWERS: This CL will cause no behavior changes. Tested: TAP presubmits for global presubmit queue [] *** ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=60789697
1 parent 1e32fd6 commit c1f7c59

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/main/java/com/google/testing/compile/Compilation.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,9 @@
1515
*/
1616
package com.google.testing.compile;
1717

18-
import static java.nio.charset.StandardCharsets.UTF_8;
18+
import static com.google.common.base.Charsets.UTF_8;
1919
import static javax.tools.JavaFileObject.Kind.SOURCE;
2020

21-
import com.google.common.base.Function;
22-
import com.google.common.collect.ImmutableList;
23-
import com.google.common.collect.ImmutableListMultimap;
24-
import com.google.common.collect.ImmutableSet;
25-
import com.google.common.collect.Multimaps;
26-
27-
import com.sun.source.tree.CompilationUnitTree;
28-
import com.sun.source.util.JavacTask;
29-
import com.sun.tools.javac.api.JavacTool;
30-
3121
import java.io.IOException;
3222
import java.util.List;
3323
import java.util.Locale;
@@ -40,6 +30,15 @@
4030
import javax.tools.JavaFileObject;
4131
import javax.tools.ToolProvider;
4232

33+
import com.google.common.base.Function;
34+
import com.google.common.collect.ImmutableList;
35+
import com.google.common.collect.ImmutableListMultimap;
36+
import com.google.common.collect.ImmutableSet;
37+
import com.google.common.collect.Multimaps;
38+
import com.sun.source.tree.CompilationUnitTree;
39+
import com.sun.source.util.JavacTask;
40+
import com.sun.tools.javac.api.JavacTool;
41+
4342
/**
4443
* Utilities for performing compilation with {@code javac}.
4544
*

0 commit comments

Comments
 (0)