--- old/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java	2011-06-30 18:49:20.000000000 -0700
+++ new/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java	2011-06-30 18:49:20.000000000 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @bug 6639645 7026414
+ * @bug 6639645 7026414 7025809
  * @summary Modeling type implementing missing interfaces
  * @library ../../../../lib
  * @build JavacTestingAbstractProcessor TestMissingElement
@@ -37,6 +37,7 @@
 import javax.lang.model.type.*;
 import javax.lang.model.util.*;
 import static javax.tools.Diagnostic.Kind.*;
+import static JavacTestingAbstractProcessor.*;
 
 public class TestMissingElement extends JavacTestingAbstractProcessor {
     @Override
@@ -104,7 +105,7 @@
     private String asString(TypeMirror t) {
         if (t == null)
             return "[typ:null]";
-        return t.accept(new SimpleTypeVisitor7<String, Void>() {
+        return t.accept(new SimpleTypeVisitor<String, Void>() {
             @Override
             public String defaultAction(TypeMirror t, Void ignore) {
                 return "[typ:" + t.toString() + "]";
@@ -135,7 +136,7 @@
     private String asString(Element e) {
         if (e == null)
             return "[elt:null]";
-        return e.accept(new SimpleElementVisitor7<String, Void>() {
+        return e.accept(new SimpleElementVisitor<String, Void>() {
             @Override
             public String defaultAction(Element e, Void ignore) {
                 return "[elt:" + e.getKind() + " " + e.toString() + "]";