commit 69fa25b384f2c3ac29726a141760069fbcd52990
author Trevor Johns <trevorjohns@google.com> Tue Apr 19 01:57:35 2016 -0700
committer Trevor Johns <trevorjohns@google.com> Tue Apr 19 14:42:57 2016 -0700
tree 24e484065ff05741cf0e79e8b1087caa94196c3f
parent bb9054772d76fde416af3c0e18f98999daa65bd8

Fix errors from merge conflict resolution

Errors were made in manual conflict resolution in commit
a37a38464aeef5ef2eee77b8463f975d6ffa34af (and subsequently
in commit bb9054772d76fde416af3c0e18f98999daa65bd8).

This change resolves:

1. A syntax error that occured due to a missing curly brace.
2. A few tag variables that didn't get renamed properly.
3. Check for UNKNOWN_PARAM_TAG_NAME error was duplicated twice.
4. Preserved isTypeParameter() check for UNKNOWN_PARAM_TAG_NAME
   logic.

Change-Id: I1b79ced0a9803f6487aa5b073b700c0c6d5dafdd

src/com/google/doclava/MethodInfo.java

diff --git a/src/com/google/doclava/MethodInfo.java b/src/com/google/doclava/MethodInfo.java
index 5ceb0e1..5d6188a 100644
--- a/src/com/google/doclava/MethodInfo.java
+++ b/src/com/google/doclava/MethodInfo.java
@@ -456,7 +456,7 @@
 
       // Complain about misnamed @param tags
       for (ParamTagInfo tag : paramTags) {
-        if (!isParamTagInMethod(tag)){
+        if (!isParamTagInMethod(tag) && !tag.isTypeParameter()){
           Errors.error(Errors.UNKNOWN_PARAM_TAG_NAME, tag.position(),
               "@param tag with name that doesn't match the parameter list: '"
               + tag.parameterName() + "'");
@@ -481,12 +481,7 @@
         if (index >= 0) {
           comment = paramTags[index].parameterComment();
           position = paramTags[index].position();
-        } else if (!tag.isTypeParameter()) {
-          // Complain about misnamed @param tags. Note that we must exclude type
-          // parameter tags (such as "@param <T> foo") from this analysis.
-          Errors.error(Errors.UNKNOWN_PARAM_TAG_NAME, tag.position(),
-              "@param tag with name that doesn't match the parameter list: '" + tag.parameterName()
-                  + "'");
+        }
 
         // get our parent's tags to fill in the blanks
         MethodInfo overridden = this.findOverriddenMethod(name(), signature());