TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some Checkstyle errors that have crept in. Remember that 

must be prepared to eat our own dog food (or so the saying goes:-).
This commit is contained in:
Oliver Burn 2005-04-06 13:13:43 +00:00
parent 66d6361c27
commit 1cd112831f
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/CheckUtils.java
View File

@ -288,30 +288,27 @@ public final class CheckUtils
* are operators).
* @param aNode the token node
* @return true if {@link TokenTypes.LT LT}, {@link TokenTypes.GT GT},
* {@link TokenTypes.QUESTION QUESTION} or {@link TokenTypes.BAND BAND}
* {@link TokenTypes.QUESTION QUESTION} or
* {@link TokenTypes.BAND BAND}
* tokens and is part of a generic declaration, false otherwise
*
*/
public static boolean isOperatorTokenPartOfGenericDeclaration(final DetailAST aNode)
public static boolean isOperatorTokenPartOfGenericDeclaration(
final DetailAST aNode)
{
int type = aNode.getType();
int parentType = aNode.getParent().getType();
// Comparable < String >
if ((type == TokenTypes.GT || type == TokenTypes.LT)
&& (parentType == TokenTypes.TYPE_ARGUMENTS || parentType == TokenTypes.TYPE_PARAMETERS))
if (((type == TokenTypes.GT) || (type == TokenTypes.LT))
&& ((parentType == TokenTypes.TYPE_ARGUMENTS)
|| (parentType == TokenTypes.TYPE_PARAMETERS)))
{
return true;
}
// Comparable < ? extends Serializable & CharSequence >
else if (type == TokenTypes.BAND
&& (parentType == TokenTypes.TYPE_UPPER_BOUNDS || parentType == TokenTypes.TYPE_LOWER_BOUNDS))
{
return true;
}
else
{
return false;
}
return (type == TokenTypes.BAND)
&& ((parentType == TokenTypes.TYPE_UPPER_BOUNDS)
|| (parentType == TokenTypes.TYPE_LOWER_BOUNDS));
}
}