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

Fix #2017

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero
2019-09-19 16:12:08 -03:00
parent 8d5cb1968d
commit 494a5bc3f8
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
View File

@@ -13,8 +13,8 @@ import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTName;
import net.sourceforge.pmd.lang.java.ast.ASTPackageDeclaration;
@@ -35,7 +35,6 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule {
private String currentPackage;
public UnnecessaryFullyQualifiedNameRule() {
super.addRuleChainVisit(ASTCompilationUnit.class);
super.addRuleChainVisit(ASTPackageDeclaration.class);
super.addRuleChainVisit(ASTImportDeclaration.class);
super.addRuleChainVisit(ASTClassOrInterfaceType.class);
@@ -43,10 +42,9 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule {
}
@Override
public Object visit(ASTCompilationUnit node, Object data) {
public void start(final RuleContext ctx) {
imports.clear();
currentPackage = null;
return data;
}
@Override
@@ -245,7 +243,15 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule {
// with type resolution we can do an exact package match
Package packageOfType = node.getType().getPackage();
if (packageOfType != null) {
return node.getType().getPackage().getName().equals(currentPackage);
// get "package" candidate from name
int i = name.lastIndexOf('.');
if (i > 0) {
name = name.substring(0, i);
}
return node.getType().getPackage().getName().equals(currentPackage)
&& name.equals(currentPackage);
}
}