hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'pr-987'

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero 2018-03-22 11:51:14 -03:00
commit f00a085087
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnyTypeDeclaration.java
View File

@ -5,6 +5,7 @@
package net.sourceforge.pmd.lang.java.ast;
import java.util.List;
import java.util.Locale;
/**
@ -39,7 +40,12 @@ public interface ASTAnyTypeDeclaration extends TypeNode, JavaQualifiableNode, Ac
* The kind of type this node declares.
*/
enum TypeKind {
CLASS, INTERFACE, ENUM, ANNOTATION
CLASS, INTERFACE, ENUM, ANNOTATION;
public String getPrintableName() {
return name().toLowerCase(Locale.ROOT);
}
}
}

9
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/MethodLikeNode.java
View File

@ -4,6 +4,9 @@
package net.sourceforge.pmd.lang.java.ast;
import java.util.Locale;
/**
* Groups method, constructor and lambda declarations under a common type.
*
@ -27,7 +30,11 @@ public interface MethodLikeNode extends AccessNode, JavaQualifiableNode, JavaNod
enum MethodLikeKind {
METHOD,
CONSTRUCTOR,
LAMBDA
LAMBDA;
public String getPrintableName() {
return name().toLowerCase(Locale.ROOT);
}
}

11
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityRule.java
View File

@ -6,14 +6,12 @@ package net.sourceforge.pmd.lang.java.rule.design;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Logger;
import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.MethodLikeNode;
import net.sourceforge.pmd.lang.java.ast.MethodLikeNode.MethodLikeKind;
import net.sourceforge.pmd.lang.java.metrics.JavaMetrics;
import net.sourceforge.pmd.lang.java.metrics.api.JavaClassMetricKey;
import net.sourceforge.pmd.lang.java.metrics.api.JavaOperationMetricKey;
@ -126,7 +124,7 @@ public class CyclomaticComplexityRule extends AbstractJavaMetricsRule {
if (classWmc >= classReportLevel) {
int classHighest = (int) JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, cycloOptions, ResultOption.HIGHEST);
String[] messageParams = {node.getTypeKind().name().toLowerCase(Locale.ROOT),
String[] messageParams = {node.getTypeKind().getPrintableName(),
node.getImage(),
" total",
classWmc + " (highest " + classHighest + ")", };
@ -143,13 +141,8 @@ public class CyclomaticComplexityRule extends AbstractJavaMetricsRule {
int cyclo = (int) JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, cycloOptions);
if (cyclo >= methodReportLevel) {
String nodeType = node.getKind() == MethodLikeKind.METHOD
? "method"
: node.getKind() == MethodLikeKind.CONSTRUCTOR
? "constructor"
: "lambda";
addViolation(data, node, new String[]{nodeType,
addViolation(data, node, new String[]{node.getKind().getPrintableName(),
node.getQualifiedName().getOperation(),
"",
"" + cyclo, });