diff -r c65c37c0c691 -r ec251536a004 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Fri Jul 10 12:42:00 2015 +0300
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Mon Jul 13 16:57:52 2015 +0400
@@ -461,7 +461,7 @@
      *
      * @param location The type path.
      * @param onLambda The lambda for this parameter.
-     * @param index The index of the parameter.
+     * @param parameter_index The index of the parameter.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
@@ -479,7 +479,7 @@
      * Create a {@code TypeAnnotationPosition} for a method formal parameter.
      *
      * @param onLambda The lambda for this parameter.
-     * @param index The index of the parameter.
+     * @param parameter_index The index of the parameter.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
@@ -493,7 +493,7 @@
     /**
      * Create a {@code TypeAnnotationPosition} for a method formal parameter.
      *
-     * @param index The index of the parameter.
+     * @param parameter_index The index of the parameter.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
@@ -506,7 +506,7 @@
      * Create a {@code TypeAnnotationPosition} for a method formal parameter.
      *
      * @param location The type path.
-     * @param index The index of the parameter.
+     * @param parameter_index The index of the parameter.
      */
     public static TypeAnnotationPosition
         methodParameter(final List<TypePathEntry> location,
@@ -535,8 +535,6 @@
      * Create a {@code TypeAnnotationPosition} for a method reference.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this method reference.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         methodRef(final List<TypePathEntry> location) {
@@ -564,8 +562,6 @@
      * Create a {@code TypeAnnotationPosition} for a constructor reference.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this constructor reference.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         constructorRef(final List<TypePathEntry> location) {
@@ -720,8 +716,6 @@
      * Create a {@code TypeAnnotationPosition} for a resource variable.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this variable.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         resourceVariable(final List<TypePathEntry> location) {
@@ -748,8 +742,6 @@
     /**
      * Create a {@code TypeAnnotationPosition} for a new.
      *
-     * @param location The type path.
-     * @param onLambda The lambda for this variable.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition newObj(final int pos) {
@@ -760,8 +752,6 @@
      * Create a {@code TypeAnnotationPosition} for a new.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this variable.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         newObj(final List<TypePathEntry> location) {
@@ -792,7 +782,6 @@
      *
      * @param location The type path.
      * @param onLambda The lambda for this variable.
-     * @param type_index The index of the interface.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
@@ -854,8 +843,6 @@
      * Create a {@code TypeAnnotationPosition} for an instanceof.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this variable.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         instanceOf(final List<TypePathEntry> location) {
@@ -885,9 +872,7 @@
      * Create a {@code TypeAnnotationPosition} for a type cast.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this variable.
      * @param type_index The index into an intersection type.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         typeCast(final List<TypePathEntry> location,
@@ -984,9 +969,7 @@
      * Create a {@code TypeAnnotationPosition} for a type parameter.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this variable.
      * @param parameter_index The index of the type parameter.
-     * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
         typeParameter(final List<TypePathEntry> location,
@@ -1062,7 +1045,7 @@
      *
      * @param location The type path.
      * @param onLambda The lambda for this variable.
-     * @param parameter_index The index of the type argument.
+     * @param type_index The index of the type argument.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
@@ -1081,9 +1064,7 @@
      * type argument.
      *
      * @param location The type path.
-     * @param onLambda The lambda for this variable.
-     * @param parameter_index The index of the type argument.
-     * @param pos The position from the associated tree node.
+     * @param type_index The index of the type argument.
      */
     public static TypeAnnotationPosition
         methodRefTypeArg(final List<TypePathEntry> location,
@@ -1097,7 +1078,7 @@
      *
      * @param location The type path.
      * @param onLambda The lambda for this variable.
-     * @param parameter_index The index of the type argument.
+     * @param type_index The index of the type argument.
      * @param pos The position from the associated tree node.
      */
     public static TypeAnnotationPosition
@@ -1116,7 +1097,7 @@
      * type argument.
      *
      * @param location The type path.
-     * @param parameter_index The index of the type argument.
+     * @param type_index The index of the type argument.
      */
     public static TypeAnnotationPosition
         constructorRefTypeArg(final List<TypePathEntry> location,