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

Merge branch 'pr-1502'

Browse Source
This commit is contained in:
Andreas Dangel
2018-12-05 20:15:29 +01:00
parent 39215e1478 af0019c0dc
commit f41df32480
26 changed files with 208 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/VariableNamingConventionsRule.java
View File

@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle;
import static apex.jorje.semantic.symbol.type.ModifierTypeInfos.FINAL;
import static apex.jorje.semantic.symbol.type.ModifierTypeInfos.STATIC;
import static net.sourceforge.pmd.properties.PropertyFactory.booleanProperty;
import static net.sourceforge.pmd.properties.PropertyFactory.stringListProperty;
import java.util.ArrayList;
@ -19,7 +20,6 @@ import net.sourceforge.pmd.lang.apex.ast.ASTUserInterface;
import net.sourceforge.pmd.lang.apex.ast.ASTVariableDeclaration;
import net.sourceforge.pmd.lang.apex.ast.ApexNode;
import net.sourceforge.pmd.lang.apex.rule.AbstractApexRule;
import net.sourceforge.pmd.properties.BooleanProperty;
import net.sourceforge.pmd.properties.PropertyDescriptor;
public class VariableNamingConventionsRule extends AbstractApexRule {
@ -36,14 +36,17 @@ public class VariableNamingConventionsRule extends AbstractApexRule {
private List<String> parameterPrefixes;
private List<String> parameterSuffixes;
private static final BooleanProperty CHECK_MEMBERS_DESCRIPTOR = new BooleanProperty("checkMembers",
"Check member variables", true, 1.0f);
private static final PropertyDescriptor<Boolean> CHECK_MEMBERS_DESCRIPTOR =
booleanProperty("checkMembers")
.desc("Check member variables").defaultValue(true).build();
private static final BooleanProperty CHECK_LOCALS_DESCRIPTOR = new BooleanProperty("checkLocals",
"Check local variables", true, 2.0f);
private static final PropertyDescriptor<Boolean> CHECK_LOCALS_DESCRIPTOR =
booleanProperty("checkLocals")
.desc("Check local variables").defaultValue(true).build();
private static final BooleanProperty CHECK_PARAMETERS_DESCRIPTOR = new BooleanProperty("checkParameters",
"Check constructor and method parameter variables", true, 3.0f);
private static final PropertyDescriptor<Boolean> CHECK_PARAMETERS_DESCRIPTOR =
booleanProperty("checkParameters")
.desc("Check constructor and method parameter variables").defaultValue(true).build();
private static final PropertyDescriptor<List<String>> STATIC_PREFIXES_DESCRIPTOR =
stringListProperty("staticPrefix")

8
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/StdCyclomaticComplexityRule.java
View File

@ -4,6 +4,7 @@
package net.sourceforge.pmd.lang.apex.rule.design;
import static net.sourceforge.pmd.properties.PropertyFactory.booleanProperty;
import static net.sourceforge.pmd.properties.constraints.NumericConstraints.inRange;
import java.util.Stack;
@ -22,7 +23,6 @@ import net.sourceforge.pmd.lang.apex.ast.ASTUserInterface;
import net.sourceforge.pmd.lang.apex.ast.ASTUserTrigger;
import net.sourceforge.pmd.lang.apex.ast.ASTWhileLoopStatement;
import net.sourceforge.pmd.lang.apex.rule.AbstractApexRule;
import net.sourceforge.pmd.properties.BooleanProperty;
import net.sourceforge.pmd.properties.PropertyDescriptor;
import net.sourceforge.pmd.properties.PropertyFactory;
@ -47,11 +47,9 @@ public class StdCyclomaticComplexityRule extends AbstractApexRule {
.defaultValue(10)
.build();
public static final BooleanProperty SHOW_CLASSES_COMPLEXITY_DESCRIPTOR = new BooleanProperty(
"showClassesComplexity", "Add class average violations to the report", true, 2.0f);
public static final PropertyDescriptor<Boolean> SHOW_CLASSES_COMPLEXITY_DESCRIPTOR = booleanProperty("showClassesComplexity").desc("Add class average violations to the report").defaultValue(true).build();
public static final BooleanProperty SHOW_METHODS_COMPLEXITY_DESCRIPTOR = new BooleanProperty(
"showMethodsComplexity", "Add method average violations to the report", true, 3.0f);
public static final PropertyDescriptor<Boolean> SHOW_METHODS_COMPLEXITY_DESCRIPTOR = booleanProperty("showMethodsComplexity").desc("Add method average violations to the report").defaultValue(true).build();
private int reportLevel;
private boolean showClassesComplexity = true;