1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Oct 09 19:10:00 2012 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Oct 09 19:31:58 2012 -0700
1.3 @@ -230,7 +230,6 @@
1.4
1.5 /** Warn about unsafe vararg method decl.
1.6 * @param pos Position to be used for error reporting.
1.7 - * @param sym The deprecated symbol.
1.8 */
1.9 void warnUnsafeVararg(DiagnosticPosition pos, String key, Object... args) {
1.10 if (lint.isEnabled(LintCategory.VARARGS) && allowSimplifiedVarargs)
1.11 @@ -397,7 +396,7 @@
1.12 **************************************************************************/
1.13
1.14 /** Return name of local class.
1.15 - * This is of the form <enclClass> $ n <classname>
1.16 + * This is of the form {@code <enclClass> $ n <classname> }
1.17 * where
1.18 * enclClass is the flat name of the enclosing class,
1.19 * classname is the simple name of the local class
1.20 @@ -600,11 +599,10 @@
1.21
1.22 /** Check that a type is within some bounds.
1.23 *
1.24 - * Used in TypeApply to verify that, e.g., X in V<X> is a valid
1.25 + * Used in TypeApply to verify that, e.g., X in {@code V<X>} is a valid
1.26 * type argument.
1.27 - * @param pos Position to be used for error reporting.
1.28 * @param a The type that should be bounded by bs.
1.29 - * @param bs The bound.
1.30 + * @param bound The bound.
1.31 */
1.32 private boolean checkExtends(Type a, Type bound) {
1.33 if (a.isUnbound()) {
1.34 @@ -1262,8 +1260,10 @@
1.35 * their bounds. This must be done in a second phase after type attributon
1.36 * since a class might have a subclass as type parameter bound. E.g:
1.37 *
1.38 + * <pre>{@code
1.39 * class B<A extends C> { ... }
1.40 * class C extends B<C> { ... }
1.41 + * }</pre>
1.42 *
1.43 * and we can't make sure that the bound is already attributed because
1.44 * of possible cycles.
1.45 @@ -2574,7 +2574,7 @@
1.46 * 'pos'.
1.47 *
1.48 * @param s The (annotation)type declaration annotated with a @ContainedBy
1.49 - * @param containerAnno the @ContainedBy on 's'
1.50 + * @param containedBy the @ContainedBy on 's'
1.51 * @param pos where to report errors
1.52 */
1.53 public void validateContainedBy(TypeSymbol s, Attribute.Compound containedBy, DiagnosticPosition pos) {
1.54 @@ -3181,7 +3181,6 @@
1.55 * @param pos Position for error reporting.
1.56 * @param sym The symbol.
1.57 * @param s The scope
1.58 - * @param staticImport Whether or not this was a static import
1.59 */
1.60 boolean checkUniqueStaticImport(DiagnosticPosition pos, Symbol sym, Scope s) {
1.61 return checkUniqueImport(pos, sym, s, true);
