phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update SingleMethodSingletonRule.java

Browse Source
This commit is contained in:
Karthik Shantaraman
2015-04-14 18:03:50 -07:00
parent 4862f0db89
commit 4080a0f177
1 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java
View File

@ -60,33 +60,6 @@ public class SingleMethodSingletonRule extends AbstractJavaRule {
if(!methodset.add(node.getMethodName())){ if(!methodset.add(node.getMethodName())){
violation=true; violation=true;
} }
List<ASTReturnStatement> rsl = node
.findDescendantsOfType(ASTReturnStatement.class);
ASTReturnStatement rs = rsl.get(0);
if (rsl.size() != 1) {
return super.visit(node, data);
} else {
List<ASTPrimaryExpression> pel = rs
.findDescendantsOfType(ASTPrimaryExpression.class);
ASTPrimaryExpression ape = pel.get(0);
Node lastChild = ape.jjtGetChild(0);
String returnVariableName = null;
if (lastChild instanceof ASTPrimaryPrefix) {
returnVariableName = getNameFromPrimaryPrefix((ASTPrimaryPrefix) lastChild);
}
/*if(lastChild instanceof ASTPrimarySuffix){
returnVariableName = getNameFromPrimarySuffix((ASTPrimarySuffix) lastChild);
}*/
if (returnVariableName != null
&& fieldDecls.containsKey(returnVariableName)) {
//boolean added = returnset.add(fieldDecls
// .get(returnVariableName));
if (!returnset.add(fieldDecls
.get(returnVariableName))) {
violation=true;
}
}
}
} }
if(violation){ if(violation){
@ -95,21 +68,6 @@ public class SingleMethodSingletonRule extends AbstractJavaRule {
return super.visit(node, data); return super.visit(node, data);
} }
/*private String getNameFromPrimarySuffix(ASTPrimarySuffix lastChild) {
List<ASTPrimaryExpression> pel=lastChild.findDescendantsOfType(ASTPrimaryExpression.class);
ASTPrimaryExpression ape=pel.get(0);
Node lastNode = ape.jjtGetChild(0);
String returnVariableName = null;
if (lastNode instanceof ASTPrimaryPrefix) {
returnVariableName = getNameFromPrimaryPrefix((ASTPrimaryPrefix) lastNode);
}
if(lastChild instanceof ASTPrimarySuffix){
returnVariableName = getNameFromPrimarySuffix((ASTPrimarySuffix) lastChild);
}
return returnVariableName;
}*/
private String getNameFromPrimaryPrefix(ASTPrimaryPrefix pp) { private String getNameFromPrimaryPrefix(ASTPrimaryPrefix pp) {
if ((pp.jjtGetNumChildren() == 1) if ((pp.jjtGetNumChildren() == 1)
&& (pp.jjtGetChild(0) instanceof ASTName)) { && (pp.jjtGetChild(0) instanceof ASTName)) {