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

applied patch 1045127

This commit is contained in:
Oleg Sukhodolsky 2005-06-13 21:31:58 +00:00
parent a69a0461d2
commit fcbd40f3ce
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
View File

@ -90,7 +90,9 @@ public abstract class AbstractTypeAwareCheck
/** @see com.puppycrawl.tools.checkstyle.api.Check */
public final void leaveToken(DetailAST aAST)
{
if (aAST.getType() == TokenTypes.CLASS_DEF) {
if (aAST.getType() == TokenTypes.CLASS_DEF
|| aAST.getType() == TokenTypes.ENUM_DEF)
{
// perhaps it was inner class
int dotIdx = mCurrentClass.lastIndexOf("$");
if (dotIdx == -1) {
@ -105,6 +107,21 @@ public abstract class AbstractTypeAwareCheck
mCurrentClass = mCurrentClass.substring(0, dotIdx);
}
}
else if (aAST.getType() != TokenTypes.PACKAGE_DEF
&& aAST.getType() != TokenTypes.IMPORT)
{
leaveAST(aAST);
}
}
/**
* Called when exiting an AST. A no-op by default, extending classes
* may choose to override this to augment their processing.
* @param aAST the AST we are departing. Guaranteed to not be PACKAGE_DEF,
* CLASS_DEF, or IMPORT
*/
protected void leaveAST(DetailAST aAST)
{
}
/**

2
src/xdocs/releasenotes.xml
View File

@ -23,6 +23,8 @@
<li>One more bug fixed in type aware checks (RedundantThrows
and JavadocMethod checks) (bug 1168408)</li>
<li>Applied patch 1045127 (thanks to Paul Constantinides)</li>
</ul>
</section>