test/tools/javac/processing/model/type/TestUnionType.java

@@ -21,11 +21,11 @@
  * questions.
  */
 
 /*
  * @test
- * @bug     7029150
+ * @bug     7029150 7025809
  * @summary Test support for union types
  * @library ../../../lib
  */
 
 import java.net.URI;

@@ -36,11 +36,11 @@
 import javax.lang.model.util.*;
 import javax.tools.*;
 
 import com.sun.source.tree.*;
 import com.sun.source.util.*;
-
+import static JavacTestingAbstractProcessor.*;
 
 public class TestUnionType extends JavacTestingAbstractProcessor {
     enum TestKind {
         SingleType("E1", "E1",
                 "VariableTree: E1 e",

@@ -192,11 +192,11 @@
             System.err.println(msg);
             log.add(msg);
         }
     }
 
-    class TypePrinter extends SimpleTypeVisitor7<String, Void> {
+    class TypePrinter extends SimpleTypeVisitor<String, Void> {
         @Override
         protected String defaultAction(TypeMirror tm, Void ignore) {
             return String.valueOf(tm.getKind());
         }