1.1 --- a/test/tools/javac/processing/model/type/NoTypes.java Fri Jul 01 14:28:19 2011 -0700
1.2 +++ b/test/tools/javac/processing/model/type/NoTypes.java Tue Jul 05 16:37:24 2011 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -23,7 +23,7 @@
1.11
1.12 /*
1.13 * @test
1.14 - * @bug 6418666 6423973 6453386
1.15 + * @bug 6418666 6423973 6453386 7025809
1.16 * @summary Test the NoTypes: VOID, PACKAGE, NONE
1.17 * @author Scott Seligman
1.18 * @library ../../../lib
1.19 @@ -75,7 +75,7 @@
1.20 verifyKind(NONE, types.getNoType(NONE));
1.21
1.22 // The return type of a constructor or void method is VOID.
1.23 - class Scanner extends ElementScanner7<Void, Void> {
1.24 + class Scanner extends ElementScanner<Void, Void> {
1.25 @Override
1.26 public Void visitExecutable(ExecutableElement e, Void p) {
1.27 verifyKind(VOID, e.getReturnType());
1.28 @@ -89,11 +89,11 @@
1.29 }
1.30
1.31 /**
1.32 - * Verify that a NoType instance is of a particular kind,
1.33 - * and that TypeKindVisitor7 properly dispatches on it.
1.34 + * Verify that a NoType instance is of a particular kind, and that
1.35 + * the latest TypeKindVisitor properly dispatches on it.
1.36 */
1.37 private void verifyKind(TypeKind kind, TypeMirror type) {
1.38 - class Vis extends TypeKindVisitor7<TypeKind, Void> {
1.39 + class Vis extends TypeKindVisitor<TypeKind, Void> {
1.40 @Override
1.41 public TypeKind visitNoTypeAsVoid(NoType t, Void p) {
1.42 return VOID;
1.43 @@ -111,9 +111,7 @@
1.44 throw new AssertionError();
1.45 }
1.46
1.47 -
1.48 // Fodder for the tests
1.49 -
1.50 interface I {
1.51 }
1.52
